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