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

[James Morris]

On Mon, 9 Apr 2018, Stephen Rothwell wrote:

> Hi James,
> 
> On Mon, 9 Apr 2018 12:51:53 +1000 (AEST) James Morris <jmorris@xxxxxxxxx> wrote:
> >
> > That's odd, my next-general branch is merged to Linus.
> 
> The security tree in linux-next is
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing
> 
> which has the efi-lock-down tree merged into it.

Ahh, I see.  I'll rebase next-testing.

-- 
James Morris
<jmorris@xxxxxxxxx>