[lkml]   [2011]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: Tree for May 23
    Hi all,

    Changes since 20110520:

    My fixes tree contains:
    sparc32: fix build, move inline function to .c file
    sparc32: fix build, fix missing cpu_relax declaration

    Linus' tree lost its build failures.

    The i.MX tree gained conflicts against the arm tree.

    The s5p tree gained a conflict against the arm tree.

    The s390 tree lost its build failure.

    The sparc tree gained a conflict against the fixes tree.

    The ubifs tree gained a build failure for which I reverted a commit.

    The net tree lost its conflict.

    The block tree lost its conflicts.

    The mfd tree lost its conflict.

    The tip tree lost its conflicts and build failure.

    The driver-core tree lost its conflict.


    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 (32 and
    64 bit), ppc44x_defconfig and allyesconfig (minus
    CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
    and sparc64 defconfig. These builds also have
    CONFIG_DEBUG_INFO disabled when necessary.

    Below is a summary of the state of the merge.

    We are up to 190 trees (counting Linus' and 28 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 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 fixes/fixes
    Merging kbuild-current/rc-fixes
    Merging arm-current/master
    Merging m68k-current/for-linus
    Merging powerpc-merge/merge
    Merging 52xx-and-virtex-current/powerpc/merge
    Merging sparc-current/master
    Merging scsi-rc-fixes/master
    Merging net-current/master
    Merging sound-current/for-linus
    Merging pci-current/for-linus
    Merging wireless-current/master
    Merging driver-core.current/driver-core-linus
    Merging tty.current/tty-linus
    Merging usb.current/usb-linus
    Merging staging.current/staging-linus
    Merging cpufreq-current/fixes
    Merging input-current/for-linus
    Merging md-current/for-linus
    Merging audit-current/for-linus
    Merging crypto-current/master
    Merging ide-curent/master
    Merging dwmw2/master
    Merging sh-current/sh-fixes-for-linus
    Merging rmobile-current/rmobile-fixes-for-linus
    Merging fbdev-current/fbdev-fixes-for-linus
    Merging devicetree-current/devicetree/merge
    Merging spi-current/spi/merge
    Merging arm/for-next
    CONFLICT (content): Merge conflict in include/linux/clocksource.h
    Merging at91/at91-next
    Merging davinci/davinci-next
    Merging i.MX/for-next
    CONFLICT (content): Merge conflict in arch/arm/mach-imx/Kconfig
    CONFLICT (content): Merge conflict in arch/arm/plat-mxc/Kconfig
    Merging linux-spec/for-next
    Merging msm/for-next
    Merging omap/for-next
    Merging pxa/for-next
    Merging samsung/next-samsung
    Merging s5p/for-next
    CONFLICT (content): Merge conflict in arch/arm/Kconfig
    Merging tegra/for-next
    Merging ux500-core/ux500-core
    Merging xilinx/arm-next
    Merging blackfin/for-linus
    Merging cris/for-next
    Merging ia64/test
    Merging m68k/for-next
    Merging m68knommu/for-next
    Merging microblaze/next
    Merging mips/mips-for-linux-next
    Merging parisc/for-next
    Merging powerpc/next
    Merging 4xx/next
    Merging 52xx-and-virtex/powerpc/next
    Merging galak/next
    Merging s390/features
    Merging sh/sh-latest
    Merging rmobile/rmobile-latest
    Merging sparc/master
    CONFLICT (content): Merge conflict in arch/sparc/include/asm/smp_32.h
    CONFLICT (content): Merge conflict in arch/sparc/kernel/smp_32.c
    Merging tile/master
    Merging unicore32/unicore32
    CONFLICT (content): Merge conflict in drivers/net/Kconfig
    Merging xtensa/master
    CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
    Merging ceph/for-next
    Merging cifs/master
    Merging configfs/linux-next
    Merging ecryptfs/next
    Merging ext3/for_next
    Merging ext4/dev
    Merging fatfs/master
    Merging fuse/for-next
    Merging gfs2/master
    Merging hfsplus/for-next
    Merging jfs/next
    Merging logfs/master
    CONFLICT (content): Merge conflict in fs/logfs/logfs.h
    Merging nfs/linux-next
    Merging nfsd/nfsd-next
    Merging nilfs2/for-next
    Merging ocfs2/linux-next
    Merging omfs/for-next
    Merging squashfs/master
    Merging udf/for_next
    Merging v9fs/for-next
    Merging ubifs/linux-next
    Merging xfs/master
    Merging vfs/for-next
    Merging vfs-scale/vfs-scale-working
    Merging pci/linux-next
    CONFLICT (content): Merge conflict in include/linux/pci_ids.h
    Merging hid/for-next
    Merging quilt/i2c
    Merging bjdooks-i2c/next-i2c
    Merging quilt/jdelvare-hwmon
    Merging hwmon-staging/hwmon-next
    Merging quilt/kernel-doc
    Merging docs/docs-move
    Merging v4l-dvb/master
    Merging kbuild/for-next
    CONFLICT (content): Merge conflict in Makefile
    Merging kconfig/for-next
    Merging ide/master
    Merging libata/NEXT
    Merging infiniband/for-next
    Merging acpi/test
    Merging idle-test/idle-test
    Merging powertools/tools-test
    Merging cpupowerutils/master
    Merging ieee1394/for-next
    Merging ubi/linux-next
    Merging dlm/next
    Merging swiotlb/master
    Merging ibft/master
    Merging scsi/master
    Merging async_tx/next
    Merging net/master
    Merging wireless/master
    Merging bluetooth/master
    CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
    Merging mtd/master
    Merging crypto/master
    Merging sound/for-next
    Merging sound-asoc/for-next
    Merging cpufreq/next
    Merging cpufreq-move/move-drivers
    Merging quilt/rr
    Merging input/next
    Merging input-mt/next
    Merging lsm/for-next
    Merging block/for-next
    Merging quilt/device-mapper
    Merging embedded/master
    Merging firmware/master
    Merging pcmcia/master
    Merging battery/master
    Merging leds/for-mm
    CONFLICT (content): Merge conflict in drivers/leds/Kconfig
    Merging backlight/for-mm
    Merging mmc/mmc-next
    CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc_pio.c
    Merging kgdb/kgdb-next
    Merging slab/for-next
    CONFLICT (content): Merge conflict in mm/slub.c
    Merging uclinux/for-next
    Merging md/for-next
    Merging mfd/for-next
    Merging hdlc/hdlc-next
    Merging drm/drm-next
    Merging fbdev/master
    Merging viafb/viafb-next
    Merging omap_dss2/for-next
    CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dsi.c
    CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dss_features.c
    CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dss_features.h
    Merging voltage/for-next
    CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
    CONFLICT (content): Merge conflict in drivers/mfd/Makefile
    Merging security-testing/next
    Merging selinux/master
    CONFLICT (content): Merge conflict in lib/flex_array.c
    CONFLICT (content): Merge conflict in security/selinux/avc.c
    CONFLICT (content): Merge conflict in security/selinux/hooks.c
    CONFLICT (content): Merge conflict in security/selinux/ss/policydb.c
    CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
    Merging lblnet/master
    Merging agp/agp-next
    Merging watchdog/master
    Merging bdev/master
    Merging dwmw2-iommu/master
    Merging cputime/cputime
    Merging osd/linux-next
    Merging jc_docs/docs-next
    Merging nommu/master
    Merging trivial/for-next
    Merging audit/for-next
    Merging suspend/linux-next
    Merging apm/for-next
    Merging fsnotify/for-next
    Merging irda/for-next
    Merging i7core_edac/linux_next
    Merging i7300_edac/linux_next
    Merging devicetree/devicetree/next
    Merging spi/spi/next
    Merging tip/auto-latest
    Merging rcu/rcu/next
    Merging kvm/linux-next
    Merging oprofile/for-next
    Merging ptrace/ptrace
    Merging xen/upstream/xen
    Merging xen-two/linux-next
    Merging xen-pvhvm/linux-next
    Merging edac-amd/for-next
    Merging percpu/for-next
    CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h
    Merging workqueues/for-next
    Merging sfi/sfi-test
    Merging asm-generic/next
    Merging drivers-x86/linux-next
    CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig
    CONFLICT (content): Merge conflict in drivers/platform/x86/Makefile
    CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
    CONFLICT (content): Merge conflict in drivers/platform/x86/sony-laptop.c
    Merging hwpoison/hwpoison
    Merging sysctl/master
    Merging namespace/master
    CONFLICT (content): Merge conflict in arch/alpha/include/asm/unistd.h
    CONFLICT (content): Merge conflict in arch/alpha/kernel/systbls.S
    CONFLICT (content): Merge conflict in arch/m68k/kernel/entry_mm.S
    Merging driver-core/driver-core-next
    Merging tty/tty-next
    CONFLICT (content): Merge conflict in drivers/bluetooth/hci_ldisc.c
    CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
    Merging usb/usb-next
    CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c
    Merging staging/staging-next
    CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
    CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intelmid.c
    CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_pci.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_pci.c left in tree.
    CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_usb.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_usb.c left in tree.
    CONFLICT (content): Merge conflict in drivers/staging/usbip/vhci_sysfs.c
    $ git rm -f drivers/staging/rt2860/common/cmm_data_pci.c drivers/staging/rt2860/common/cmm_data_usb.c
    Merging slabh/slabh
    Merging bkl-config/config
    Merging cleancache/linux-next
    CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
    Merging arm-dt/devicetree/arm-next
    Merging scsi-post-merge/merge-base:master
    [master c01731f] Revert "UBIFS: switch to dynamic printks"
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2011-05-23 07:47    [W:0.034 / U:56.588 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site