Hi all, Changes since 20081103: New tree: cputime Dropped trees (temporarily): v4l-dvb (due to an unfixed build failure) semaphore-removal (due to unfixed conflicts against Linus' tree) creds (non obvious conflict) userns (because it depends on the creds tree) Removed tree: tests (maybe revived in the future) The s390 tree lost its 2 conflicts. The slab tree lost all its conflicts and its build fix. The creds tree gained a conflict against the security-testing tree which did not have an obvious fix, so I have dropped the tree for today. I have also applied the following patches for known problems: Revert "qlogicpti: use request_firmware" cpu_alloc: per_cpu_offset is already defined for !CONFIG_SMP ps3: ps3-lpm.c compile fix cell: fix ras.c compilation ---------------------------------------------------------------------------- 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 122 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 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 Merging quilt/usb.current Merging cpufreq-current/fixes Merging input-current/for-linus Merging md-current/for-2.6.26 Merging dwmw2/master Merging arm/devel Merging avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging quilt/m68k Merging m68knommu/for-next Merging mips/mips-for-linux-next Merging parisc/master Merging powerpc/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 quilt/driver-core Merging quilt/usb Merging tip-core/auto-core-next 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 Merging pci/linux-next Merging quilt/device-mapper Merging hid/mm Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging jfs/next Merging kbuild/master Merging quilt/ide Merging libata/NEXT Merging nfs/linux-next Merging xfs/master Applying fs: xfs needs inode_wait to be exported Merging infiniband/for-next Merging acpi/test Merging nfsd/nfsd-next Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/master Merging dlm/next Merging scsi/master Merging ocfs2/linux-next Merging ext4/next Merging async_tx/next Merging udf/for_next Merging net/master Merging mtd/master Merging wireless/master Merging crypto/master Merging vfs/for-next Merging sound/for-next 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 bkl-removal/bkl-removal Merging ubifs/linux-next Merging lsm/for-next Merging block/for-next Merging embedded/master Merging firmware/master CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c 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 MAINTAINERS CONFLICT (content): Merge conflict in arch/x86/mm/Makefile CONFLICT (content): Merge conflict in mm/slab.c CONFLICT (content): Merge conflict in mm/slub.c Merging generic-ipi/auto-generic-ipi-next Merging mfd/for-next Merging hdlc/hdlc-next CONFLICT (delete/modify): Documentation/DocBook/wanbook.tmpl deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of Documentation/DocBook/wanbook.tmpl left in tree. CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree. $ git rm -f drivers/net/wan/syncppp.c Documentation/DocBook/wanbook.tmpl Merging drm/drm-next Merging voltage/for-linus Merging security-testing/next Merging lblnet/master Merging quilt/ttydev 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 Merging watchdog/master Merging proc/proc Merging bdev/master Merging dwmw2-iommu/master Merging cpu_alloc/cpu_alloc CONFLICT (content): Merge conflict in kernel/lockdep.c CONFLICT (content): Merge conflict in kernel/module.c Merging cputime/cputime Merging scsi-post-merge/master CONFLICT (content): Merge conflict in drivers/scsi/qlogicpti.c CONFLICT (content): Merge conflict in firmware/WHENCE mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result. Applying ps3: ps3-lpm.c compile fix Applying cell: fix ras.c compilation Applying cpu_alloc: per_cpu_offset is already defined for !CONFIG_SMP
Attachment:
pgpferUOMRyLE.pgp
Description: PGP signature
