From: jmorris@namei.org (James Morris)
To: linux-security-module@vger.kernel.org
Subject: Security updates for v4.15 and beyond
Date: Mon, 25 Sep 2017 14:59:23 +1000 (AEST) [thread overview]
Message-ID: <alpine.LRH.2.21.1709251450150.30951@namei.org> (raw)
In-Reply-To: <5b63c120-5116-1e77-d090-331d2ae3aa8e@schaufler-ca.com>
On Sun, 24 Sep 2017, Casey Schaufler wrote:
> On 9/23/2017 10:00 PM, James Morris wrote:
> > <snip>
> >
> > I plan on maintaining a separate branch for TPM (and other security
> > subsystems) from now on.
>
> Can you tell us how you expect this to work? I know
> there was discussion about this at the Security Summit.
> We need to get whatever needs doing lined up if we're
> going to make 4.15 happen smoothly.
I'll post a more detailed and general update in a few days when I'm back
in Sydney, but briefly, send me a pull request against my next-general
branch, which replaces the 'next' branch. I'll sync that to -rc2 after
this email.
I'll fetch your branch into my next-smack branch, which will track
next-general.
All of these subsystem branches and next-general will be merged into
next-testing, for use by Stephen Rothwell for linux-next, and any other
general testing which may be done.
When the merge window opens, I'll merge the subsystem branches into
next-for-linus for him to pull. If all is going well, this will be the
same as next-testing. If there are problems in any of the branches, they
can be left out of next-for-linus until they're resolved.
Linus can then pull from that to get everything at once, or pull individual
branches as he sees fit.
In summary: track my next-general branch instead of 'next', and your
workflow is otherwise unchanged.
How does that sound?
--
James Morris
<jmorris@namei.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-09-25 4:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-24 5:00 [GIT PULL] TPM updates for v4.14 James Morris
2017-09-24 17:53 ` Security updates for v4.15 and beyond Casey Schaufler
2017-09-25 4:59 ` James Morris [this message]
2017-09-25 10:32 ` Paul Moore
2017-09-26 19:55 ` John Johansen
2017-09-27 0:03 ` James Morris
2017-09-27 0:18 ` Casey Schaufler
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.1709251450150.30951@namei.org \
--to=jmorris@namei.org \
--cc=linux-security-module@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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