Prev: [PATCH] platform: Facilitate the creation of pseduo-platform busses
Next: fixed resource leak in scripts/mod/modpost.c
From: Konrad Rzeszutek Wilk on 4 Aug 2010 18:30
On Wed, Aug 04, 2010 at 06:23:50PM -0400, Konrad Rzeszutek Wilk wrote:
> On Wed, Aug 04, 2010 at 03:10:35PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > As the merge window is open, please do not add 2.6.27 material to your
> > linux-next included trees until after 2.6.36-rc1.

Ugh. Resending as I didn't CC-ed LKML.
>
> I was wondering if you could add in your awesome tool this extra git
> tree:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git
>
> (the head of it please)
>
> It has this patchset: http://lkml.org/lkml/2010/7/27/246
>
> that I have been carrying in
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git
>
> but I realized it should probably not be in the swiotlb and was hence
> wondering if you would be OK adding in that extra git tree?
>
> Thanks
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 4 Aug 2010 20:40
Hi Konrad,

On Wed, 4 Aug 2010 18:23:50 -0400 Konrad Rzeszutek Wilk <konrad.wilk(a)oracle..com> wrote:
>
> I was wondering if you could add in your awesome tool this extra git
> tree:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git
>
> (the head of it please)
>
> It has this patchset: http://lkml.org/lkml/2010/7/27/246
>
> that I have been carrying in
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git
>
> but I realized it should probably not be in the swiotlb and was hence
> wondering if you would be OK adding in that extra git tree?

Added from today, but only because everything in it is already in
linux-next from your other tree. I assume that you will remove this stuff
from there.

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(a)canb.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.
From: Konrad Rzeszutek Wilk on 5 Aug 2010 10:40
On Thu, Aug 05, 2010 at 10:30:50AM +1000, Stephen Rothwell wrote:
> Hi Konrad,
>
> On Wed, 4 Aug 2010 18:23:50 -0400 Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com> wrote:
> >
> > I was wondering if you could add in your awesome tool this extra git
> > tree:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git
> >
> > (the head of it please)
> >
> > It has this patchset: http://lkml.org/lkml/2010/7/27/246
> >
> > that I have been carrying in
> > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git
> >
> > but I realized it should probably not be in the swiotlb and was hence
> > wondering if you would be OK adding in that extra git tree?
>
> Added from today, but only because everything in it is already in
> linux-next from your other tree. I assume that you will remove this stuff
> from there.

Yes.

Looking at your linux-next tree it looks that you added the wrong tree.
You added 'xen-2.6.git' while in actuallity the tree is 'xen.git'.
Could you change it please? Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 5 Aug 2010 10:50
Hi Konrad,

On Thu, 5 Aug 2010 10:37:32 -0400 Konrad Rzeszutek Wilk <konrad.wilk(a)oracle..com> wrote:
>
> Looking at your linux-next tree it looks that you added the wrong tree.
> You added 'xen-2.6.git' while in actuallity the tree is 'xen.git'.
> Could you change it please? Thanks.

Ooops. Actually, I fetched the correct tree, it was just in the listing
that it was wrong (copy and paste error). Fixed now.

--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
 | 
Pages: 1
Prev: [PATCH] platform: Facilitate the creation of pseduo-platform busses
Next: fixed resource leak in scripts/mod/modpost.c