Hi Stephen, Am Donnerstag, 16. Januar 2014, 07:50:25 schrieb Stephen Rothwell: > Hi Richard, > > On Wed, 15 Jan 2014 20:39:03 +0100 Richard Weinberger <rich...@nod.at> wrote: > > Stephen, can you please add my UML tree to -next? > > It contains already the fix. > > git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git next > > Sure, added from today. As long as it only contains stuff for v3.14 ...
Yep, only stuff for 3.14. > > Please note there is a trivial merge conflict in > > arch/um/include/asm/Kbuild. > Yeah, what Geert said. If you can fix this, then fine, but a single > conflict is not so bad. I can update my tree if it saves you time. No problem... > 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. Thanks, //richard -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
