From: Stephen Rothwell on 17 Jun 2010 01:20
Changes since 20100616:
My fixes tree contains:
v4l-dvb: update gfp/slab.h includes
arm: update gfp/slab.h includes
davinci: update gfp/slab.h includes
ocfs2: update gfp/slab.h includes
acpi: update gfp/slab.h includes
The rr tree lost its conflict (but one of its patches did not import).
The battery tree lost its conflict.
The usb tree gained a build failure for which I applied a patch.
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 163 trees (counting Linus' and 22 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(a)canb.auug.org.au
$ git checkout master
$ git reset --hard stable
CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
CONFLICT (content): Merge conflict in fs/ecryptfs/main.c
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
CONFLICT (content): Merge conflict in net/mac80211/mlme.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/evergreen.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r600.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_combios..c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/rv770.c
CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
$ git rm -f fs/notify/inotify/inotify.c
Applying: fsnotify: update gfp/slab.h includes
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
CONFLICT (content): Merge conflict in mm/memory-failure.c
Applying: usb: using copy_from_user in ehci-hcd requies the include of uaccess.h
Prev: linux-next: build failure after merge of the final tree (usb tree related)