linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Richard Weinberger <richard@nod.at>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Randy Dunlap <rdunlap@infradead.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
	Geert Uytterhoeven <geert@linux-m68k.org>
Subject: Re: linux-next: Tree for Jan 15 (um, rcu)
Date: Wed, 15 Jan 2014 21:57:49 +0100	[thread overview]
Message-ID: <1481134.LAgAS757c0@sandpuppy> (raw)
In-Reply-To: <20140116075025.7b7ec09805b5f90c75a36dd2@canb.auug.org.au>

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 <richard@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

  reply	other threads:[~2014-01-15 20:57 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-15  7:55 linux-next: Tree for Jan 15 Stephen Rothwell
2014-01-15 16:21 ` linux-next: Tree for Jan 15 (um, rcu) Randy Dunlap
2014-01-15 19:35   ` [PATCH] um: Include generic barrier.h Richard Weinberger
2014-01-15 20:03     ` [uml-devel] " Geert Uytterhoeven
2014-01-15 19:39   ` linux-next: Tree for Jan 15 (um, rcu) Richard Weinberger
2014-01-15 20:50     ` Stephen Rothwell
2014-01-15 20:57       ` Richard Weinberger [this message]
2014-01-15 23:24 ` linux-next: Tree for Jan 15 (infiniband: ocrdma) Randy Dunlap
2014-01-15 23:39 ` linux-next: Tree for Jan 15 (netfilter: nft_reject) Randy Dunlap

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=1481134.LAgAS757c0@sandpuppy \
    --to=richard@nod.at \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=rdunlap@infradead.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).