linux-next: Tree for June 23
From: Stephen Rothwell
Date: Thu Jun 23 2011 - 01:54:47 EST
Changes since 20110622:
My fixes tree includes (as an experiment) the early part of
The powerpc allyesconfig (and probably others) is still broken because we
now build the staging drivers and because of a commit in the net tree.
The breakage in Linus' tree is fixed by one of Andrew's patches above.
The m68knommu tree lost its conflicts.
The galak tree lost its conflicts.
The net tree gained 2 build failures that I have left (see above).
The wireless tree lost a conflict, but gained another against the net
tree and a build failure for which I applied a patch.
The bluetooth tree lost its conflict.
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 194 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/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/mm/context.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
CONFLICT (content): Merge conflict in fs/ceph/export.c
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
CONFLICT (content): Merge conflict in fs/nfs/pnfs.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
CONFLICT (content): Merge conflict in include/linux/netlink.h
Applying: Bluetooth: include scatterlist.h where needed
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree.
$ git rm -f drivers/mmc/host/sdhci-of-core.c
CONFLICT (delete/modify): arch/arm/mach-ep93xx/dma-m2p.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-ep93xx/dma-m2p.c left in tree.
CONFLICT (delete/modify): arch/s390/kvm/sie64a.S deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/s390/kvm/sie64a.S left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
$ git rm -f arch/arm/mach-ep93xx/dma-m2p.c
$ git rm -f arch/s390/kvm/sie64a.S
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/gpio-ep93xx.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_iw.c
CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/tmem.c
Description: PGP signature