From: James Morris <jmorris@namei•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Howells <dhowells@redhat•com>,
"Martin K. Petersen" <martin.petersen@oracle•com>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
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) [thread overview]
Message-ID: <alpine.LRH.2.21.1804091428390.20797@namei.org> (raw)
In-Reply-To: <20180409142237.66d3466d@canb.auug.org.au>
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>
prev parent reply other threads:[~2018-04-09 4:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 7:34 linux-next: manual merge of the scsi-mkp tree with the efi-lock-down tree Stephen Rothwell
2018-04-05 23:22 ` Stephen Rothwell
2018-04-09 1:58 ` Stephen Rothwell
2018-04-09 2:51 ` James Morris
2018-04-09 4:22 ` Stephen Rothwell
2018-04-09 4:29 ` James Morris [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LRH.2.21.1804091428390.20797@namei.org \
--to=jmorris@namei$(echo .)org \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox