linux-next: Tree for May 13
Changes since next-20080512:
The arm tree conflict has gone.
I have created today's linux-next tree at
(tar balls and patches at
[url]http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/[/url]). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 71 trees (counting Linus' and 13 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
[url]http://kisskb.ellerman.id.au/linux-next[/url] . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at [url]http://l4x.org/k/[/url] , the guys at [url]http://test.kernel.org/[/url] and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
[url]http://linux.f-seidel.de/linux-next/pmwiki/[/url] . Thanks to Frank Seidel.
Stephen Rothwell [email]firstname.lastname@example.org[/email]
$ git reset --hard stable
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in kernel/sysctl.c
CONFLICT (content): Merge conflict in drivers/atm/ambassador.c
CONFLICT (content): Merge conflict in drivers/net/bonding/bond_main.c
CONFLICT (content): Merge conflict in drivers/net/bonding/bond_sysfs.c
Applying idr.h needs spinlock.h
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
-----END PGP SIGNATURE-----