lkml.org 
[lkml]   [2018]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree
On Mon, 9 Apr 2018, Stephen Rothwell wrote:

> Hi James,
>
> On Mon, 9 Apr 2018 12:51:53 +1000 (AEST) James Morris <jmorris@namei.org> 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@namei.org>

\
 
 \ /
  Last update: 2018-04-09 06:30    [W:0.155 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site