Message-Id: <20120810090859.7ec67594f794c38c52096544@canb.auug.org.au>
Date:	Fri, 10 Aug 2012 09:08:59 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Zhang Rui <rui.zhang@...el.com>
Cc:	Amit Kachhap <amit.kachhap@...aro.org>,
	Guenter Roeck <linux@...ck-us.net>,
	Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>, linux-next@...r.kernel.org
Subject: Re: thermal patches in linux-next

Hi Rui,

On Thu, 09 Aug 2012 14:45:46 +0800 Zhang Rui <rui.zhang@...el.com> wrote:
>
> On 二, 2012-08-07 at 10:53 +0800, Zhang Rui wrote:
> > Hi, all,
> > 
> > I just created a git tree for catching all thermal changes.
> > http://git.kernel.org/?p=linux/kernel/git/rzhang/linux.git;a=summary
> > and I also created the next branch, which I'd like to be set for
> > linux-next inclusion, but don't know how.
> > 
> I create a tree for thermal management,
> git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
> 
> could you please include my next branch for linux-next?

Included from today.

> And could you please drop these commits
> ef25a0fe0087963c1611c1c8903886fbea053f76
> 09ec52fca274ba88d68df3198de92abdaaff417b
> ab6d2f029358c917508bf88bbd6a9193a8e39fc8
> 66447fa993cbce56b4076f169a56f62350f6c7b8
> ec62abb8b46021ca9ee6b8692b26974ace9007f0
> 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
> 851414b2249afd8c128d29912dfd7060eaea8932
> and pull my next branch instead?

That is not how linux-next normally works.  Those commits are in Adnrew's
quilt series, so you need to ask him to drop them.  However, because of
the way the akpm tree works, any duplicate patches will disappear from my
copy of Andrew's series.

> these commits either will be rebased or has been applied in my tree.

In this case, I will remove them if they conflict too much or you take
them (rebased) into your tree.

Andrew, any chance of a new mmotm series?  I am still working off (a reduced
part) of the mmotm series from July 21 ...

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@...b.auug.org.au

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.

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists