linux-next: Tree for March 21
From: Stephen Rothwell
Date: Sun Mar 20 2011 - 23:40:53 EST
Reminder: do not add any of your changes for v2.6.40 to your linux-next
included branches until after v2.6.39-rc1 is released.
Lots of conflicts are rising to the top :-)
Changes since 20110317:
Dropped tree: xen
Linus' tree lost its build failure.
The arm tree lost its conflict.
The msm tree lost its conflicts.
The omap tree lost its conflicts.
The powerpc tree lost its conflict.
The tile tree lost its conflict.
The hwmon-staging tree lost its conflict.
The acpi tree lost some of its conflicts.
The scsi tree lost its conflicts.
The cpufreq tree lost its conflict.
The block tree gained a conflict against Linus' tree.
The mfd tree gained a conflict against Linus' tree and a build failure
for which I reverted a commit.
The trivial tree lost its conflicts.
The xen-two tree lost its conflict.
The powerpc allyesconfig build is still 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 183 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 arch/arm/mach-mxs/mach-mx28evk.c
CONFLICT (content): Merge conflict in arch/arm/configs/u8500_defconfig
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/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (delete/modify): drivers/staging/dabusb/dabusb.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/dabusb/dabusb.c left in tree.
CONFLICT (delete/modify): drivers/staging/dabusb/dabusb.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/dabusb/dabusb.h left in tree.
CONFLICT (content): Merge conflict in drivers/staging/easycap/easycap_ioctl.c
CONFLICT (delete/modify): drivers/staging/usbvideo/usbvideo.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/usbvideo/usbvideo.c left in tree.
CONFLICT (delete/modify): drivers/staging/usbvideo/vicam.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/usbvideo/vicam.c left in tree.
$ git rm -f drivers/staging/usbvideo/usbvideo.c
$ git rm -f drivers/staging/usbvideo/vicam.c
$ git rm -f drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h
CONFLICT (content): Merge conflict in drivers/hwmon/Makefile
CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c
[master 0000b7e] Revert "mtd: fix printf format warnings, mostly lack of %zd for size_t, in mtdswap"
[master c83c6b5] Revert "mtd: Add mtdswap block driver"
[master 1999b8c] Revert "mtd_blkdevs: Add background processing support"
CONFLICT (content): Merge conflict in fs/aio.c
CONFLICT (content): Merge conflict in fs/super.c
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx27_3ds.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-pcm038.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31_3ds.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31moboard.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500-regulators.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-overo.c
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 include/linux/pci_ids.h
Applying: OLPC: fix for removal of run_wake_count
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
[master d7f2ee7] Revert "mfd: Add MAX8997/8966 IRQ control feature"
Description: PGP signature