|| ||Stephen Rothwell <email@example.com>|
|| ||linux-next: first tree|
|| ||Fri, 15 Feb 2008 00:35:37 +1100|
|| ||LKML <firstname.lastname@example.org>|
I have created the first cut of the linux-next tree at
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 ... :-)
Stephen Rothwell email@example.com