From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Moore <paul@paul-moore•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
James Morris <james.l.morris@oracle•com>,
"Serge E. Hallyn" <serge@hallyn•com>
Subject: Re: linux-next: the selinux tree needs cleaning up
Date: Wed, 25 Jun 2014 09:59:28 +1000 [thread overview]
Message-ID: <20140625095928.3161ebe1@canb.auug.org.au> (raw)
In-Reply-To: <32647147.KmAPzBrbMT@sifl>
[-- Attachment #1: Type: text/plain, Size: 1448 bytes --]
Hi Paul,
On Tue, 24 Jun 2014 14:03:08 -0400 Paul Moore <paul@paul-moore•com> wrote:
>
> On Friday, June 20, 2014 12:06:28 PM Paul Moore wrote:
>
> {big snip}
>
> > Stephen, assuming for a moment that I created a fresh branch, based against
> > 3.15, and then added the SELinux patches for 3.16 (basically the few new
> > patches that were in the ole #next branch) would that serve as a reasonable
> > basis for a new SELinux #next branch? Around the -rc5/6/7 timeframe I would
> > send a pull request to James to pull from this next branch into the Linux
> > Security branch for 3.17. Once 3.16 is released, I would merge that into
> > this new #next branch and continue with the next round of patches.
> >
> > FYI, more or less, the above is the process we've settled upon for all of
> > the trees that get accumulated into the Linux Security tree.
>
> Does the above work for you in linux-next? I'd like to try and resolve this
> sooner rather than later and I imagine you feel the same ...
Well, I see that James has pulled your tree, so past problems are now
moot. He has some duplicate commits in his tree now and Linus will get
a few more when he next pulls James' tree. We just need to avoid this
going forward. And given that James or Serge will, from now on, *pull*
your tree (not cherry-pick from it), things should be fine.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-06-24 23:59 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 22:40 linux-next: the selinux tree needs cleaning up Stephen Rothwell
2014-06-18 18:26 ` Paul Moore
2014-06-19 15:08 ` Stephen Rothwell
2014-06-19 19:47 ` Paul Moore
2014-06-19 22:59 ` Stephen Rothwell
2014-06-20 3:43 ` Serge E. Hallyn
2014-06-20 3:59 ` Stephen Rothwell
2014-06-20 14:57 ` Serge E. Hallyn
2014-06-20 16:06 ` Paul Moore
2014-06-24 18:03 ` Paul Moore
2014-06-24 23:59 ` Stephen Rothwell [this message]
2014-06-25 10:51 ` James Morris
2014-06-25 22:12 ` Stephen Rothwell
2014-06-27 2:41 ` James Morris
2014-06-25 14:14 ` Paul Moore
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=20140625095928.3161ebe1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=james.l.morris@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paul@paul-moore$(echo .)com \
--cc=serge@hallyn$(echo .)com \
/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