linux-next: Tree for June 1
May 31st, 2011 - 11:50 pm ET by Stephen Rothwell | Report spam
Changes since 20110531:
My fixes tree contains:
kgdbts: only use new asm-generic/ptrace.h api when needed
Linus' tree still has its build failure for which I have added the above
The block tree gained a build failure so I sued the version from
The mmc tree gained a conflict against Linus' tree and a build failure so
I reverted the merge of this tree for today.
The tip 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 191 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 firstname.lastname@example.org
$ git checkout master
$ git reset --hard stable
CONFLICT (content): Merge conflict in arch/sparc/include/asm/smp_32.h
CONFLICT (content): Merge conflict in arch/sparc/kernel/smp_32.c
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020ds.dts
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020rdb.dts
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
$ git reset --hard HEAD^
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 (content): Merge conflict in kernel/rcutree.c
[master b15250a] Revert "Merge remote-tracking branch 'mmc/mmc-next'"
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to email@example.com
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Follow the discussion 1 reply Make a reply