lkml.org 
[lkml]   [2008]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: Tree for April 9
    Hi all,

    I have created today's linux-next tree at
    git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
    (tar balls at
    http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).

    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.

    There were a few merge conflicts (fairly trivial) and couple of build
    failures (notified). There is a know build failure with powerpc
    allyesconfig. Below is a summary of the state of the merge.

    We are up to 55 trees, 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/ and the guys at http://test.kernel.org/.

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    Merging origin/master
    Merging x86-fixes/for-linus
    Merging sched-fixes/for-linus
    Merging powerpc-merge/merge
    Merging scsi-rc-fixes/master
    Merging quilt/driver-core
    Merging quilt/pci
    Merging quilt/usb
    Merging x86/for-akpm
    Created commit 11876f8: Revert "x86: phase out forced inlining"
    Merging sched/for-akpm
    Merging quilt/device-mapper
    Merging hid/mm
    Merging quilt/i2c
    Merging quilt/kernel-doc
    Merging avr32/avr32-arch
    Merging v4l-dvb/stable
    Merging s390/features
    Merging sh/master
    Merging jfs/next
    Merging kbuild/master
    Merging quilt/ide
    CONFLICT (content): Merge conflict in Documentation/ide/ide.txt
    CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
    CONFLICT (content): Merge conflict in drivers/ide/ide.c
    CONFLICT (content): Merge conflict in include/asm-x86/ide.h
    CONFLICT (content): Merge conflict in include/linux/Kbuild
    Merging libata/NEXT
    Applying libata-fix-1.patch
    Merging nfs/linux-next
    Merging xfs/master
    Merging infiniband/for-next
    CONFLICT (content): Merge conflict in drivers/infiniband/hw/amso1100/c2_provider.c
    CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb3/iwch_provider.c
    CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c
    Applying infiniband-fix-2
    Merging acpi/test
    CONFLICT (content): Merge conflict in arch/x86/kernel/setup_64.c
    CONFLICT (delete/modify): arch/x86/kernel/smpboot_64.c deleted in HEAD and modified in acpi/test. Version acpi/test of arch/x86/kernel/smpboot_64.c left in tree.
    CONFLICT (delete/modify): include/asm-x86/smp_64.h deleted in HEAD and modified in acpi/test. Version acpi/test of include/asm-x86/smp_64.h left in tree.
    $ git rm arch/x86/kernel/smpboot_64.c include/asm-x86/smp_64.h
    Applying acpi-fix-1.patch
    Applying acpi-fix-2.patch
    Merging blackfin/for-linus
    Merging nfsd/nfsd-next
    Merging ieee1394/for-next
    CONFLICT (content): Merge conflict in lib/Kconfig.debug
    Merging hwmon/testing
    Merging ubi/master
    Merging kvm/master
    CONFLICT (add/add): Merge conflict in include/asm-s390/sysinfo.h
    CONFLICT (content): Merge conflict in include/asm-x86/kvm_host.h
    Merging dlm/next
    Merging scsi/master
    Merging ia64/test
    CONFLICT (content): Merge conflict in arch/ia64/mm/tlb.c
    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 hrt/mm
    Merging lblnet/master
    Merging ext4/next
    CONFLICT (content): Merge conflict in fs/jbd2/journal.c
    CONFLICT (content): Merge conflict in fs/jbd2/revoke.c
    Merging 4xx/next
    Merging async_tx/next
    Merging udf/for_next
    Merging security-testing/next
    Merging net/master
    CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
    CONFLICT (content): Merge conflict in MAINTAINERS
    Merging galak/powerpc-next
    Merging mtd/master
    Merging wireless/master
    Merging crypto/master
    Merging vfs/vfs-2.6.25
    CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c
    CONFLICT (content): Merge conflict in fs/xfs/xfs_ialloc.c
    CONFLICT (content): Merge conflict in fs/xfs/xfs_sb.h
    Merging semaphore/semaphore
    CONFLICT (delete/modify): include/asm-x86/semaphore_32.h deleted in semaphore/semaphore and modified in HEAD. Version HEAD of include/asm-x86/semaphore_32.h left in tree.
    CONFLICT (delete/modify): include/asm-x86/semaphore_64.h deleted in semaphore/semaphore and modified in HEAD. Version HEAD of include/asm-x86/semaphore_64.h left in tree.
    $ git rm include/asm-x86/semaphore_32.h include/asm-x86/semaphore_64.h
    Merging quilt/ldp
    Created commit 1d2b198: Revert "wusb: add the wireless usb stack to Linux"
    Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP
    Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP
    Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2008-04-09 10:55    [W:0.027 / U:61.408 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site