linux-next: Tree for November 10 - Kernel

This is a discussion on linux-next: Tree for November 10 - Kernel ; Hi all, Changes since 20081107: New tree: osd Undropped trees: v4l-dvb perfmon3 Dropped trees (temporarily): block (build error) xfs (unresolved build error) semaphore-removal (due to unfixed conflicts against Linus' tree) firmware (unfixed build failure) The usb tree gained a conflict ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: linux-next: Tree for November 10

  1. linux-next: Tree for November 10

    Hi all,

    Changes since 20081107:

    New tree:

    Undropped trees:

    Dropped trees (temporarily):
    block (build error)
    xfs (unresolved build error)
    semaphore-removal (due to unfixed conflicts against Linus' tree)
    firmware (unfixed build failure)

    The usb tree gained a conflict against the net-current tree.

    The kvm tree did not require reverting today.

    The net tree lost 2 conflicts but gained 2 more against Linus' tree.

    The rr tree lost its 2 conflicts.

    The block tree lost its 2 conflicts, but gained a build error and was

    The proc tree gained a build error caused by a conflict against the
    tip-core tree.

    The cputime tree gained a conflict against the s390 tree.


    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 (if any), 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 124 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
    CONFLICT (content): Merge conflict in arch/arm/mach-realview/clock.c
    CONFLICT (content): Merge conflict in arch/arm/mach-versatile/clock.c
    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/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
    CONFLICT (content): Merge conflict in drivers/net/usb/hso.c
    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 v4l-dvb/master
    Merging jfs/next
    Merging kbuild/master
    Merging quilt/ide
    Merging libata/NEXT
    Merging nfs/linux-next
    Merging xfs/master
    $ git reset --hard HEAD^
    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
    CONFLICT (content): Merge conflict in drivers/message/fusion/mptlan.c
    CONFLICT (content): Merge conflict in drivers/net/sfc/ethtool.c
    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
    $ git reset --hard HEAD^
    Merging embedded/master
    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-next
    Merging security-testing/next
    Merging lblnet/master
    Merging quilt/ttydev
    Merging agp/agp-next
    Merging creds/creds-v4
    CONFLICT (content): Merge conflict in security/selinux/hooks.c
    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
    Applying proc: merge fix 1
    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
    Applying cpu_alloc: merge_fix_1
    Merging userns/next
    Merging cputime/cputime
    CONFLICT (content): Merge conflict in arch/s390/kernel/process.c
    Merging perfmon3/master
    Merging osd/linux-next
    Merging scsi-post-merge/master

    Version: GnuPG v1.4.9 (GNU/Linux)

    -----END PGP SIGNATURE-----

  2. Re: linux-next: Tree for November 10

    This is a reminder that x86_64 UML is still busted:

    CC arch/um/kernel/asm-offsets.s
    In file included from arch/um/include/asm/fixmap.h:5,
    from arch/um/include/shared/um_uaccess.h:10,
    from arch/um/include/asm/uaccess.h:41,
    from arch/um/include/asm/thread_info.h:13,
    from include/linux/thread_info.h:55,
    from include/linux/preempt.h:9,
    from include/linux/spinlock.h:50,
    from include/linux/seqlock.h:29,
    from include/linux/time.h:8,
    from include/linux/timex.h:57,
    from include/linux/sched.h:54,
    from arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h:2,
    from arch/um/kernel/asm-offsets.c:1:
    arch/um/include/asm/system.h:16:1: warning: "raw_local_irq_restore" redefined


    from arch/um/kernel/asm-offsets.c:1:
    include/linux/proportions.h: In function 'prop_inc_percpu':
    include/linux/proportions.h:75: error: implicit declaration of function 'local_irq_save'
    include/linux/proportions.h:77: error: implicit declaration of function 'local_irq_restore'
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to
    More majordomo info at
    Please read the FAQ at

+ Reply to Thread