Hi all, The summary of the difference between 2.6.27-rc1 and today's tree is: 1383 files changed, 50871 insertions(+), 37618 deletions(-) thanks partly to the include/asm-sh -> arch/sh/include/asm rename, 1307 kvm commits and 188 xfs commits. Changes since next-20080729: Temporarily dropped trees: acpi (it is being moved to a new tree and is just accumulating conflicts against Linus' tree). v4l-dvb (got lots of conflicts against the version that was merged to Linus). Linus' tree gained a three build fix (from the pci-current tree). The driver-core tree had a commit reverted but the problem is actually elsewhere. The battery tree lost its conflicts. I have also applied the following patches for known problems: hfcmulti is not supported on big endian cpumask: statement expressions confuse some versions of gcc tests: lkdtm needs ide.h The sparc(32) defconfig build still fails - this is probably a toolchain problem. ---------------------------------------------------------------------------- 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, 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 105 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 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 Applying move iommu_num_pages helper to x86 Merging powerpc-merge/merge Merging scsi-rc-fixes/master Merging net-current/master Merging sparc-current/master Merging sound-current/for-linus Merging arm-current/master Merging pci-current/for-linus Merging wireless-current/master Merging kbuild-current/master Merging quilt/driver-core.current CONFLICT (content): Merge conflict in drivers/dca/dca-sysfs.c Merging quilt/usb.current Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-2.6.26 Merging quilt/driver-core Created commit cfe6207: Revert "warn when statically-allocated kobjects are used" Merging quilt/usb Merging tip-core/auto-core-next Merging cpus4096/auto-cpus4096-next CONFLICT (content): Merge conflict in net/sunrpc/svc.c 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 Merging x86/auto-x86-next CONFLICT (content): Merge conflict in drivers/pci/dmar.c Merging pci/linux-next Merging quilt/device-mapper Merging hid/mm Merging quilt/i2c Merging quilt/kernel-doc Merging avr32/avr32-arch Merging s390/features Merging sh/master Merging jfs/next Merging kbuild/master Merging quilt/ide Merging libata/NEXT Merging nfs/linux-next Merging xfs/master Merging infiniband/for-next Merging blackfin/for-linus Merging nfsd/nfsd-next Merging ieee1394/for-next Merging hwmon/testing Merging ubi/linux-next Merging kvm/master Merging dlm/next Merging scsi/master Merging ia64/test Merging tests/master Merging ocfs2/linux-next Merging quilt/m68k Merging powerpc/next Merging ext4/next Merging 4xx/next Merging async_tx/next Merging udf/for_next Merging net/master Merging sparc/master Merging galak/powerpc-next Merging mtd/master Merging wireless/master Merging crypto/master Merging vfs/for-next Merging sound/for-next Merging arm/devel Merging cpufreq/next Merging v9fs/for-next Merging quilt/rr Merging cifs/master Merging mmc/next Merging gfs2/master Merging input/next Merging semaphore/semaphore Merging semaphore-removal/semaphore-removal Merging bkl-removal/bkl-removal Merging trivial/next CONFLICT (content): Merge conflict in Documentation/edac.txt CONFLICT (content): Merge conflict in include/linux/securebits.h Merging ubifs/linux-next Merging lsm/for-next Merging block/for-next Merging embedded/master Merging firmware/master CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile Merging pcmcia/master Merging battery/master Merging leds/for-mm Merging backlight/for-mm Merging kgdb/kgdb-next Merging slab/for-next Merging m68knommu/for-next Merging uclinux/for-next Merging md/for-next Merging cris/for-next Merging kmemcheck/auto-kmemcheck-next Merging generic-ipi/auto-generic-ipi-next Merging mips/mips-for-linux-next Merging mfd/for-next Merging hdlc/hdlc-next Merging drm/drm-next CONFLICT (add/add): Merge conflict in drivers/gpu/Makefile CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i830/Makefile CONFLICT (content): Merge conflict in include/Kbuild CONFLICT (add/add): Merge conflict in include/drm/Kbuild Merging voltage/reg-for-linus Merging security-testing/next Merging lblnet/master Merging quilt/ttydev Applying hfcmulti is not supported on big endian Applying cpumask: statement expressions confuse some versions of gcc Applying tests: lkdtm needs ide.h
Attachment:
pgp730FCTbeqU.pgp
Description: PGP signature
