[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200802141545.56488.rjw@sisk.pl>
Date: Thu, 14 Feb 2008 15:45:55 +0100
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
Len Brown <lenb@...nel.org>
Subject: Re: linux-next: first tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists