Hi Eric,
On Thu, 25 Nov 2010 10:46:06 +1100 (EST) James Morris <jmorris@xxxxxxxxx> wrote:
>
> On Thu, 25 Nov 2010, Stephen Rothwell wrote:
>
> > On Tue, 23 Nov 2010 11:47:52 -0500 Eric Paris <eparis@xxxxxxxxxx> wrote:
> > >
> > > I was ask to start keeping an SELinux development tree. I expect James
> > > to pull it into his security tree pretty regularly. I don't know if you
> > > want to start pulling my tree directly so things filter out faster or if
> > > you want me to just wait for James to pull.
> >
> > I have a few trees like that (wireless, bluetooth for example).
> >
> > > I guess really the question comes down to "does linux-next want to deal
> > > with intra-subsystem conflicts or just inter-subsystem?" If you don't
> > > mind intra-subsystem I'd like you to start pulling the master branch of
> > > git://git.infradead.org/users/eparis/selinux.git
> >
> > I can cope with that usually. I would like James' opinion, though.
> >
> > If I merge this, it will be after the security-testing tree so that if
> > James does merge it, it costs me nothing.
>
> Should be fine, helps Eric get his stuff ready before pushing to me.
OK, so added from today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@xxxxxxxxxxxxxxxx
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
Attachment:
pgp01ynCSf7ul.pgp
Description: PGP signature
