From: "Serge E. Hallyn" <serge@hallyn•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Paul Moore <paul@paul-moore•com>,
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: Fri, 20 Jun 2014 05:43:56 +0200 [thread overview]
Message-ID: <20140620034356.GB20601@mail.hallyn.com> (raw)
In-Reply-To: <20140620085931.6427678d@canb.auug.org.au>
Quoting Stephen Rothwell (sfr@canb•auug.org.au):
> Hi Paul,
>
> On Thu, 19 Jun 2014 15:47:01 -0400 Paul Moore <paul@paul-moore•com> wrote:
> >
> > I want to avoid use a -rcX release as the foundation of any of my trees; the -
> > rc releases aren't as stable and it goes against what we're trying to do with
> > the different Linux Security trees. Unfortunately, based on what I've read
> > above, this seems to be incompatible with linux-next.
>
> The problem with basing your development for v3.17 on v3.15 is that
> you do not take into account any of the changes done by others during
> v3.16-rc1 (or even your upstream tree) some of which may be core API
> changes.
>
> > While I hate to split my development branch from the #next branch, it seems
>
> I don't want that either ...
>
> > like that is the only way to accomplish both a reasonably current and stable
> > development tree and get the patches into linux-next. Unless you, or anyone
> > else for that matter, has a different suggestion I'm going to go ahead and
> > turn the current SELinux #next branch into a development branch and create a
> > new #next branch that will be based on the most current -rc1, this new #next
> > branch will be created new for each major release. Not exactly what I was
> > hoping for, but will that work?
>
> Do you mean that your #next branch will just be a merge of -rc1 and
> your development branch? That would not actually change anything
> (except that you would possibly take care of some conflicts for me).
>
> At the core, what is in linux-next should just be exactly what will be
> merged by your upstream. My real point here is that that is not what
> has happened recently. The patches in your tree have been
> cherry-picked or rebased into James' or Serge's trees, not merged so we
> now have duplication. This is what you need to solve with James and
> Serge. linux-next is a side issue - I can cope with a lot.
The duplicates were the result of several misunderstandings and general
naivity all on my part. I'm actually still not clear on what usually
happens with the selinux tree - it feeds into linux-next, then gets
'pull'ed by James into security-next for a pull request? Do you usually
send a request to James when ready, he pulls, then he sends pull request
to Linus? (Or am I wrong, and you usually send your own requests to
Linus?)
-serge
next prev parent reply other threads:[~2014-06-20 3:43 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 [this message]
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
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=20140620034356.GB20601@mail.hallyn.com \
--to=serge@hallyn$(echo .)com \
--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=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