Hi all, Please do not add material intended for v3.16 to your linux-next included branches until after v3.15-rc1 is released. This tree still fails (more than usual) the powerpc allyesconfig build. Changes since 20140331: The ia64 tree lost its build failure. The powerpc tree still had its build failure. The v4l-dvb tree still had its build failure so I used the version from next-20140328. The audit tree gained conflicts against Linus' and the net-next trees. Non-merge commits (relative to Linus' tree): 10933 9135 files changed, 457444 insertions(+), 222441 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 (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 213 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 (01d5f3b598b1 Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata) 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 (6041003a8fec ARC: Remove unused DT template file) Merging arm-current/fixes (95c52fe06335 ARM: 8007/1: Remove extraneous kcmp syscall ignore) Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3.14-rc1) Merging metag-fixes/fixes (0414855fdc4a Linux 3.14-rc5) Merging powerpc-merge/merge (ece980ff6de6 powerpc/book3s: Fix CFAR clobbering issue in machine check handler.) Merging sparc/master (455c6fdbd219 Linux 3.14) Merging net/master (17e84a925346 at86rf230: mask irq's before deregister device) Merging ipsec/master (3e3d35402140 ATHEROS-ATL1E: Convert iounmap to pci_iounmap) Merging sound-current/for-linus (69dd89fd2b94 Merge tag 'asoc-v3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (707d4eefbdb3 Revert "[PATCH] Insert GART region into resource map") Merging wireless/master (584221918925 Revert "rt2x00: rt2800lib: Update BBP register initialization for RT53xx") Merging driver-core.current/driver-core-linus (0414855fdc4a Linux 3.14-rc5) Merging tty.current/tty-linus (0414855fdc4a Linux 3.14-rc5) Merging usb.current/usb-linus (fa389e220254 Linux 3.14-rc6) Merging staging.current/staging-linus (dcb99fd9b08c Linux 3.14-rc7) Merging char-misc.current/char-misc-linus (0414855fdc4a Linux 3.14-rc5) Merging input-current/for-linus (e4dbedc7eac7 Input: mousedev - fix race when creating mixed device) 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 (5b40dd30bbfa ide: Fix SC1200 dependencies) 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 (9db32cb625a5 drm/i915: Undo gtt scratch pte unmapping again) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (b098d6726bbf Linux 3.14-rc8) Merging arm/for-next (54740e1ee0fe Merge branch 'devel-stable' into for-next) Merging arm-kvm-cpuresume/arm-kvm-cpuresume (91a3f6af430d arm: kernel: sleep: restore HYP mode configuration in cpu_resume) Merging arm-perf/for-next/perf (6d0abeca3242 Linux 3.14-rc3) Merging arm-soc/for-next (e98cd7220a1b arm-soc: document samsung merges) CONFLICT (content): Merge conflict in sound/soc/kirkwood/Kconfig CONFLICT (content): Merge conflict in arch/arm/boot/dts/keystone-clocks.dtsi Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) 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 (faa51ae59b9a Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (47fc77cc704e Merge branch 'for_3.15/fixes' into next) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (97623e934388 Merge branch 'mvebu/dt' into for-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile Merging renesas/next (68d1f3aad83a Merge branch 'heads/clock-for-v3.15' into next) Merging samsung/for-next (82cd4473bde8 Merge branch 'v3.15-next/cleanup-exynos' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-exynos/exynos.c Merging tegra/for-next (dcb99fd9b08c Linux 3.14-rc7) Merging arm64/for-next/core (196adf2f3015 arm64: Remove pgprot_dmacoherent()) Merging blackfin/for-linus (58095fdaaf1c From: Eunbong Song <eunb.song@xxxxxxxxxxx>) Merging c6x/for-linux-next (ae72758f1dd9 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 (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf) Merging m68k/for-next (50be9eba831d m68k: Update defconfigs for v3.14-rc1) Merging m68knommu/for-next (4dc5aa217237 m68knommu: fix arg types for outs* functions) Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE) Merging microblaze/next (cff2ee046e06 microblaze: Wire-up new system calls sched_setattr/getattr) Merging mips/mips-for-linux-next (ade63aada79c 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 (84021f14762a parisc: Replace __get_cpu_var uses for address calculation) Merging powerpc/next (cd427485357c Merge remote-tracking branch 'scott/next' into next) 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 (233faec97a1d s390/con3270: optionally disable auto update) Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) Merging tile/master (620830b69549 perf tools: Allow building for tile) 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 (00fdf13a2e9f Btrfs: fix a crash of clone with inline extents's split) Merging ceph/master (bee26897097f libceph: a per-osdc crush scratch buffer) Merging cifs/for-next (04807bc81e39 Return correct error on query of xattr on file with empty xattrs) 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 (f294d3e7be28 ext3: explicitly remove inode from orphan list after failed direct io) Merging ext4/dev (2c74cd642a46 ext4: each filesystem creates and uses its own mb_cache) Merging f2fs/dev (808a1d749067 f2fs: avoid RECLAIM_FS-ON-W warning) 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 (1b2ad41214c9 GFS2: Fix address space from page function) 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 (e911b8158ee1 NFSv4: Fix a use-after-free problem in open()) Merging nfsd/nfsd-next (18df11d0eacf nfsd4: fix memory leak in nfsd4_encode_fattr()) 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 (8a5daf1e2c19 9pnet_rdma: check token type before int conversion) Merging ubifs/linux-next (d56030ac25d3 UBI: block: Remove __initdata from ubiblock_param_ops) Merging xfs/for-next (fe986f9d88ab Merge branch 'xfs-O_TMPFILE-support' into for-next) Merging file-private-locks/linux-next (08ab986a0c6d locks: make locks_mandatory_area check for file-private locks) CONFLICT (content): Merge conflict in fs/compat.c Merging vfs/for-next (527d1511310a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging pci/next (30723cbf6f7a Merge branch 'pci/resource' into next) CONFLICT (content): Merge conflict in drivers/ata/ahci.c CONFLICT (content): Merge conflict in arch/x86/include/asm/topology.h Merging hid/for-next (0e6c18776c2c Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-next) CONFLICT (content): Merge conflict in drivers/hid/i2c-hid/i2c-hid.c CONFLICT (content): Merge conflict in drivers/hid/hid-sony.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 (10c5a8425968 i2c: qup: New bus driver for the Qualcomm QUP I2C controller) Merging jdelvare-hwmon/master (a1261382eab0 hwmon: (it87) Add support for IT8623E) Merging hwmon-staging/hwmon-next (f76992b00a41 hwmon: (pmbus/ltc2978) Add support for LTM4676) Merging v4l-dvb/master (4592284f2304 Merge branch 'patchwork' into to_next) $ git reset --hard HEAD^ Merging next-20140328 version of v4l-dvb Merging kbuild/for-next (bc7428e3b1cc Merge branch 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (935c4533263e Merge branch 'for-3.15' into for-next) Merging pm/linux-next (89426cf494d6 Merge branch 'pnp') CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_event_intel_uncore.c 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 (e79ca84d62d2 Merge branches 'soc-fix' and 'thermal-core-fix' of .git into next) Merging ieee1394/for-next (0ca49345b6f4 firewire: ohci: fix probe failure with Agere/LSI controllers) 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 (8087179ed556 Merge branch 'for-linus' into next) Merging dmaengine/next (77873803363c net_dma: mark broken) Merging net-next/master (0b70195e0c32 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/stmmac.txt Merging ipsec-next/master (3ab428a4c5ad netfilter: Add missing vmalloc.h include to nft_hash.c) Merging wireless-next/master (a31267c30880 rtl8187: fix use after free on failure path in rtl8187_probe()) Merging bluetooth/master (5c5b93e4be2f Bluetooth: Fix address in unmergeable device found events) Merging infiniband/for-next (c328991dd49e Merge branches 'core', 'cxgb4', 'iser', 'misc', 'mlx4', 'nes', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next) Merging mtd/master (fa389e220254 Linux 3.14-rc6) Merging l2-mtd/master (148256fa0bb8 mtd: nand: fix mention to CONFIG_MTD_NAND_ECC_BCH) Merging crypto/master (37b28947170e crypto: x86/sha1 - reduce size of the AVX2 asm implementation) Merging drm/drm-next (c32fc9c803f8 Merge tag 'vmwgfx-next-2014-03-28' of git://people.freedesktop.org/~thomash/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c Merging drm-intel/for-linux-next (50227e1cae11 drm/i915: prefer struct drm_i915_private to drm_i915_private_t) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c Merging drm-tegra/drm/for-next (c1a68b4c29b8 drm/tegra: Add eDP support) Merging sound/for-next (a4b7f21d7b42 ALSA: hda - Enable beep for ASUS 1015E) Merging sound-asoc/for-next (bb25338b0d71 Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc-next) Merging modules/modules-next (57673c2b0baa Use 'E' instead of 'X' for unsigned module taint flag.) Applying: VERIFY_OCTAL_PERMISSIONS: fix up for staging/speakup Merging virtio/virtio-next (fc4324b4597c virtio-blk: base queue-depth on virtqueue ringsize or module param) Merging input/next (7bbdba56ba9e Input: appletouch - fix jumps when additional fingers are detected) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (3cffe7d19b82 Merge branch 'for-3.15/drivers' into for-next) Merging device-mapper/for-next (039e94327760 dm crypt: sort writes) 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 (5491ce3f79ee mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller) 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 (2d28ca731b9b mfd: wm5110: Correct default for HEADPHONE_DETECT_1) 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 (d754589d8044 OMAPDSS: add missing __init for dss_init_ports) CONFLICT (content): Merge conflict in drivers/video/fbdev/exynos/Kconfig CONFLICT (content): Merge conflict in drivers/video/Makefile CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/gpu/drm/exynos/exynos_dp_reg.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/video/fbdev/exynos/exynos_dp_reg.h" in "omap_dss2/for-next" CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/gpu/drm/exynos/exynos_dp_reg.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/video/fbdev/exynos/exynos_dp_reg.c" in "omap_dss2/for-next" CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/gpu/drm/exynos/exynos_dp_core.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/video/fbdev/exynos/exynos_dp_core.h" in "omap_dss2/for-next" CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/gpu/drm/exynos/exynos_dp_core.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/video/fbdev/exynos/exynos_dp_core.c" in "omap_dss2/for-next" $ git rm -f drivers/video/fbdev/exynos/exynos_dp_core.c drivers/video/fbdev/exynos/exynos_dp_core.h drivers/video/fbdev/exynos/exynos_dp_reg.c drivers/video/fbdev/exynos/exynos_dp_reg.h drivers/video/exynos/exynos_dp_core.c drivers/video/exynos/exynos_dp_core.h drivers/video/exynos/exynos_dp_reg.c drivers/video/exynos/exynos_dp_reg.h Merging regulator/for-next (5481b348e80f Merge remote-tracking branches '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 (f64410ec6654 selinux: correctly label /proc inodes in use before the policy is loaded) Merging selinux/next (eee3094683fb selinux: correctly label /proc inodes in use before the policy is loaded) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (fa62c102a75e watchdog: Fix Elan SC520 dependencies) CONFLICT (content): Merge conflict in drivers/watchdog/orion_wdt.c CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig Merging iommu/next (c6e015a91bc2 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'arm/omap', 'arm/shmobile' and 'x86/vt-d' into next) Merging dwmw2-iommu/master (14d405699634 iommu/vt-d: returning free pointer in get_domain_for_dev()) Merging vfio/next (4379d2ae1528 vfio: always select ANON_INODES) 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 (df5cbb27836f doc: fix double words) Merging audit/master (e231d54c1239 kernel: Use RCU_INIT_POINTER(x, NULL) in audit.c) CONFLICT (content): Merge conflict in kernel/seccomp.c CONFLICT (content): Merge conflict in kernel/audit.c CONFLICT (content): Merge conflict in init/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/Kconfig CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (d88cf7d7b424 Merge remote-tracking branch 'robh/for-next' into devicetree/next) CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h CONFLICT (content): Merge conflict in drivers/of/of_net.c Merging dt-rh/for-next (6f976267da0e of: add missing major vendors) Merging spi/for-next (45b15d98a96f Merge remote-tracking branches 'spi/topic/xilinx' and 'spi/topic/xtfpga' into spi-next) Merging tip/auto-latest (309ba7457356 Merge branch 'x86/x32') CONFLICT (content): Merge conflict in ipc/compat_mq.c CONFLICT (content): Merge conflict in fs/compat.c CONFLICT (rename/delete): drivers/video/fbdev/sgivwfb.c deleted in tip/auto-latest and renamed in HEAD. Version HEAD of drivers/video/fbdev/sgivwfb.c left in tree. CONFLICT (content): Merge conflict in drivers/video/Makefile CONFLICT (content): Merge conflict in drivers/video/Kconfig CONFLICT (content): Merge conflict in drivers/pci/Makefile CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/mmu.c CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig CONFLICT (modify/delete): arch/x86/pci/visws.c deleted in tip/auto-latest and modified in HEAD. Version HEAD of arch/x86/pci/visws.c left in tree. CONFLICT (modify/delete): arch/x86/pci/numaq_32.c deleted in tip/auto-latest and modified in HEAD. Version HEAD of arch/x86/pci/numaq_32.c left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c CONFLICT (content): Merge conflict in arch/arm/mach-zynq/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig CONFLICT (modify/delete): arch/arm/mach-imx/pm-imx6q.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-imx/pm-imx6q.c left in tree. CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20.dtsi $ git rm -f arch/x86/pci/numaq_32.c arch/x86/pci/visws.c drivers/video/fbdev/sgivwfb.c arch/arm/mach-imx/pm-imx6q.c Applying: video: fbdev: fix up fro removal of SGI Visual Workstation Applying: arm: Replace various irq_desc accesses fix for file move Merging clockevents/clockevents/next (09e15176ded1 clocksource: exynos_mct: silence a static checker warning) Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG) Merging edac-amd/for-next (c045ebdf6079 Merge branch 'edac-for-3.15' into for-next) Merging ftrace/for-next (3862807880ac tracing: Add BUG_ON when stack end location is over written) Merging rcu/rcu/next (765a3f4fed70 rcu: Provide grace-period piggybacking API) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (7227fc066660 Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next) CONFLICT (content): Merge conflict in arch/s390/include/asm/kvm_host.h 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 (7227fc066660 Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next) 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 (0a25e113b480 Merge branch 'devel/for-linus-3.15' into linux-next) CONFLICT (content): Merge conflict in drivers/xen/events/events_base.c Merging percpu/for-next (21ddfd38ee9a percpu: renew the max_contig if we merge the head and previous block) Merging workqueues/for-next (c4b75dadde82 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 (6012b1f3424c Merge remote-tracking branches 'regmap/topic/cache', 'regmap/topic/irq', 'regmap/topic/lock', 'regmap/topic/mmio', 'regmap/topic/nodev', 'regmap/topic/parse-val' and 'regmap/topic/patch' into regmap-next) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (0016db26c093 leds: clevo-mail: Make probe function __init) Merging driver-core/driver-core-next (72099304eeb3 Revert "sysfs, driver-core: remove unused {sysfs|device}_schedule_callback_owner()") CONFLICT (content): Merge conflict in arch/x86/Kconfig Merging tty/tty-next (3a13884abea0 tty/serial: omap: empty the RX FIFO at the end of half-duplex TX) Merging usb/usb-next (940ab8f1ef93 Merge tag 'for-usb-next-adventure' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next) CONFLICT (content): Merge conflict in drivers/usb/core/hub.c CONFLICT (content): Merge conflict in drivers/phy/Kconfig CONFLICT (content): Merge conflict in arch/sh/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/samsung-phy.txt Merging usb-gadget/next (4b76e14d95f7 phy: ti-pipe3: Add SATA compatible to Documentation binding) Merging staging/staging-next (94debda32429 staging: xillybus: XILLYBUS_PCIE depends on PCI_MSI) CONFLICT (content): Merge conflict in drivers/usb/core/devio.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/cfg80211.c CONFLICT (content): Merge conflict in drivers/staging/wlags49_h2/wl_netdev.c CONFLICT (content): Merge conflict in drivers/staging/media/msi3101/sdr-msi3101.c CONFLICT (content): Merge conflict in drivers/staging/imx-drm/parallel-display.c CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-tve.c CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-ldb.c CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-hdmi.c CONFLICT (content): Merge conflict in drivers/media/v4l2-core/v4l2-of.c CONFLICT (content): Merge conflict in drivers/media/platform/exynos4-is/fimc-is.c CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53-qsb.dts CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/adc/at91_adc.txt Applying: ARM: dts: i.MX53: merge fix patch Merging char-misc/char-misc-next (1b3fa22e0234 Merge tag 'extcon-next-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) Merging cgroup/for-next (af276c2c356c Merge branch 'for-3.15' into for-next) CONFLICT (content): Merge conflict in mm/memcontrol.c Applying: cgroup: fix up for kernfs_mount API change Merging scsi/for-next (b2bff6ceb61a [SCSI] sd: Quiesce mode sense error messages) Merging target-updates/for-next (9ffed7876c6d iscsi-target: Fix ERL=2 ASYNC_EVENT connection pointer bug) 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 (43f23a0660fa pinctrl: tegra: add some missing Tegra114 entries) 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 (b22978fc33de gpio: rcar: Add helper variable dev = &pdev->dev) CONFLICT (content): Merge conflict in drivers/gpio/gpio-ich.c Merging dma-mapping/dma-mapping-next (68efd7d2fb32 arm: dma-mapping: remove order parameter from arm_iommu_create_mapping()) Merging pwm/for-next (7eb3f6ffb5c3 pwm: Add CLPS711X PWM support) CONFLICT (content): Merge conflict in arch/arm/mach-pxa/Kconfig CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging dma-buf/for-next (dcb99fd9b08c Linux 3.14-rc7) Merging userns/for-next (d211f177b28e audit: Update kdoc for audit_send_reply and audit_list_rules_send) Merging ktest/for-next (62183dcac539 ktest: Set CLOSE_CONSOLE_SIGNAL in the kvm.conf) 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 (1ead31649707 clk: shmobile: fix setting paretn clock rate) Merging random/dev (91a60dc7aa88 random: Add arch_has_random[_seed]()) CONFLICT (content): Merge conflict in arch/x86/include/asm/archrandom.h 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 (fa8a53c39f3f aio: v4 ensure access to ctx->ring_pages is correctly serialised for migration) Merging llvmlinux/for-next (fbc151c073f4 x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id") Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) CONFLICT (content): Merge conflict in arch/powerpc/platforms/powernv/opal-wrappers.S CONFLICT (content): Merge conflict in arch/powerpc/include/asm/opal.h Merging compat/compat (1e4ec6217dcf s390/compat: add copyright statement) Merging rd-docs/master (01d5f3b598b1 Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata) Merging akpm-current/current (f684c6995922 ipc: use device_initcall) CONFLICT (content): Merge conflict in fs/fs-writeback.c $ git am -3 ../patches/0001-Revert-vmstat-use-raw_cpu_ops-to-avoid-false-positiv.patch Applying: Revert "vmstat-use-raw_cpu_ops-to-avoid-false-positives-on-preemption-checks-fix" $ git am -3 ../patches/0002-Revert-vmstat-use-raw_cpu_ops-to-avoid-false-positiv.patch Applying: Revert "vmstat: use raw_cpu_ops to avoid false positives on preemption checks" Applying: ocfs2: VERIFY_OCTAL_PERMISSIONS fix up $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP Applying: kernel: use macros from compiler.h instead of __attribute__((...)) Applying: asm/system.h: clean asm/system.h from docs Applying: asm/system.h: um: arch_align_stack() moved to asm/exec.h Applying: memcg, slab: never try to merge memcg caches Applying: memcg, slab: cleanup memcg cache creation Applying: memcg, slab: separate memcg vs root cache creation paths Applying: memcg, slab: unregister cache from memcg before starting to destroy it Applying: memcg, slab: do not destroy children caches if parent has aliases Applying: slub: adjust memcg caches when creating cache alias Applying: slub: rework sysfs layout for memcg caches Applying: slub: fix leak of 'name' in sysfs_slab_add Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: arm: move arm_dma_limit to setup_dma_zone Applying: percpu: add raw_cpu_ops Applying: mm: use raw_cpu ops for determining current NUMA node Applying: modules: use raw_cpu_write for initialization of per cpu refcount. Applying: net: replace __this_cpu_inc in route.c with raw_cpu_inc Applying: slub: use raw_cpu_inc for incrementing statistics Applying: slub-use-raw_cpu_inc-for-incrementing-statistics-fix Applying: percpu: add preemption checks to __this_cpu ops Applying: preemption_checks: avoid snprintf before checking error conditions Applying: percpu-add-preemption-checks-to-__this_cpu-ops-fix-checkpatch-fixes Applying: lglock: map to spinlock when !CONFIG_SMP Applying: x86/mm: sparse warning fix for early_memremap Applying: mm: create generic early_ioremap() support Applying: x86: use generic early_ioremap Applying: arm64: initialize pgprot info earlier in boot Applying: arm64: add early_ioremap support Applying: doc/kernel-parameters.txt: add early_ioremap_debug Applying: fs/ufs/super.c: add __init to init_inodecache() Applying: fs/ufs: remove unused ufs_super_block_first pointer Applying: fs/ufs: remove unused ufs_super_block_second pointer Applying: fs/ufs: remove unused ufs_super_block_third pointer Applying: ufs: sb mutex merge + mutex_destroy Applying: mm: add strictlimit knob Merging akpm/master (4164b9f9a221 mm: add strictlimit knob) Applying: vmstat: use raw_cpu_ops to avoid false positives on preemption checks Applying: vmstat-use-raw_cpu_ops-to-avoid-false-positives-on-preemption-checks-fix
Attachment:
pgpbVcXfXVMDl.pgp
Description: PGP signature
