From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, Jessica Yu <jeyu@kernel.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jia Zhang <zhang.jia@linux.alibaba.com>
Subject: Re: linux-next: manual merge of the efi-lock-down tree with the modules tree
Date: Tue, 17 Apr 2018 08:46:12 +0100 [thread overview]
Message-ID: <25950.1523951172@warthog.procyon.org.uk> (raw)
In-Reply-To: <20180417113218.4e6ba307@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the efi-lock-down tree got a conflict in:
Can you drop my branch for the moment?
Thanks,
David
next prev parent reply other threads:[~2018-04-17 7:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 1:32 linux-next: manual merge of the efi-lock-down tree with the modules tree Stephen Rothwell
2018-04-17 7:46 ` David Howells [this message]
2018-04-17 10:01 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=25950.1523951172@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=zhang.jia@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox