Today's tree will not build for powerpc allyesconfig (libc aborts the
link due to a free() problem), sparc(32) defconfig and probably some
other configurations.

I am no longer commenting on conflicts that are clearly just caused by
slight differences in what has been merged into Linus' tree and
linux-next or conflicts caused by further changes in the linux-next after
a subset of a tree has been merged.

Changes since 20081021:

New tree:
dwmw2-iommu

Dropped trees:
tests (because its future is in doubt and it has conflicts)
v4l-dvb (the tree is a mess)
proc (messy conflicts, hopefully fixed tomorrow)

Trees undropped:
bdev

The cpus4096 tree lost its conflict.

The stackprotector tree lost its conflict, but gained a build fix patch.

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
[url]http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/[/url]). 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
(see below).

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, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 121 trees (counting Linus' and 14 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
[url]http://kisskb.ellerman.id.au/linux-next[/url] . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at [url]http://l4x.org/k/[/url] , the guys at [url]http://test.kernel.org/[/url] and Randy
Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
[url]http://linux.f-seidel.de/linux-next/pmwiki/[/url] . Thanks to Frank Seidel.

pci-dma.c:(.init.text+0x3381): undefined reference to `forbid_dac'
pci-dma.c:(.init.text+0x3387): undefined reference to `forbid_dac'
pci-dma.c:(.init.text+0x33a1): undefined reference to `forbid_dac'
pci-dma.c:(.init.text+0x33a7): undefined reference to `forbid_dac'
pci-dma.c:(.init.text+0x33e7): undefined reference to `forbid_dac'
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email]majordomo@vger.kernel.org[/email]
More majordomo info at [url]http://vger.kernel.org/majordomo-info.html[/url]
Please read the FAQ at [url]http://www.tux.org/lkml/[/url]