Hi Eric,
On Tue, 05 Nov 2013 11:35:56 -0500 Eric Paris <eparis@xxxxxxxxxx> wrote:
>
> Weeee audit in linux-next again. I seem to fail a lot.
:-)
> Al, can you please tell Stephen you hate audit, you will never update
> your trees and you are washing your hands of it completely? Your trees
> are dead and should be dropped.
I have dropped them.
> Stephen can you pull into linux next the master branch from
> git://git.infradead.org/users/eparis/audit.git
Added from today. (and more widely advertised)
> I'd like you to pull now, even though the window is open. I plan to ask
> Linus to pull for this window. I obviously should have been getting
> into your tree for the whole cycle, but at least a week or so is better
> than nothing. Thinking about a pull request is what made me realize we
> never actually got that done last window... Or the window before. Or
> the one before that...
Well, yes ... ;-)
> In another cycle or two I might ask to have trees changed again to one
> rbriggs owns, but for now, I think I'll still sit in the middle, even if
> I suck as a maintainer.
No worries.
> You will have a merge conflict in fs/exec.c It is pretty simple. My
> example merge commit is below. Instructions to solve the conflict:
Thanks for the heads up.
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:
pgp3Swvyy07N8.pgp
Description: PGP signature
