Hi all, Changes since 20081229: Undropped tree: nfs (FS-Cache has been removed) rr Dropped trees (temporarily): driver-core (build problem) usb (depends on driver-core) kvm (build problem) semaphore-removal (due to unfixed conflicts against Linus' tree) cpu_alloc (build problem) audit (difficult conflicts) staging (depends on usb) Linus' tree lost three build failures. The powerpc tree lost its conflict. The sparc tree lost its conflict. The driver-core tree was dopped because of an ongoing build failure. This means that the usb and staging trees had to be dropped as well as they depend on the driver-core tree. The timers tree lost a conflict and a merge fixup. The scsi tree gained a build failure. The mtd tree lost 2 conflicts. The rr tree lost two conflicts and its build failure. The block tree lost its conflict. The kmemcheck tree lost two conflicts, but gained 2 conflicts against the slab tree. The iommu tree lost its conflicts. The uwb tree lost a conflict. The nommu tree lost a conflict. The boot-params tree lost 2 conflicts. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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 (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 (if any), it is also built with powerpc allnoconfig, 44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. We are up to 132 trees (counting Linus' and 15 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 more builds. 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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master Merging arm-current/master Merging m68k-current/for-linus Merging powerpc-merge/merge Merging sparc-current/master Merging scsi-rc-fixes/master Merging net-current/master Merging sound-current/for-linus Merging pci-current/for-linus Merging wireless-current/master Merging kbuild-current/master Merging quilt/driver-core.current Merging quilt/usb.current Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-linus Merging audit-current/for-linus CONFLICT (content): Merge conflict in drivers/char/tty_audit.c Merging dwmw2/master Created commit 708de92: Revert "RDMA/addr: Add support for translating IPv6 addresses" Merging arm/devel Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging mips/mips-for-linux-next Merging parisc/master Merging powerpc/next Merging 4xx/next Merging galak/next Merging pxa/for-next Merging s390/features Merging sh/master Merging sparc/master Merging x86/auto-x86-next Merging xtensa/master Merging tip-core/auto-core-next CONFLICT (content): Merge conflict in include/linux/hardirq.h Merging cpus4096/auto-cpus4096-next Merging ftrace/auto-ftrace-next Merging genirq/auto-genirq-next Merging safe-poison-pointers/auto-safe-poison-pointers-next Merging sched/auto-sched-next Merging stackprotector/auto-stackprotector-next Merging timers/auto-timers-next CONFLICT (content): Merge conflict in kernel/time/tick-sched.c Merging pci/linux-next Merging quilt/device-mapper CONFLICT (content): Merge conflict in drivers/md/dm.c Merging hid/for-next Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging jfs/next Merging kbuild/master Merging quilt/ide Merging libata/NEXT Merging nfs/linux-next Merging xfs/master CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h Merging infiniband/for-next Merging acpi/test Merging nfsd/nfsd-next CONFLICT (content): Merge conflict in fs/lockd/host.c CONFLICT (content): Merge conflict in fs/lockd/mon.c Merging ieee1394/for-next Merging ubi/linux-next Merging dlm/next Merging scsi/master Merging ocfs2/linux-next CONFLICT (content): Merge conflict in fs/ocfs2/namei.c Merging ext4/next Merging async_tx/next Applying: net: async_tx merge fix Merging udf/for_next Merging net/master Merging mtd/master CONFLICT (content): Merge conflict in arch/arm/mach-pxa/corgi.c CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c CONFLICT (content): Merge conflict in arch/arm/mach-pxa/spitz.c Merging wireless/master Merging crypto/master Merging vfs/for-next Merging sound/for-next Merging cpufreq/next Merging v9fs/for-next Merging rr_cpumask/master CONFLICT (content): Merge conflict in kernel/sched.c Merging quilt/rr CONFLICT (content): Merge conflict in kernel/rcuclassic.c Merging cifs/master Merging mmc/next Merging gfs2/master Merging input/next Merging semaphore/semaphore Merging bkl-removal/bkl-removal CONFLICT (content): Merge conflict in fs/ioctl.c Merging ubifs/linux-next Merging lsm/for-next Merging block/for-next Merging embedded/master Merging firmware/master CONFLICT (content): Merge conflict in drivers/net/tg3.c CONFLICT (content): Merge conflict in drivers/scsi/advansys.c CONFLICT (content): Merge conflict in drivers/scsi/qla1280.c CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c CONFLICT (content): Merge conflict in firmware/Makefile CONFLICT (content): Merge conflict in firmware/WHENCE Merging pcmcia/master Merging battery/master Merging leds/for-mm Merging backlight/for-mm Merging kgdb/kgdb-next Merging slab/for-next Merging uclinux/for-next Merging md/for-next Merging kmemcheck/auto-kmemcheck-next CONFLICT (content): Merge conflict in arch/x86/mm/Makefile CONFLICT (content): Merge conflict in mm/Makefile CONFLICT (content): Merge conflict in mm/slub.c Merging generic-ipi/auto-generic-ipi-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next Merging voltage/for-next Merging security-testing/next Merging lblnet/master CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging quilt/ttydev CONFLICT (content): Merge conflict in fs/devpts/inode.c Merging agp/agp-next Merging oprofile/auto-oprofile-next Merging fastboot/auto-fastboot-next Merging sparseirq/auto-sparseirq-next Merging iommu/auto-iommu-next Merging uwb/for-upstream CONFLICT (content): Merge conflict in drivers/uwb/wlp/eda.c Merging watchdog/master Merging proc/proc Merging bdev/master Merging dwmw2-iommu/master Merging cputime/cputime CONFLICT (content): Merge conflict in kernel/sched.c Merging osd/linux-next Merging fatfs/master Merging fuse/for-next Merging jc_docs/docs-next Merging nommu/master CONFLICT (content): Merge conflict in kernel/fork.c Merging boot-params/master CONFLICT (content): Merge conflict in arch/arm/kernel/setup.c CONFLICT (content): Merge conflict in arch/parisc/kernel/setup.c CONFLICT (content): Merge conflict in arch/sh/boards/mach-microdev/setup.c CONFLICT (content): Merge conflict in arch/sh/boards/mach-migor/setup.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/common.c Merging trivial/for-next $ git checkout -b temp scsi-post-merge/master $ git checkout master
Attachment:
pgpujHCYstLhQ.pgp
Description: PGP signature
