From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Weinberger Subject: Re: linux-next: Tree for Jan 15 (um, rcu) Date: Wed, 15 Jan 2014 21:57:49 +0100 Message-ID: <1481134.LAgAS757c0@sandpuppy> References: <20140115185545.497c14923814b6ecaa540d9f@canb.auug.org.au> <2114717.uibXxy8kL0@sandpuppy> <20140116075025.7b7ec09805b5f90c75a36dd2@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from b.ns.miles-group.at ([95.130.255.144]:1660 "EHLO radon.swed.at" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751127AbaAOU5z (ORCPT ); Wed, 15 Jan 2014 15:57:55 -0500 In-Reply-To: <20140116075025.7b7ec09805b5f90c75a36dd2@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Randy Dunlap , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Paul E. McKenney" , Geert Uytterhoeven 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 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