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

    Changes since next-20080613:

    The driver-core tree gained a conflict with the scsi-rc-fixes tree.

    The ide tree needed a build fixup patch.

    The net (really the included wireless) tree gained a couple of conflicts
    with the wireless-current tree. It also needed a build fixup patch.

    The arm tree needed a new driver reverted because it needs better Kconfig

    The blk-removal tree gained a conflict with the acpi tree.

    The pcmcia tree gained a conflict with the bkl-removal tree.

    I have temporarily applied the patch "powerpc: ppc32 does not need
    console_drivers exported" to fix know build problems on some powerpc


    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 92 trees (counting Linus' and 13 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 quilt/driver-core
    CONFLICT (content): Merge conflict in drivers/scsi/hosts.c
    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
    CONFLICT (content): Merge conflict in kernel/Makefile
    Applying ftrace: fix rculist split fallout
    Merging stackprotector/auto-stackprotector-next
    Merging timers/auto-timers-next
    Merging x86/auto-x86-next
    CONFLICT (content): Merge conflict in arch/x86/kernel/io_apic_32.c
    CONFLICT (delete/modify): arch/x86/kernel/nmi_32.c deleted in x86/auto-x86-next and modified in HEAD. Version HEAD of arch/x86/kernel/nmi_32.c left in tree.
    CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
    CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
    Merging pci/linux-next
    CONFLICT (content): Merge conflict in arch/x86/pci/irq.c
    CONFLICT (content): Merge conflict in include/linux/device.h
    Merging quilt/device-mapper
    Merging hid/mm
    Merging quilt/i2c
    CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
    Merging quilt/kernel-doc
    Merging avr32/avr32-arch
    Merging v4l-dvb/stable
    Merging s390/features
    CONFLICT (content): Merge conflict in drivers/s390/block/dasd.c
    CONFLICT (content): Merge conflict in drivers/s390/block/dasd_eckd.c
    CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c
    CONFLICT (content): Merge conflict in drivers/s390/char/tape_core.c
    CONFLICT (content): Merge conflict in drivers/s390/cio/device_fsm.c
    CONFLICT (content): Merge conflict in drivers/s390/net/claw.c
    CONFLICT (content): Merge conflict in drivers/s390/net/ctcm_main.c
    CONFLICT (content): Merge conflict in drivers/s390/net/lcs.c
    Merging sh/master
    Merging jfs/next
    Merging kbuild/master
    Merging quilt/ide
    Applying ide pmac fixes 1
    Merging libata/NEXT
    Merging nfs/linux-next
    Merging xfs/master
    Merging infiniband/for-next
    Merging acpi/test
    CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c
    CONFLICT (content): Merge conflict in drivers/acpi/sleep/main.c
    Merging blackfin/for-linus
    Merging nfsd/nfsd-next
    CONFLICT (content): Merge conflict in net/sunrpc/svc.c
    Merging ieee1394/for-next
    Merging hwmon/testing
    Merging ubi/master
    Merging kvm/master
    Merging dlm/next
    Merging scsi/master
    Applying scsi: fix fallout from the class_find_device API change
    Applying scsi: fix fallout from KOBJ_NAME_LEN removal
    Merging ia64/test
    Merging tests/master
    CONFLICT (content): Merge conflict in lib/Kconfig.debug
    Merging ocfs2/linux-next
    Merging selinux/for-akpm
    Merging quilt/m68k
    Merging powerpc/powerpc-next
    Merging lblnet/master
    Merging ext4/next
    Merging 4xx/next
    Merging async_tx/next
    Merging udf/for_next
    Merging security-testing/next
    Merging net/master
    CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
    CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/Kconfig
    CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2x00usb.c
    Applying wireless: fix fallout from device_create removal
    Merging sparc/master
    Merging galak/powerpc-next
    CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
    Merging mtd/master
    Merging wireless/master
    Merging crypto/master
    Merging vfs/vfs-2.6.25
    Merging sound/master
    Merging arm/devel
    CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c
    CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
    Created commit dda0dc5: Revert "[ARM] 5096/1: Support Toshiba TC6393XB Mobile I/O Controller."
    Merging cpufreq/next
    CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
    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 drivers/net/ps3_gelic_wireless.c
    CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c
    CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h
    CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c
    CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c
    CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
    Merging bkl-removal/bkl-removal
    CONFLICT (content): Merge conflict in kernel/power/user.c
    Merging trivial/next
    Merging ubifs/for_andrew
    Merging lsm/for-next
    Merging block/for-next
    CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
    CONFLICT (content): Merge conflict in arch/x86/kernel/apic_32.c
    CONFLICT (delete/modify): arch/x86/kernel/i8259_64.c deleted in HEAD and modified in block/for-next. Version block/for-next of arch/x86/kernel/i8259_64.c left in tree.
    CONFLICT (content): Merge conflict in arch/x86/xen/smp.c
    CONFLICT (delete/modify): include/asm-x86/hw_irq_32.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_32.h left in tree.
    CONFLICT (delete/modify): include/asm-x86/hw_irq_64.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/hw_irq_64.h left in tree.
    CONFLICT (delete/modify): include/asm-x86/mach-default/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-default/irq_vectors.h left in tree.
    CONFLICT (delete/modify): include/asm-x86/mach-voyager/irq_vectors.h deleted in HEAD and modified in block/for-next. Version block/for-next of include/asm-x86/mach-voyager/irq_vectors.h left in tree.
    CONFLICT (content): Merge conflict in kernel/Makefile
    Applying block: fix up rculist split fallout
    Merging embedded/master
    Merging firmware/master
    CONFLICT (content): Merge conflict in drivers/char/ip2/ip2main.c
    CONFLICT (content): Merge conflict in drivers/usb/misc/isight_firmware.c
    CONFLICT (content): Merge conflict in drivers/usb/serial/Kconfig
    CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_3410.h left in tree.
    CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_5052.h left in tree.
    CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c
    CONFLICT (content): Merge conflict in sound/pci/Kconfig
    CONFLICT (content): Merge conflict in sound/pci/maestro3.c
    CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c
    Merging pcmcia/master
    CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c
    Merging battery/master
    Merging leds/for-mm
    Merging backlight/for-mm
    CONFLICT (content): Merge conflict in drivers/video/backlight/Kconfig
    CONFLICT (content): Merge conflict in drivers/video/backlight/Makefile
    Merging kgdb/kgdb-next
    Applying powerpc: ppc32 does not need console_drivers exported
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2008-06-16 11:03    [W:2.223 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site