From: Paul Moore <paul.moore@hp•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: James Morris <jmorris@namei•org>,
Andrew Morton <akpm@linux-foundation•org>,
linux-next@vger•kernel.org
Subject: Re: Labeled Networking tree for linux-next
Date: Thu, 24 Jul 2008 09:47:59 -0400 [thread overview]
Message-ID: <200807240947.59538.paul.moore@hp.com> (raw)
In-Reply-To: <20080724100624.6c6127ed.sfr@canb.auug.org.au>
On Wednesday 23 July 2008 8:06:24 pm Stephen Rothwell wrote:
> Hi Paul,
>
> On Wed, 23 Jul 2008 16:19:39 -0400 Paul Moore <paul.moore@hp•com>
wrote:
> > Yes, the labeled networking stuff usually affects both net/ and
> > security/. I really don't care how it gets into linux-next as long
> > as it gets in at some point. I sent the mail because the
> > lblnet-2.6_testing tree (currently empty, but not for much longer)
> > is currently being pulled into linux-next (I think it started in
> > the initial push to move -mm into linux-next).
> >
> > If we don't decide to drop the labeled networking git tree from
> > linux-next can we at least shift from using the lblnet-2.6_testing
> > to the lblnet-2.6_next tree?
>
> I have made the change.
>
> I have no problem with trees coming into linux-next from more than
> one source (see e.g. the wireless tree which is merged into the net
> tree). In fact it can be useful so that you will discover conflicting
> changes in the security and net trees before you have your tree
> merged into theirs. I have moved your tree after both the net and
> security-testing trees (that way if it gets merged into either of
> them its merge into linux-next becomes a noop).
That sounds like a reasonable argument, thanks for making the change.
--
paul moore
linux @ hp
prev parent reply other threads:[~2008-07-24 13:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-23 16:44 Labeled Networking tree for linux-next Paul Moore
2008-07-23 18:16 ` James Morris
2008-07-23 20:19 ` Paul Moore
2008-07-24 0:06 ` Stephen Rothwell
2008-07-24 2:53 ` David Miller
2008-07-24 13:47 ` Paul Moore [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=200807240947.59538.paul.moore@hp.com \
--to=paul.moore@hp$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jmorris@namei$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--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