Re: linux-next: first tree

Re: linux-next: first tree

[Rafael J. Wysocki]

On Thursday, 14 of February 2008, Stephen Rothwell wrote:
> Hi all,
> 
> I have created the first cut of the linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> 
> Things to know about this tree:
> 
> It has two branches - master and stable.  Stable is currently just Linus'
> tree and will never rebase.  Master will rebase on an almost daily basis
> (maybe slower at the start).
> 
> The tree consists of subsystem git and quilt trees.  Currently, the quilt
> trees are integrated by importing them into appropriately based git
> branches and then merging those branches.  This has the advantage that
> any conflict resolution will onlt have to happen once at the merge point
> rather than, possibly, sevveral times during the series.  However, I am
> considering just applying the quilt trees on top of the current tree
> to get a result more like Linus' tree - we will see. The git trees are
> obviously just merged.
> 
> Between each merge, the tree was built with both an allmodconfig for both
> powerpc and x86_64.
> 
> The tree currently contains:
> 	Greg's driver-core, pci and usb quilt series (in that order)
> 	Alasdair Kergon's device-mapper quilt tree
> 	Jiri Kosina's hid git tree
> 	Jean Delvare's i2c quilt tree
> 	Randy Dunlap's kernel-doc quilt tree
> 	Haavard Skinnemoen's avr32 git tree
> 
> There was only one unresolved conflict which could have been caused
> because I was not sure where to base the kernel-doc tree.
> 
> So, comments, please.
> 
> Also, more trees please ... :-)

Perhaps you can add:

git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 test

Thanks,
Rafael

Re: linux-next: first tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

Hi Rafael,

On Thu, 14 Feb 2008 15:45:55 +0100 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
>
> Perhaps you can add:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 test

I would prefer that the trees be added by the subsystem maintainers and
they can tell me which branch represents their expectations for the next
kernel release (in this case 2.6.26). But thanks, hopefully you will have
prodded them along. :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: first tree

[Martin Schwidefsky]

On Fri, 2008-02-15 at 02:00 +1100, Stephen Rothwell wrote:
> I would prefer that the trees be added by the subsystem maintainers and
> they can tell me which branch represents their expectations for the next
> kernel release (in this case 2.6.26). But thanks, hopefully you will have
> prodded them along. :-)

For the s390 architecture please use the "features" branch of git390:

git://git390.osdl.marist.edu/pub/scm/linux-2.6.git features

-- 
blue skies,
  Martin.

"Reality continues to ruin my life." - Calvin.

Re: linux-next: first tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 370 bytes --]

Hi Martin,

On Thu, 14 Feb 2008 16:25:09 +0100 Martin Schwidefsky <schwidefsky@de.ibm.com> wrote:
>
> For the s390 architecture please use the "features" branch of git390:
> 
> git://git390.osdl.marist.edu/pub/scm/linux-2.6.git features

Added thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: first tree

[Paul Mundt]

On Fri, Feb 15, 2008 at 02:00:19AM +1100, Stephen Rothwell wrote:
> Hi Rafael,
> 
> On Thu, 14 Feb 2008 15:45:55 +0100 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > Perhaps you can add:
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 test
> 
> I would prefer that the trees be added by the subsystem maintainers and
> they can tell me which branch represents their expectations for the next
> kernel release (in this case 2.6.26). But thanks, hopefully you will have
> prodded them along. :-)
> 
For SH:

	master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git

This is also what goes in to -mm.

Re: linux-next: first tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

Hi Paul,

On Fri, 15 Feb 2008 00:49:28 +0900 Paul Mundt <lethal@linux-sh.org> wrote:
>
> For SH:
> 
> 	master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git

Added, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: first tree

[Len Brown]

On Thursday 14 February 2008 10:00, Stephen Rothwell wrote:
> Hi Rafael,
> 
> On Thu, 14 Feb 2008 15:45:55 +0100 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > Perhaps you can add:
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 test
> 
> I would prefer that the trees be added by the subsystem maintainers and
> they can tell me which branch represents their expectations for the next
> kernel release (in this case 2.6.26). But thanks, hopefully you will have
> prodded them along. :-)

Rafael has it right, please add the branch above.
It will include both the upcoming ACPI and suspend patches.

Note that I reserve the right to re-base it from time to time -
so when you pull it, you want to pull it onto a new branch vs. Linux
rather than onto a previous copy of itself.

thanks,
-Len

Re: linux-next: first tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 572 bytes --]

Hi Len,

On Thu, 14 Feb 2008 23:58:38 -0500 Len Brown <lenb@kernel.org> wrote:
>
> Rafael has it right, please add the branch above.
> It will include both the upcoming ACPI and suspend patches.

Added, thanks, with you as contact.

> Note that I reserve the right to re-base it from time to time -
> so when you pull it, you want to pull it onto a new branch vs. Linux
> rather than onto a previous copy of itself.

That is fine, I expect rebases.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]