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

2018-04-17 Thread Stephen Rothwell
Hi David, On Tue, 17 Apr 2018 08:46:12 +0100 David Howells wrote: > > Stephen Rothwell 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, Stephe

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

2018-04-17 Thread David Howells
Stephen Rothwell 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