Hi all, Changes since 20140516: My fixes tree contains: powerpc/ppc64: Allow allmodconfig to build (finally !) The gpio tree lost its build failure. The pm tree gained a conflict against the samsung tree. The net-next tree gained a build failure so I used the version from next-20140516. The akpm tree gained lots of build warnings for which I reverted 2 commits. Non-merge commits (relative to Linus' tree): 6311 5641 files changed, 224429 insertions(+), 131147 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 218 trees (counting Linus' and 29 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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (14186fea0cb0 Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux) Merging fixes/master (0be9d8b61c0c powerpc/ppc64: Allow allmodconfig to build (finally !)) Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1) Merging arc-current/for-curr (a798c10faf62 Linux 3.15-rc2) Merging arm-current/fixes (d93003e8e4e1 ARM: 8042/1: iwmmxt: allow to build iWMMXt on Marvell PJ4B) Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3.14-rc1) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging powerpc-merge/merge (8050936caf12 powerpc: irq work racing with timer interrupt can result in timer interrupt hang) Merging sparc/master (5aa4ecfd0ddb sparc64: Add membar to Niagara2 memcpy code.) Merging net/master (6bd64ac0f9c2 Merge branch 'stacked_netdevice_locking') Merging ipsec/master (6d004d6cc739 vti: Use the tunnel mark for lookup in the error handlers.) Merging sound-current/for-linus (665ebe926e7b ALSA: sb_mixer: missing return statement) Merging pci-current/for-linus (f5d3352b2751 PCI: tegra: Use new OF interrupt mapping when possible) Merging wireless/master (faf1dc64e345 ath9k_htc: Stop ANI before doing hw_reset) Merging driver-core.current/driver-core-linus (555724a831b4 kernfs, sysfs, cgroup: restrict extra perm check on open to sysfs) Merging tty.current/tty-linus (62a0d8d7c2b2 tty: Fix lockless tty buffer race) Merging usb.current/usb-linus (6ed07d45d09b USB: Nokia 5300 should be treated as unusual dev) Merging usb-gadget-fixes/fixes (886c7c426d46 usb: gadget: at91-udc: fix irq and iomem resource retrieval) Merging staging.current/staging-linus (bb4e506565cf staging: rtl8723au: Do not reset wdev->iftype in netdev_close()) Merging char-misc.current/char-misc-linus (d1db0eea8524 Linux 3.15-rc3) Merging input-current/for-linus (0b5fe736fe92 Input: synaptics - add min/max quirk for the ThinkPad W540) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (3901c1124ec5 crypto: s390 - fix aes,des ctr mode concurrency finding.) Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (e7a23fea64f1 mips: dts: Fix missing device_type="memory" property in memory nodes) Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.) 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 (9bbfd20abe50 drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (134aeaed08c4 ARC: Fixed spelling errors within comments) Merging arm/for-next (c34eb07ff897 Merge branches 'fixes' and 'misc' 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 (d18135c126e8 ARM: perf: add support for the Cortex-A17 PMU) Merging arm-soc/for-next (dc58adae36c6 arm-soc: document new merges) Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) Merging berlin/berlin/for-next (95e39d776f69 Merge branch 'topic/clk-driver' into berlin/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 (931c18d1ce61 Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (b17191583568 Merge branch 'for_3.16/dts' into next) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (74be6be684a8 Merge branch 'mvebu/dt' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/Kconfig Merging renesas/next (d1b3562bcdfe Merge branch 'heads/r7s72100-ccf-for-v3.16' into next) Merging samsung/for-next (16e6ec7ba1b5 Merge branch 'v3.16-next/mcpm-exynos' into for-next) Merging tegra/for-next (ae3caacb703d Merge branch for-3.16/defconfig into for-next) Merging arm64/for-next/core (b9acc49ee946 arm64: Fix deadlock scenario with smp_send_stop()) Merging blackfin/for-linus (c4a2c58d2095 blackfin: cleanup board files) 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 (a9a44fdf3296 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 (e0f96da1182c m68knommu: qspi declutter.) Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE) Merging microblaze/next (14186fea0cb0 Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux) Merging mips/mips-for-linux-next (b9c9c8964f84 Merge branch '3.15-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 (455c6fdbd219 Linux 3.14) Merging powerpc/next (f6869e7fe657 Merge remote-tracking branch 'anton/abiv2' into next) CONFLICT (content): Merge conflict in arch/powerpc/kernel/exceptions-64s.S Merging fsl/next (f9eb581c63b2 powerpc: fix build of epapr_paravirt on 64-bit book3s) Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) Merging s390/features (88140456967a s390/spinlock: fix system hang with spin_retry <= 0) Merging sparc-next/master (bf6569988a48 Merge branch 'sparc32_generic_io_h') Merging tile/master (e540e835f89c tile: cleanup the comment in init_pgprot) 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 (55b441be5cd6 xtensa: ISS: don't depend on CONFIG_TTY) Merging btrfs/next (00fdf13a2e9f Btrfs: fix a crash of clone with inline extents's split) Merging ceph/master (a30be7cb2ccb ceph: skip invalid dentry during dcache readdir) Merging cifs/for-next (0042cf22e164 [CIFS] Clarify SMB2/SMB3 create context and add missing ones) 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 (01d8885785a6 reiserfs: fix race in readdir) Merging ext4/dev (0a9efd1f76c0 ext4: use EXT_MAX_BLOCKS in ext4_es_can_be_merged()) Merging f2fs/dev (70ff5dfeb691 f2fs: use inode_init_owner() to simplify codes) Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) Merging fuse/for-next (1560c974dcd4 fuse: add renameat2 support) Merging gfs2/master (9dd868e1c009 GFS2: fs/gfs2/file.c: kernel-doc warning fixes) Merging jfs/jfs-next (24e4a0f3de21 fs/jfs/jfs_inode.c: atomically set inode->i_flags) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (1f2edbe3fe21 NFS: Don't ignore suid/sgid bit changes after a successful write) Merging nfsd/nfsd-next (baa597b70a45 nfsd4: fill in some missing op_name's) 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 (c9eaa447e77e Linux 3.15-rc1) Merging ubifs/linux-next (604b592e6fd3 UBI: fix rb_tree node comparison in add_map) Merging xfs/for-next (2d6dcc6d7e95 Merge branch 'xfs-attr-cleanup' into for-next) Merging file-private-locks/linux-next (9f234be73db8 locks: add some tracepoints in the lease handling code) Merging vfs/for-next (9bd0bc947d95 kill generic_file_splice_write()) CONFLICT (content): Merge conflict in fs/f2fs/file.c CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c Merging pci/next (518a6a34f645 Merge branches 'pci/hotplug', 'pci/msi', 'pci/virtualization' and 'pci/misc' into next) Merging hid/for-next (7d9f168fde18 Merge branch 'for-3.16/rmi4' into for-next) Merging i2c/i2c/for-next (d7653964c590 i2c: rcar: bail out on zero length transfers) Merging jdelvare-hwmon/master (c9eaa447e77e Linux 3.15-rc1) Merging hwmon-staging/hwmon-next (41c405b35491 hwmon: (emc1403) Add support for emc14x2) Merging v4l-dvb/master (89e2d4278eb8 Merge branch 'patchwork' into to_next) Merging kbuild/for-next (5366c855e0d8 Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (5d388f74d7cc Merge branch 'for-3.16' into for-next) Merging pm/linux-next (07b9b1833cae Merge branch 'acpi-video' into linux-next) CONFLICT (content): Merge conflict in drivers/cpufreq/exynos-cpufreq.h CONFLICT (content): Merge conflict in drivers/cpufreq/exynos-cpufreq.c CONFLICT (content): Merge conflict in arch/mips/loongson/lemote-2f/clock.c Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' 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 (63745aa72ed1 Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel-soc-dts-thermal' and 'thermal-soc-fixes' of .git into next) Merging ieee1394/for-next (b3d681a4fc10 firewire: Use COMPILE_TEST for build testing) 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 (4d340bcee675 Merge branch 'fixes' into next) Merging dmaengine/next (b9bf6d2e84b7 dma: mv_xor: Flush descriptors before activating a channel) Merging net-next/master (d4f0e0958dba net: bridge: fix build) CONFLICT (content): Merge conflict in net/ipv6/xfrm6_output.c CONFLICT (content): Merge conflict in drivers/net/ethernet/altera/altera_sgdma.c CONFLICT (content): Merge conflict in drivers/net/ethernet/altera/altera_msgdma.c $ git reset --hard HEAD^ Merging next-20140516 version of net-next CONFLICT (content): Merge conflict in net/ipv6/xfrm6_output.c CONFLICT (content): Merge conflict in drivers/net/ethernet/altera/altera_sgdma.c CONFLICT (content): Merge conflict in drivers/net/ethernet/altera/altera_msgdma.c [master eeaf5807bc1d] next-20140516/net-next Merging ipsec-next/master (fc68086ce888 net/xfrm/xfrm_output.c: move EXPORT_SYMBOL) Merging wireless-next/master (f8b8a47e06a0 wlcore: Remove trailing semicolon from do {...} while (0) macro) Merging bluetooth/master (f4e2dd53d5d8 Bluetooth: Add missing msecs to jiffies conversion) CONFLICT (content): Merge conflict in drivers/bluetooth/btusb.c Merging infiniband/for-next (7d0a73a40c5c RDMA/cxgb4: Update Kconfig to include Chelsio T5 adapter) Merging mtd/master (28c015a9daab mtd: davinci-nand: disable subpage write for keystone-nand) Merging l2-mtd/master (d64a117eaea8 Documentation: mtd: update the document for m25p80) Merging crypto/master (0118a5521375 hwrng: n2-drv - Introduce the use of the managed version of kzalloc) CONFLICT (content): Merge conflict in drivers/crypto/caam/error.c CONFLICT (rename/delete): drivers/crypto/bfin_crc.h deleted in HEAD and renamed in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.h left in tree. CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig CONFLICT (content): Merge conflict in crypto/crypto_user.c Merging drm/drm-next (e5daa1ddc1b0 Merge tag 'drm-intel-next-2014-05-06' of git://anongit.freedesktop.org/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c Merging drm-panel/drm/panel/for-next (02dfc65dc905 drm/panel: add support for EDT ET057090DHU panel) Merging drm-intel/for-linux-next (d3b448d9917a drm/i915: Only unpin the default ctx object if it exists) Merging drm-tegra/drm/tegra/for-next (f00e104dc165 drm/tegra: gem - Make tegra_bo_import() static) Merging sound/for-next (d576422eda7f ALSA: hda - if statement not indented) Merging sound-asoc/for-next (4e5b5b812a7a Merge remote-tracking branches 'asoc/topic/wm8955' and 'asoc/topic/wm8985' into asoc-next) Merging modules/modules-next (4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.) Merging virtio/virtio-next (a17597d3b418 virtio-rng: fixes for device registration/unregistration) Merging input/next (90550e6fb19f Input: gpio-keys - move the gpio-keys bindings documentation) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (5572bbbc92a1 Merge branch 'for-3.16/drivers' into for-next) Merging device-mapper/for-next (42d32438c4f9 dm thin: cleanup noflush_work to use a proper completion) 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 (197160d52e85 mmc: sdhci: remove mdelay in eMMC tuning) Merging mmc-uh/next (0bb692d67ce7 mmc: mmci: Enforce max frequency configuration through DT) Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) Merging slab/for-next (34bf6ef94a83 mm: slab/slub: use page->list consistently instead of page->lru) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (41040c9701c2 raid5: add an option to avoid copy data from bio to stripe cache) 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 (06ed83a1566a mfd: sec-core: Remove duplicated device type from sec_pmic_dev) 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 (cac74bcff07d Merge branches '3.16/fbdev' and '3.16/fbdev-omap' into for-next) Merging regulator/for-next (53aa16752360 Merge remote-tracking branches 'regulator/topic/tps65090' and 'regulator/topic/tps65217' into regulator-next) CONFLICT (content): Merge conflict in drivers/regulator/tps65090-regulator.c Merging security/next (fab71a90edda security: Convert use of typedef ctl_table to struct ctl_table) Merging selinux/next (47dd0b76ace9 selinux: conditionally reschedule in hashtab_insert while loading selinux policy) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (4a4d559006e7 watchdog: via_wdt: replace del_timer by del_timer_sync) Merging iommu/next (4a40277d217d Merge branches 'iommu/fixes', 'arm/omap', 'arm/smmu', 'arm/shmobile', 'x86/amd' and 'arm/exynos' into next) Merging dwmw2-iommu/master (5ae0566a0fff iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors) Merging vfio/next (4379d2ae1528 vfio: always select ANON_INODES) Merging osd/linux-next (f1f6630b53e7 MAINTAINERS: Update email address for bhalevy) Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) Merging trivial/for-next (5835f25117ef mm: Fix printk typo in dmapool.c) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/omap/omap.txt Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface) CONFLICT (content): Merge conflict in kernel/audit.c CONFLICT (content): Merge conflict in arch/x86/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) Merging dt-rh/for-next (eafd370dfe48 Merge branch 'dt-bus-name' into for-next) Merging spi/for-next (38139d371eb8 Merge remote-tracking branches 'spi/topic/id-const', 'spi/topic/oom', 'spi/topic/pxa2xx', 'spi/topic/sirf' and 'spi/topic/workqueue' into spi-next) Merging tip/auto-latest (1974363f7e89 Merge branch 'x86/x32') CONFLICT (content): Merge conflict in net/ipv4/tcp_output.c CONFLICT (content): Merge conflict in kernel/sched/idle.c CONFLICT (content): Merge conflict in drivers/block/mtip32xx/mtip32xx.c 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 (aa2064d7dd35 EDAC: Fix MC scrub mode comparsion bug for correctable errors) Merging irqchip/irqchip/for-next (c9eaa447e77e Linux 3.15-rc1) Merging ftrace/for-next (4449bf927b61 tracing: Add __bitmask() macro to trace events to cpumasks and other bitmasks) Merging rcu/rcu/next (f96b7117cddd documentation: Clarify wake-up/memory-barrier relationship) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (d9f89b88f510 KVM: x86: Fix CR3 reserved bits check in long mode) Merging kvm-arm/next (4447a208f7fc ARM/ARM64: KVM: Advertise KVM_CAP_ARM_PSCI_0_2 to user space) Merging kvm-ppc/kvm-ppc-next (0f689a33ad17 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) 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 (f59c5145dc6a x86/xen: do not use _PAGE_IOMAP in xen_remap_domain_mfn_range()) Merging percpu/for-next (92a82b81ba46 Merge branch 'for-3.16' into for-next) Merging workqueues/for-next (cf416171e7e1 workqueue: Remove deprecated system_nrt[_freezable]_wq) Merging drivers-x86/linux-next (7a70906e55bf alienware-wmi: cover some scenarios where memory allocations would fail) 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 (bf60cb3ec5fb Merge remote-tracking branches 'regmap/topic/le', 'regmap/topic/mmio', 'regmap/topic/rbtree' and 'regmap/topic/smbus' into regmap-next) Merging hsi/for-next (eafaebd987fc HSI: Introduce Nokia N900 modem driver) Merging leds/for-next (0c9a03b68511 leds: Remove duplicated OOM message for individual driver) Merging driver-core/driver-core-next (d35cc56ddfc9 Merge 3.15-rc3 into staging-next) Merging tty/tty-next (e26f1db9b8d7 tty/serial: fix generic earlycon option parsing) CONFLICT (modify/delete): arch/arm64/kernel/early_printk.c deleted in tty/tty-next and modified in HEAD. Version HEAD of arch/arm64/kernel/early_printk.c left in tree. $ git rm -f arch/arm64/kernel/early_printk.c Merging usb/usb-next (53971a86d2db Merge 3.15-rc3 into usb-next) Merging usb-gadget/next (7751b6fb0586 usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.) CONFLICT (modify/delete): drivers/usb/phy/phy-mv-u3d-usb.c deleted in HEAD and modified in usb-gadget/next. Version usb-gadget/next of drivers/usb/phy/phy-mv-u3d-usb.c left in tree. $ git rm -f drivers/usb/phy/phy-mv-u3d-usb.c Merging staging/staging-next (50667c67dbef staging: dgnc: Remove extra curly braces) CONFLICT (content): Merge conflict in drivers/staging/rtl8723au/os_dep/usb_ops_linux.c CONFLICT (content): Merge conflict in drivers/iio/adc/Kconfig Merging char-misc/char-misc-next (4f0638100fe3 misc: arm-charlcd: add DT probe support) Merging cgroup/for-next (6f4524d355a8 cgroup: implement css_tryget()) Merging scsi/for-next (1a2184c0d747 [SCSI] More USB deadlock fixes) Merging target-updates/for-next (d1db0eea8524 Linux 3.15-rc3) 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 (45eefc1438de Merge branch 'devel' into for-next) 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 (1524cd4cd490 Merge branch 'devel' into for-next) CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt Merging dma-mapping/dma-mapping-next (7ee793a62fa8 cma: Remove potential deadlock situation) Merging pwm/for-next (9c88669c2cfc pwm: twl: Really disable twl6030 PWMs) Merging dma-buf/for-next (dcb99fd9b08c Linux 3.14-rc7) Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files) CONFLICT (content): Merge conflict in fs/namespace.c CONFLICT (content): Merge conflict in fs/namei.c CONFLICT (content): Merge conflict in fs/dcache.c Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect) 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 (6ed8eb59e53b Merge tag 'clk-hisi-for-v3.16' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into clk-next-hisilicon) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt Merging random/dev (7b878d4b48c4 random: Add arch_has_random[_seed]()) 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 (fa88b6f8803c aio: cleanup: flatten kill_ioctx()) Merging llvmlinux/for-next (4f6d454aae03 unwind_support) Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) Merging rd-docs/master (8b1cbef71a7e These days most people use git to send patches so I have added a section about that.) Merging akpm-current/current (e58827aca533 kernel/seccomp.c: kernel-doc warning fix) CONFLICT (content): Merge conflict in mm/memcontrol.c $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: mm/page_io.c: work around gcc bug Applying: lib/test_bpf.c: don't use gcc union shortcut Applying: arm: convert use of typedef ctl_table to struct ctl_table Applying: ia64: convert use of typedef ctl_table to struct ctl_table Applying: tile: convert use of typedef ctl_table to struct ctl_table Applying: cdrom: convert use of typedef ctl_table to struct ctl_table Applying: random: convert use of typedef ctl_table to struct ctl_table Applying: parport: convert use of typedef ctl_table to struct ctl_table Applying: scsi: convert use of typedef ctl_table to struct ctl_table Applying: coda: convert use of typedef ctl_table to struct ctl_table Applying: fscache: convert use of typedef ctl_table to struct ctl_table Applying: lockd: convert use of typedef ctl_table to struct ctl_table Applying: nfs: convert use of typedef ctl_table to struct ctl_table Applying: inotify: convert use of typedef ctl_table to struct ctl_table Applying: ntfs: convert use of typedef ctl_table to struct ctl_table Applying: fs: convert use of typedef ctl_table to struct ctl_table Applying: key: convert use of typedef ctl_table to struct ctl_table Applying: ipc: convert use of typedef ctl_table to struct ctl_table Applying: sysctl: convert use of typedef ctl_table to struct ctl_table Applying: mm: convert use of typedef ctl_table to struct ctl_table Applying: mfd/rtc: sec/s5m: rename SEC* symbols to S5M Applying: rtc: s5m: remove undocumented time init on first boot Applying: rtc: s5m: use shorter time of register update Applying: rtc: s5m: support different register layout Applying: rtc: s5m: add support for S2MPS14 RTC Applying: rtc: s5m: consolidate two device type switch statements Applying: blackfin/ptrace: call find_vma with the mmap_sem held Applying: kernel/watchdog.c: print traces for all cpus on lockup detection Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2 Applying: kernel/watchdog.c: convert printk/pr_warning to pr_foo() Applying: init/main.c: code clean-up Applying: fs/reiserfs/bitmap.c: coding style fixes Applying: fs/reiserfs/stree.c: remove obsolete __constant Applying: rwsem: Support optimistic spinning Applying: rwsem-support-optimistic-spinning-checkpatch-fixes Applying: x86,vdso: fix an OOPS accessing the hpet mapping w/o an hpet Applying: kernel/kprobes.c: convert printk to pr_foo() Applying: sysrq: rcu-ify __handle_sysrq Applying: sysrq,rcu: suppress RCU stall warnings while sysrq runs Applying: memcg, mm: introduce lowlimit reclaim Applying: memcg-mm-introduce-lowlimit-reclaim-fix Applying: memcg: allow setting low_limit Applying: memcg, doc: clarify global vs. limit reclaims Applying: memcg-doc-clarify-global-vs-limit-reclaims-fix Applying: memcg: document memory.low_limit_in_bytes Applying: vmscan: memcg: always use swappiness of the reclaimed memcg Applying: mm/kmemleak.c: use %u to print ->checksum Applying: mm: introduce kmemleak_update_trace() Applying: lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations Applying: mm/mempool.c: update the kmemleak stack trace for mempool allocations Applying: mm/memblock.c: call kmemleak directly from memblock_(alloc|free) Applying: mm: memcontrol: clean up memcg zoneinfo lookup Applying: mm: memcontrol: remove unnecessary memcg argument from soft limit functions Applying: mm: mark remap_file_pages() syscall as deprecated Applying: mm-mark-remap_file_pages-syscall-as-deprecated-fix Applying: mm: replace remap_file_pages() syscall with emulation Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix Applying: mm: remap_file_pages: initialize populate before usage Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping Applying: memcg: deprecate memory.force_empty knob Applying: memcg-deprecate-memoryforce_empty-knob-fix Applying: fat: add i_disksize to represent uninitialized size Applying: fat: add fat_fallocate operation Applying: fat: zero out seek range on _fat_get_block Applying: fat: fallback to buffered write in case of fallocated region on direct IO Applying: fat: permit to return phy block number by fibmap in fallocated region Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate Applying: nmi: provide the option to issue an NMI back trace to every cpu but current Applying: nmi-provide-the-option-to-issue-an-nmi-back-trace-to-every-cpu-but-current-fix Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: arm: move arm_dma_limit to setup_dma_zone Applying: ufs: sb mutex merge + mutex_destroy Applying: mm: add strictlimit knob Merging akpm/master (5f7e8d768016 mm: add strictlimit knob) [master 27ce28f9a1d3] Revert "rwsem-support-optimistic-spinning-checkpatch-fixes" [master 3bd6099f941b] Revert "rwsem: Support optimistic spinning"
Attachment:
signature.asc
Description: PGP signature
