linux-next: Tree for January 31
From: Stephen Rothwell
Date: Mon Jan 31 2011 - 01:41:45 EST
Changes since 20110121:
New tree: unicore32
Renamed tree: swiotlb-xen to xen-two
Dropped tree: xen
The tty.current tree gained a conflict against Linus' tree.
The msm tree gained conflicts against the arm tree.
The bjdooks-i2c tree lost its conflicts.
The net tree lost its build failure.
The slab tree gained a build failure so I used the version from
The suspend tree gained a build failure so I used the version from
The tip tree gained a build failure that went away when I removed a
temporary file from my object tree.
The usb tree gained a conflict against the arm tree.
The staging tree gained conflicts against the staging.current tree.
The sparc64 defconfig build is broken by a commit in the net and tip
trees, but I have left it for now.
The powerpc allyesconfig build has been broken by some obscure bloating
of the low memory code.
I have created today's linux-next tree at
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/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 - this fails its final link) 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 186 trees (counting Linus' and 28 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 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 (content): Merge conflict in drivers/tty/tty_io.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x27.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-qsd8x50.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-sapphire.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/include/mach/memory.h
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/timer.c
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
$ git reset --hard HEAD^
$ git reset --hard HEAD^
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
CONFLICT (content): Merge conflict in arch/x86/include/asm/xen/page.h
CONFLICT (content): Merge conflict in drivers/usb/gadget/Kconfig
CONFLICT (rename/modify): Merge conflict in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
CONFLICT (content): Merge conflict in drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c
CONFLICT (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree.
CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
$ git rm -f drivers/staging/stradis/Kconfig
CONFLICT (content): Merge conflict in fs/ocfs2/super.c
CONFLICT (content): Merge conflict in fs/super.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
$ git checkout scsi-post-merge/master
Description: PGP signature