[lkml]   [2008]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: Tree for October 21
    Hi all,

    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 20081020:

    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)
    bdev (too many conflicts for me to fix today)

    Linus' tree lost its buid fix patch.

    The drivers-core.current tree lost its conflicts.

    The usb.current tree lost its conflicts.

    The parisc tree lost its conflict.

    The sh tree lost its 2 conflicts.

    The usb tree lost a conflict and a build fix patch.

    The ftrace tree lost its 3 conflicts.

    The timers tree gained a conflict against Linus' tree.

    The acpi tree gained a conflict against Linus' tree but also lost a conflict.

    The mtd tree lost its build fix revert.

    The rr tree lost its 2 conflicts.

    The leds tree gained a build fix patch.

    The slab tree gained a conflict against Linus' tree.

    The kmemcheck tree gained 2 conflicts against Linus' tree.

    The creds tree gained a conflict against Linus' tree.
    The fastboot tree lost a conflict.

    The uwb tree lost its 2 conflicts.

    The proc tree gained 2 conflicts against Linus' tree and a build failure
    that caused me to drop it for today.

    I have also applied the following patches for known problems:

    sparc: qlogicpti fallout from sbus removal
    ibm_newemac: Fix new MAL feature handling
    binfmt_elf_fdpic: Update for cputime changes.
    Fix page_cgroup build breakage
    fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c


    I have created today's linux-next tree at
    (patches at 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 120 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 . 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 , the guys at and Randy
    Dunlap for doing many randconfig builds.

    There is a wiki covering stuff to do with linux-next at . Thanks to Frank Seidel.

    Stephen Rothwell

    $ 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/next
    Merging 4xx/next
    Merging galak/powerpc-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
    Created commit 73d994e: Revert "USB: remove info() macro from usb.h"
    Created commit 8c73818: Revert "USB: remove warn() macro from usb.h"
    Merging tip-core/auto-core-next
    Merging cpus4096/auto-cpus4096-next
    CONFLICT (content): Merge conflict in include/asm-x86/smp.h
    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
    CONFLICT (content): Merge conflict in kernel/fork.c
    Merging timers/auto-timers-next
    CONFLICT (content): Merge conflict in arch/x86/kvm/i8254.c
    CONFLICT (content): Merge conflict in kernel/time/tick-sched.c
    Applying DECLARE_PER_CPU needs linux/percpu.h
    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
    Merging infiniband/for-next
    Merging acpi/test
    CONFLICT (content): Merge conflict in MAINTAINERS
    CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/boot.c
    CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c
    CONFLICT (content): Merge conflict in drivers/acpi/Kconfig
    CONFLICT (content): Merge conflict in drivers/pnp/Makefile
    CONFLICT (content): Merge conflict in drivers/pnp/quirks.c
    Applying acpi: merge fix for dpulicate acpi_mcfg_64bit_base_addr
    Applying acpi: acpi_os_hotplug_execute needs to be exported
    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
    CONFLICT (content): Merge conflict in fs/ext4/namei.c
    Applying vfs/xfs: fallout from i_vnode change
    Applying vfs: fix up merge of ext4
    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 semaphore-removal/semaphore-removal
    CONFLICT (content): Merge conflict in net/9p/trans_virtio.c
    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/scsi/qlogicpti.c
    CONFLICT (content): Merge conflict in firmware/WHENCE
    Merging pcmcia/master
    Merging battery/master
    Merging leds/for-mm
    Applying leds/acpi: fix merge fallout from acpi_driver_data change
    Merging backlight/for-mm
    Merging kgdb/kgdb-next
    Merging slab/for-next
    CONFLICT (content): Merge conflict in mm/Makefile
    Merging uclinux/for-next
    Merging md/for-next
    Merging kmemcheck/auto-kmemcheck-next
    CONFLICT (content): Merge conflict in MAINTAINERS
    CONFLICT (content): Merge conflict in include/linux/mm_types.h
    CONFLICT (content): Merge conflict in init/main.c
    CONFLICT (content): Merge conflict in kernel/sysctl.c
    CONFLICT (content): Merge conflict in 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
    Merging drm/drm-next
    Merging voltage/for-linus
    Merging security-testing/next
    Merging lblnet/master
    Merging quilt/ttydev
    Created commit 3b5cfed: Revert "8250-oxsemi-mainpine"
    Merging agp/agp-next
    Merging creds/next-creds-subsys
    CONFLICT (content): Merge conflict in fs/devpts/inode.c
    CONFLICT (content): Merge conflict in fs/namespace.c
    CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c
    CONFLICT (content): Merge conflict in include/linux/sched.h
    CONFLICT (content): Merge conflict in kernel/exit.c
    CONFLICT (content): Merge conflict in kernel/fork.c
    CONFLICT (content): Merge conflict in kernel/signal.c
    CONFLICT (content): Merge conflict in mm/migrate.c
    CONFLICT (content): Merge conflict in net/9p/client.c
    CONFLICT (content): Merge conflict in security/selinux/hooks.c
    Merging oprofile/auto-oprofile-next
    Merging fastboot/auto-fastboot-next
    CONFLICT (content): Merge conflict in drivers/md/Kconfig
    CONFLICT (content): Merge conflict in init/main.c
    CONFLICT (add/add): Merge conflict in scripts/
    Merging sparseirq/auto-sparseirq-next
    Merging iommu/auto-iommu-next
    Merging uwb/for-upstream
    Merging watchdog/master
    Merging proc/proc
    CONFLICT (delete/modify): fs/proc/proc_misc.c deleted in proc/proc and modified in HEAD. Version HEAD of fs/proc/proc_misc.c left in tree.
    CONFLICT (content): Merge conflict in fs/proc/vmcore.c
    CONFLICT (content): Merge conflict in mm/hugetlb.c
    $ git rm -f fs/proc/proc_misc.c
    $ git reset --hard HEAD^
    Merging scsi-post-merge/master
    Applying sparc: qlogicpti fallout from sbus removal
    Applying ibm_newemac: Fix new MAL feature handling
    Applying binfmt_elf_fdpic: Update for cputime changes.
    Applying Fix page_cgroup build breakage
    Applying fix CONFIG_HIGHMEM compile error in drivers/gpu/drm/i915/i915_gem.c
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2008-10-21 10:53    [W:0.034 / U:9.912 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site