From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Morris Subject: Re: linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree Date: Mon, 9 Apr 2018 14:29:02 +1000 (AEST) Message-ID: References: <20180315183412.01412755@canb.auug.org.au> <20180406092216.4579a70c@canb.auug.org.au> <20180409115831.46a351ef@canb.auug.org.au> <20180409142237.66d3466d@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Return-path: In-Reply-To: <20180409142237.66d3466d@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: David Howells , "Martin K. Petersen" , Linux-Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org On Mon, 9 Apr 2018, Stephen Rothwell wrote: > Hi James, > > On Mon, 9 Apr 2018 12:51:53 +1000 (AEST) James Morris 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