Re: linux-next: manual merge of the efi-lock-down tree with the modules tree
From: Stephen Rothwell
Date: Tue Apr 17 2018 - 06:03:12 EST
Hi David,
On Tue, 17 Apr 2018 08:46:12 +0100 David Howells <dhowells@xxxxxxxxxx> wrote:
>
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> > Today's linux-next merge of the efi-lock-down tree got a conflict in:
>
> Can you drop my branch for the moment?
Sure, no problem. Just let me know when to grab it again.
--
Cheers,
Stephen Rothwell
Attachment:
pgpkfkm6Kibdc.pgp
Description: OpenPGP digital signature