linux-next: Tree for June 19
From: Stephen Rothwell
Date: Fri Jun 19 2009 - 03:26:51 EST
Changes since 20090618:
My fixes tree contains this one commit:
kallsyms: fix inverted valid symbol checking (hopefully this will
make arm configs build reliably again).
This tree fails to build for powerpc allyesconfig.
Linus' tree gained a build failure due to a compiler bug. I have
reverted a commit.
The ext4 tree lost its build failure.
The acpi tree lost its conflicts and build failure.
The slab tree gained a build failure due to a change in Linus' tree. I
have applied a patch.
The md tree lost its conflicts.
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 (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
These builds also have CONFIG_ENABLE_WARN_DEPRECATED,
CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 128 trees (counting Linus' and 19 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
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (content): Merge conflict in fs/configfs/dir.c
CONFLICT (content): Merge conflict in net/9p/protocol.c
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
$ git reset --hard HEAD^
CONFLICT (content): Merge conflict in arch/x86/include/asm/mce.h
Applying: kvm/powerpc: make 32 bit constant unsigned long
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
CONFLICT (content): Merge conflict in arch/sh/include/asm/smp.h
CONFLICT (content): Merge conflict in drivers/net/sfc/efx.c
CONFLICT (content): Merge conflict in mm/Makefile
Applying: slqb: fix for macro name change
CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c
CONFLICT (rename/modify): Merge conflict in drivers/net/wireless/ath/ath5k/Kconfig
CONFLICT (content): Merge conflict in drivers/block/ps3disk.c
CONFLICT (content): Merge conflict in drivers/block/ps3vram.c
CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_debugfs.c
CONFLICT (content): Merge conflict in kernel/trace/trace.c
CONFLICT (content): Merge conflict in scripts/tracing/draw_functrace.py
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (add/add): Merge conflict in drivers/staging/octeon/Kconfig
[master d6355d0] Revert "fbdev: move logo externs to header file"
Description: PGP signature