linux-next: Tree for October 22
From: Stephen Rothwell
Date: Wed Oct 22 2008 - 05:41:44 EST
Today's tree will not build for powerpc allyesconfig (libc aborts the
link due to a free() problem), sparc(32) defconfig and probably some
I am no longer commenting on conflicts that are clearly just caused by
slight differences in what has been merged into Linus' tree and
linux-next or conflicts caused by further changes in the linux-next after
a subset of a tree has been merged.
Changes since 20081021:
tests (because its future is in doubt and it has conflicts)
v4l-dvb (the tree is a mess)
proc (messy conflicts, hopefully fixed tomorrow)
The cpus4096 tree lost its conflict.
The stackprotector tree lost its conflict, but gained a build fix patch.
The timers tree lost its 2 conflicts and its build fix patch.
The pci tree gained a build fix patch.
The kmemcheck tree lost 4 conflicts.
The ttydev tree lost its conflict.
The fastboot tree lost its 3 conflicts.
I have also applied the following patches for known problems:
sparc: qlogicpti fallout from sbus removal
Fix page_cgroup build breakage
mfd/wm8350: don't export static functions
I have created today's linux-next tree at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). 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 121 trees (counting Linus' and 14 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
http://kisskb.ellerman.id.au/linux-next . 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 http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
$ git checkout master
$ git reset --hard stable
Created commit cb276b5: Revert "USB: remove info() macro from usb.h"
Created commit f56529d: Revert "USB: remove warn() macro from usb.h"
Applying stackprotector: fix up bad merge
Applying pci: move include of io.h so it doesn't need to be exported
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/boot.c
CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c
CONFLICT (content): Merge conflict in drivers/acpi/Kconfig
CONFLICT (content): Merge conflict in drivers/pnp/Makefile
CONFLICT (content): Merge conflict in drivers/pnp/quirks.c
Applying acpi: merge fix for dpulicate acpi_mcfg_64bit_base_addr
Applying acpi: acpi_os_hotplug_execute needs to be exported
CONFLICT (content): Merge conflict in fs/ext4/namei.c
Applying vfs/xfs: fallout from i_vnode change
Applying vfs: fix up merge of ext4
CONFLICT (content): Merge conflict in net/9p/trans_virtio.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
CONFLICT (content): Merge conflict in include/linux/securebits.h
CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c
CONFLICT (content): Merge conflict in firmware/WHENCE
Applying leds/acpi: fix merge fallout from acpi_driver_data change
CONFLICT (content): Merge conflict in mm/Makefile
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
CONFLICT (content): Merge conflict in fs/devpts/inode.c
CONFLICT (content): Merge conflict in fs/namespace.c
CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in kernel/exit.c
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in kernel/signal.c
CONFLICT (content): Merge conflict in mm/migrate.c
CONFLICT (content): Merge conflict in net/9p/client.c
CONFLICT (content): Merge conflict in security/selinux/hooks.c
CONFLICT (content): Merge conflict in drivers/oprofile/cpu_buffer.c
CONFLICT (content): Merge conflict in drivers/oprofile/event_buffer.h
Applying sparc: qlogicpti fallout from sbus removal
Applying Fix page_cgroup build breakage
Applying mfd/wm8350: don't export static functions
Description: PGP signature