Subject: Re: linux-next: manual merge of the efi-lock-down tree with the modules tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 17 Apr 2018 20:01:42 +1000

Hi David,

On Tue, 17 Apr 2018 08:46:12 +0100 David Howells <[email-masked]> wrote:
>
> Stephen Rothwell <[email-masked]> 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