Hi all, This tree fails (more than usual) the powerpc allyesconfig build. Changes since 20140224: The powerpc tree still had its build failure. The mfd-lj tree still had its build failure so I used the version from next-20140210. The wireless-next tree gained a build failure so I used the version from next-20140224. The spi tree lost its build failure. The watchdog tree gained a conflict against the mvebu tree. The staging tree gained conflicts against the arm-soc and imx-mxs trees. The char-misc tree still had its build failure for which I applied a merge fix patch. Non-merge commits (relative to Linus' tree): 41340 4327 files changed, 156351 insertions(+), 81744 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). 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 and a multi_v7_defconfig for arm. 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, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. I am currently merging 210 trees (counting Linus' and 28 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . 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 Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (7472e009a3f1 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8) Merging arm-current/fixes (b36345759308 ARM: 7980/1: kernel: improve error message when LPAE config doesn't match CPU) Merging m68k-current/for-linus (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr) Merging metag-fixes/fixes (e6cfc0295c7d asm-generic: add sched_setattr/sched_getattr syscalls) Merging powerpc-merge/merge (66f9af83e56b powerpc/eeh: Disable EEH on reboot) Merging sparc/master (10527106abec Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux) Merging net/master (0e7ede80d929 virtio-net: alloc big buffers also when guest can receive UFO) Merging ipsec/master (ee5c23176fcc xfrm: Clone states properly on migration) Merging sound-current/for-linus (c60666bd2224 ALSA: hda/realtek - Add more entry for enable HP mute led) Merging pci-current/for-linus (fc40363b2140 ahci: Fix broken fallback to single MSI mode) Merging wireless/master (558ff225de80 ath9k: fix ps-poll responses under a-mpdu sessions) Merging driver-core.current/driver-core-linus (6d0abeca3242 Linux 3.14-rc3) Merging tty.current/tty-linus (5c0a2450d695 Revert "tty: Set correct tty name in 'active' sysfs attribute") Merging usb.current/usb-linus (5bf5dbeda245 usb: chipidea: need to mask when writting endptflush and endptprime) Merging staging.current/staging-linus (cfbf8d4857c2 Linux 3.14-rc4) Merging char-misc.current/char-misc-linus (58e868be77bd Merge 3.14-rc4 into char-misc-linus) Merging input-current/for-linus (70b0052425ff Input: da9052_onkey - use correct register bit for key status) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (ee97dc7db4cb crypto: s390 - fix des and des3_ede ctr concurrency issue) Merging ide/master (738b52bb9845 Merge tag 'microblaze-3.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (1f42e5dd5065 of: Add self test for of_match_node()) Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm) Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works) Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) Merging drm-intel-fixes/for-linux-next-fixes (f51a44b9a6c4 drm/i915/dp: add native aux defer retry limit) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (67a2635aa64a ARC: [clockevent] simplify timer ISR) Merging arm/for-next (a94e70d5d97b Merge branches 'amba', 'fixes', 'misc', 'mmci', 'unstable/omap-dma' and 'unstable/sa11x0' into for-next) Merging arm-perf/for-next/perf (8e781f65423c ARM: perf: add support for the Cortex-A12 PMU) Merging arm-soc/for-next (48bbbf563b12 Merge branches 'next/cleanup', 'next/soc', 'next/dt', 'next/boards', 'next/drivers' and 'fixes' into for-next) Merging bcm2835/for-next (724619af236c Merge branch 'for-3.15/dt' into for-next) Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (8cfdab14395c Merge branch 'imx/dt' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-imx/common.h CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (52eaa3d1e97f Merge branch 'for_3.15/dts' into next) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (15a5f3f82a92 Merge branch 'mvebu/dt-3xx' into for-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt Merging renesas/next (5ffd11e972c4 Merge branches 'heads/defconfig-for-v3.15', 'heads/intc-for-v3.15', 'heads/soc-for-v3.15', 'heads/clock-for-v3.15', 'heads/boards-for-v3.15' and 'heads/dt-for-v3.15' into next) Merging samsung/for-next (aaeeda6f5783 Merge branch 'v3.15-next/cleanup-samsung' into for-next) Merging tegra/for-next (1ea2965c2ddd Merge branch for-3.15/defconfig into for-next) Merging arm64/for-next/core (38dbfb59d117 Linus 3.14-rc1) Merging blackfin/for-linus (58095fdaaf1c From: Eunbong Song <eunb.song@xxxxxxxxxxx>) Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h) Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) Merging hexagon/linux-next (44eb66c228fe Hexagon: update CR year for elf.h) Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64) Merging m68k/for-next (7247f55381d5 m68k: Wire up sched_setattr and sched_getattr) Merging m68knommu/for-next (72a8ab3cb2a5 m68knommu: fix arg types for outs* functions) Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() static) Merging microblaze/next (1cbe158dec8c microblaze: Drop architecture-specific declaration of early_printk) Merging mips/mips-for-linux-next (7d3f1a59e7e5 Merge branch '3.14-fixes' into mips-for-linux-next) Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (38dbfb59d117 Linus 3.14-rc1) Merging powerpc/next (f878f84373ae powerpc: Wire up sched_setattr and sched_getattr syscalls) Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) Merging s390/features (d72d2bb5a6bc s390/checksum: remove memset() within csum_partial_copy_from_user()) Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) Merging tile/master (5e01dc7b26d9 Linux 3.12) Merging uml/next (989e59fa41c5 um: Include generic barrier.h) CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL) Merging xtensa/for_next (b3fdfc1b4b64 Merge tag 'xtensa-for-next-20140221-1' into for_next) Merging btrfs/next (cf93da7bcf45 Btrfs: fix spin_unlock in check_ref_cleanup) Merging ceph/master (bee26897097f libceph: a per-osdc crush scratch buffer) Merging cifs/for-next (bfa85c96429d cifs: mask off top byte in get_rfc1002_length()) Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging ecryptfs/next (9e78d14a9f64 Use %pd in eCryptFS) Merging ext3/for_next (0dc83bd30b0b Revert "writeback: do not sync data dirtied after sync start") Merging ext4/dev (442ed22745a0 ext4: merge uninitialized extents) Merging f2fs/dev (8b8343fa9d50 f2fs: implement a lock-free stat_show) Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) Merging fuse/for-next (b2ec2778df9d fuse: Turn writeback cache on) Merging gfs2/master (ad781971d9b8 GFS2: add missing newline) Merging jfs/jfs-next (844fa1b5f849 jfs: set i_ctime when setting ACL) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (146d70caaa1b NFS fix error return in nfs4_select_rw_stateid) Merging nfsd/nfsd-next (1406b916f4a2 nfsd: fix lost nfserrno() call in nfsd_setattr()) Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) Merging v9fs/for-next (38dbfb59d117 Linus 3.14-rc1) Merging ubifs/linux-next (5547fec74a56 UBI: fix some use after free bugs) Merging xfs/for-next (f13780692e65 Merge branch 'xfs-collapse-range' into for-next) Merging file-private-locks/linux-next (1ed1950c412f locks: add new fcntl cmd values for handling file private locks) Merging vfs/for-next (527d1511310a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging pci/next (86afe959b08e Merge branches 'pci/host-designware', 'pci/host-imx6' and 'pci/host-rcar' into next) CONFLICT (content): Merge conflict in drivers/ata/ahci.c Merging hid/for-next (afbe1c7e1a53 Merge branch 'for-3.15/sony' into for-next) CONFLICT (content): Merge conflict in drivers/hid/i2c-hid/i2c-hid.c CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h CONFLICT (content): Merge conflict in drivers/hid/hid-core.c Merging i2c/i2c/for-next (6d0abeca3242 Linux 3.14-rc3) Merging jdelvare-hwmon/master (c1d70b646dae hwmon: (lm90) Convert to use hwmon_device_register_with_groups) Merging hwmon-staging/hwmon-next (10056e55982a hwmon: (max6639) Convert to use devm_hwmon_device_register_with_groups) Merging v4l-dvb/master (b215621049bd Merge branch 'v4l_for_linus' into to_next) Merging kbuild/for-next (ff6b9bdb6263 Merge branch 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (1bda101edbd0 Merge branch 'for-3.15' into for-next) Merging pm/linux-next (799a1d02a2d5 Merge branch 'pm-cpufreq-next') Merging idle/next (62eec04c7fa3 Merge branch 'turbostat' into release) Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (6d0abeca3242 Linux 3.14-rc3) Merging ieee1394/for-next (fcd46b34425d firewire: Enable remote DMA above 4 GB) Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages) Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2)) Merging slave-dma/next (3c79200df630 Merge branch 'fixes' into next) Merging dmaengine/next (77873803363c net_dma: mark broken) Merging net-next/master (a1991c749a7b Merge branch 'mlx4') CONFLICT (content): Merge conflict in net/ipv6/sit.c CONFLICT (content): Merge conflict in drivers/net/wireless/mwifiex/pcie.c Merging ipsec-next/master (cc9ab60e5796 xfrm: Cleanup error handling of xfrm_state_clone) Merging wireless-next/master (ef1b4141d043 ath5k: set SURVEY_INFO_IN_USE on get_survey) $ git reset --hard HEAD^ Merging next-20140224 version of wireless-next Merging bluetooth/master (8b064a3ad377 Bluetooth: Clean up HCI state when doing power off) Merging infiniband/for-next (7f3c1e1ba82e Merge branches 'cma', 'cxgb4', 'iser', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'usnic' into for-next) Merging mtd/master (bb38eefb6858 mtd: nand: omap: fix ecclayout->oobfree->length) Merging l2-mtd/master (6ce719b36b85 mtd: ts5500: Add dependency) Merging crypto/master (883619a931e9 crypto: caam - fix ERA retrieval function) Merging drm/drm-next (ef64cf9d0604 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next) Merging drm-intel/for-linux-next (4c0e55288211 drm/i915: fix NULL deref in the load detect code) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c Merging drm-tegra/drm/for-next (a608d94a0b50 gpu: host1x: export host1x_syncpt_incr_max() function) Merging sound/for-next (20c8cd593abb ALSA: rawmidi: remove undefined functions.) Merging sound-asoc/for-next (b0953178caec Merge remote-tracking branches 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8993', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm8996', 'asoc/topic/wm9081' and 'asoc/topic/wm9705' into asoc-next) CONFLICT (content): Merge conflict in sound/soc/kirkwood/Kconfig Merging modules/modules-next (917307b09ad5 module: remove MODULE_GENERIC_TABLE) Merging virtio/virtio-next (6f0317058f43 tools/virtio: add a missing )) Merging input/next (7fb45edba8b5 Input: imx_keypad - Propagate the real error code on platform_get_irq() failure) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (e28a3e241fb6 Merge branch 'for-3.15/core' into for-next) Merging device-mapper/for-next (1acacc0784aa dm thin: fix the error path for the thin device constructor) Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) Merging mmc/mmc-next (a6492c02073c mmc: sdhci-bcm-kona: Add basic use of clocks) Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) Merging slab/for-next (26e4f2057516 slub: Fix possible format string bug.) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (789b5e031528 md/raid5: Fix CPU hotplug callback registration) Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd) Merging mfd-lj/for-mfd-next (90f473a72867 mfd: timberdale: Use pci_enable_msix_range() instead of pci_enable_msix()) $ git reset --hard HEAD^ Merging next-20140210 version of mfd-lj Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data) Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (c4a41bcc1726 video: xilinxfb: Move xilinxfb_platform_data directly to the driver) Merging regulator/for-next (ba6181c68cae Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6524x', 'regulator/topic/tps6586x', 'regulator/topic/tps65910', 'regulator/topic/tps80031', 'regulator/topic/wm831x', 'regulator/topic/wm8350' and 'regulator/topic/wm8994' into regulator-next) Merging security/next (f5645d3575fe capability: Use current logging styles) Merging selinux/next (81c94e76ce8e selinux: fix the output of ./scripts/get_maintainer.pl for SELinux) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (3b8b0d45f703 watchdog: xilinx: Remove no_timeout variable) CONFLICT (content): Merge conflict in drivers/watchdog/orion_wdt.c Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) Merging iommu/next (972157cac528 arm/smmu: Use irqsafe spinlock for domain lock) Merging vfio/next (3be3a074cf5b vfio-pci: Don't use device_lock around AER interrupt setup) Merging osd/linux-next (19350e7627a6 exofs: Print less in r4w) Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) Merging trivial/for-next (80dd6eac0090 net-sysfs: fix comment typo 'CONFIG_SYFS') Merging audit/master (f3411cb2b2e3 audit: whitespace fix in kernel-parameters.txt) Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (f4d4ffc03efc kbuild: dtbs_install: new make target) CONFLICT (content): Merge conflict in drivers/of/of_net.c Applying: net: of: merges fix for a moved comment Merging dt-rh/for-next (06b29e76a74b of: search the best compatible match first in __of_match_node()) Merging spi/for-next (49f0a611bab9 Merge remote-tracking branches 'spi/topic/txx9', 'spi/topic/xfer' and 'spi/topic/xilinx' into spi-next) Merging tip/auto-latest (2d286bdbc88c Merge branch 'x86/x32') Merging clockevents/clockevents/next (00e2bcd6d35f clocksource: Timer-sun5i: Switch to sched_clock_register()) Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put) Merging edac-amd/for-next (1d29f0791169 i7core_edac: Fix PCI device reference count) Merging ftrace/for-next (1fcc155351f1 ftrace: Have static function trace clear ENABLED flag on unregister) Merging rcu/rcu/next (e9d86a3c1385 Merge branch 'torture.2014.02.23a' into HEAD) CONFLICT (content): Merge conflict in kernel/rcu/rcutorture.c Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) Merging kvm-arm/kvm-arm-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) Merging kvm-ppc/kvm-ppc-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) Merging xen-tip/linux-next (d8491c62480a Revert "x86/xen: allow privcmd hypercalls to be preempted") Merging percpu/for-next (d5f2deed588b Merge branch 'for-3.14' into for-next) Merging workqueues/for-next (379e899a2c66 Merge branch 'for-3.15' into for-next) Merging drivers-x86/linux-next (b4b0b4a9e039 ipc: add intel-mid's pci id macros) Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) Merging regmap/for-next (091209fa0420 Merge remote-tracking branches 'regmap/topic/irq', 'regmap/topic/nodev' and 'regmap/topic/patch' into regmap-next) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (59e35a9e5315 drivers/leds: delete non-required instances of include <linux/init.h>) Merging driver-core/driver-core-next (6d8b3e1ad3d3 kernfs: remove duplicate dir.c at the top dir) Merging tty/tty-next (12f287878afc serial: fsl_lpuart: documented the clock requirement.) Merging usb/usb-next (f6723b569a67 usb: host: remove selects of USB_ARCH_HAS_?HCI) Merging usb-gadget/next (40f099e32c2a usb: musb: dsps, debugfs files) Merging staging/staging-next (58e757313850 Merge branch 'imx-drm-staging' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53-qsb.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53-mba53.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx51-babbage.dts Applying: ARM: dts: i.MX53: merge fix patch Merging char-misc/char-misc-next (35efc5a425e3 Merge 3.14-rc4 into char-misc-next) Applying: mei: txe: include irqreturn.h for irqreturn_t etc Merging cgroup/for-next (3c0d1ccae0e5 Merge branch 'for-3.14-fixes' into for-next) Merging scsi/for-next (960dfc4eb23a Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) Merging target-updates/for-next (9af6de4a22c5 target: silence GCC warning in target_alua_state_check) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (6ad357580e5c pinctrl: sirf: update copyright years to 2014) CONFLICT (add/add): Merge conflict in drivers/pinctrl/mvebu/pinctrl-armada-38x.c CONFLICT (add/add): Merge conflict in drivers/pinctrl/mvebu/pinctrl-armada-375.c CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) Merging gpio/for-next (a3485d088516 gpio: consumer.h: Move forward declarations outside #ifdef) Merging dma-mapping/dma-mapping-next (cfbf8d4857c2 Linux 3.14-rc4) Merging pwm/for-next (6691a19966f0 pwm: tiecap: Remove duplicate put_sync call) Merging dma-buf/for-next (c0b00a525c12 dma-buf: update debugfs output) Merging userns/for-next (f58437f1f916 MIPS: VPE: Remove vpe_getuid and vpe_getgid) Merging ktest/for-next (961d9caceea2 ktest: Add BISECT_TRIES to bisect test) Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging clk/clk-next (c112c1d8ef29 clk: ux500: Staticize ux500_twocell_get) Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for the SHA's IV in extract_buf()) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.) Merging aio/master (4675348e78fa Merge tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) Merging llvmlinux/for-next (f557840d8992 x86, acpi: LLVMLinux: Remove nested functions from Thinkpad ACPI) Merging akpm-current/current (79db0b2d0308 ipc: use device_initcall) CONFLICT (content): Merge conflict in mm/memcontrol.c CONFLICT (content): Merge conflict in drivers/sbus/char/jsflash.c $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: arm: move arm_dma_limit to setup_dma_zone Applying: mm: add strictlimit knob Merging akpm/master (003b27d367bf mm: add strictlimit knob)
Attachment:
pgpSk55iDU1JX.pgp
Description: PGP signature
