$ date Friday 17 October 10:00:33 AEDT 2014 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 0429fbc0bdc2 Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu Merging origin/master (0429fbc0bdc2 Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu) $ git merge origin/master Already up-to-date. Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge fixes/master Already up-to-date. Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1) $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) $ git merge arc-current/for-curr Already up-to-date. Merging arm-current/fixes (ad684dce87fa ARM: 8179/1: kprobes-test: Fix compile error "bad immediate value for offset") $ git merge arm-current/fixes Already up-to-date. Merging m68k-current/for-linus (24cae7934cf1 m68k: Reformat arch/m68k/mm/hwtest.c) $ git merge m68k-current/for-linus Already up-to-date. Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) $ git merge metag-fixes/fixes Already up-to-date. Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) $ git merge mips-fixes/mips-fixes Already up-to-date. Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) $ git merge powerpc-merge/merge Already up-to-date. Merging powerpc-merge-mpe/for-linus (aeba3731b150 powerpc/pci: Fix IO space breakage after of_pci_range_to_resource() change) $ git merge powerpc-merge-mpe/for-linus Updating 0429fbc0bdc2..aeba3731b150 Fast-forward arch/powerpc/kernel/pci-common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) Merging sparc/master (f4da3628dc7c sparc64: Fix FPU register corruption with AES crypto offload.) $ git merge sparc/master Merge made by the 'recursive' strategy. arch/sparc/include/asm/visasm.h | 8 ++++++++ arch/sparc/lib/NG4memcpy.S | 14 +++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) Merging net/master (2c6ba4b15b5e netlink: fix description of portid) $ git merge net/master Auto-merging net/ipv4/tcp_output.c Auto-merging net/core/dev.c Auto-merging include/uapi/linux/Kbuild Auto-merging drivers/net/xen-netfront.c Auto-merging arch/arm64/boot/dts/apm-storm.dtsi Auto-merging arch/arm64/boot/dts/apm-mustang.dts Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/net/sti-dwmac.txt | 91 ++--- MAINTAINERS | 2 +- arch/arm64/boot/dts/apm-mustang.dts | 4 + arch/arm64/boot/dts/apm-storm.dtsi | 24 ++ arch/x86/net/bpf_jit_comp.c | 25 +- drivers/isdn/capi/capidrv.c | 24 +- drivers/isdn/capi/capiutil.c | 41 ++- drivers/isdn/capi/kcapi.c | 4 +- drivers/isdn/gigaset/capi.c | 155 ++++++-- drivers/isdn/gigaset/ev-layer.c | 116 +++--- drivers/isdn/gigaset/usb-gigaset.c | 4 +- drivers/net/dsa/mv88e6171.c | 2 +- drivers/net/ethernet/apm/xgene/Makefile | 2 +- .../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 25 +- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 1 - drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 4 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 18 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 12 +- drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 389 +++++++++++++++++++++ drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h | 41 +++ drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 3 +- drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 4 - drivers/net/ethernet/broadcom/tg3.c | 10 +- drivers/net/ethernet/chelsio/Kconfig | 2 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 29 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 +- drivers/net/ethernet/freescale/fec.h | 60 ++++ drivers/net/ethernet/freescale/fec_main.c | 69 +--- drivers/net/ethernet/freescale/fec_ptp.c | 277 ++++++++++++++- drivers/net/ethernet/freescale/gianfar.c | 2 +- drivers/net/ethernet/intel/Kconfig | 11 + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 65 ++-- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 13 +- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 3 + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 6 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 374 +++++++++++--------- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 20 +- drivers/net/ethernet/ti/cpsw.c | 10 + drivers/net/ethernet/ti/davinci_cpdma.c | 5 - drivers/net/macvtap.c | 2 +- drivers/net/phy/micrel.c | 4 +- drivers/net/virtio_net.c | 4 +- drivers/net/vxlan.c | 14 +- drivers/net/xen-netfront.c | 2 +- drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 148 +------- drivers/scsi/cxgbi/libcxgbi.c | 2 + include/linux/genl_magic_func.h | 4 +- include/linux/kernelcapi.h | 2 +- include/linux/netdevice.h | 12 +- include/linux/skbuff.h | 7 +- include/net/if_inet6.h | 1 - include/net/netlink.h | 2 +- include/net/sctp/sctp.h | 5 + include/net/sctp/sm.h | 6 +- include/uapi/linux/Kbuild | 1 + include/uapi/linux/bpf.h | 1 + include/uapi/linux/bpf_common.h | 55 +++ include/uapi/linux/filter.h | 56 +-- net/caif/caif_usb.c | 7 +- net/caif/cfmuxl.c | 4 +- net/core/dev.c | 2 +- net/core/sock.c | 2 + net/ipv4/fib_semantics.c | 2 +- net/ipv4/tcp_input.c | 36 +- net/ipv4/tcp_output.c | 34 +- net/ipv6/anycast.c | 1 - net/openvswitch/vport-geneve.c | 2 +- net/openvswitch/vport.c | 4 +- net/rds/rdma.c | 7 +- net/sctp/associola.c | 2 + net/sctp/inqueue.c | 33 +- net/sctp/sm_make_chunk.c | 99 +++--- net/sctp/sm_statefuns.c | 21 +- 76 files changed, 1755 insertions(+), 788 deletions(-) create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h create mode 100644 include/uapi/linux/bpf_common.h Merging ipsec/master (b8c203b2d2fc xfrm: Generate queueing routes only from route lookup functions) $ git merge ipsec/master Already up-to-date. Merging sound-current/for-linus (c8b00fd2f4c5 ALSA: hda_intel: Add Device IDs for Intel Sunrise Point PCH) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/core/pcm_native.c | 2 +- sound/firewire/bebob/bebob_terratec.c | 4 ++-- sound/pci/emu10k1/emu10k1_callback.c | 6 ++---- sound/pci/hda/hda_intel.c | 4 ++++ 4 files changed, 9 insertions(+), 7 deletions(-) Merging pci-current/for-linus (8c33e57e6fb3 Merge branch 'remove-weak-function-declarations' into for-linus) $ git merge pci-current/for-linus Merge made by the 'recursive' strategy. arch/mips/include/asm/maar.h | 2 +- arch/mips/include/asm/mips-cpc.h | 10 ---------- arch/mips/kernel/mips-cpc.c | 2 +- arch/x86/platform/intel-mid/intel_mid_weak_decls.h | 7 +++---- include/linux/audit.h | 2 +- include/linux/clocksource.h | 2 +- include/linux/crash_dump.h | 15 +++++++-------- include/linux/kgdb.h | 2 +- include/linux/memory.h | 2 +- include/linux/uprobes.h | 14 +++++++------- 10 files changed, 23 insertions(+), 35 deletions(-) Merging wireless/master (f8adaf0ae978 brcmfmac: Fix off by one bug in brcmf_count_20mhz_channels()) $ git merge wireless/master Already up-to-date. Merging driver-core.current/driver-core-linus (5e40d331bd72 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (9e82bf014195 Linux 3.17-rc5) $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus (0f33be009b89 Linux 3.17-rc6) $ git merge usb.current/usb-linus Already up-to-date. Merging usb-gadget-fixes/fixes (0b93a4c838fa usb: dwc3: fix TRB completion when multiple TRBs are started) $ git merge usb-gadget-fixes/fixes Already up-to-date. Merging usb-serial-fixes/usb-linus (dee80ad12d2b USB: cp210x: add support for Seluxit USB dongle) $ git merge usb-serial-fixes/usb-linus Already up-to-date. Merging staging.current/staging-linus (80213c03c415 Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) $ git merge staging.current/staging-linus Already up-to-date. Merging char-misc.current/char-misc-linus (9e82bf014195 Linux 3.17-rc5) $ git merge char-misc.current/char-misc-linus Already up-to-date. Merging input-current/for-linus (4dfb15cd5aaa Input: xpad - add Thrustmaster as Xbox 360 controller vendor) $ git merge input-current/for-linus Auto-merging drivers/input/misc/xen-kbdfront.c Auto-merging drivers/input/keyboard/cros_ec_keyb.c Auto-merging drivers/input/keyboard/adp5588-keys.c Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 2 +- drivers/input/evdev.c | 13 +- drivers/input/input.c | 5 +- drivers/input/joystick/xpad.c | 2 + drivers/input/keyboard/adp5588-keys.c | 1 + drivers/input/keyboard/cros_ec_keyb.c | 9 ++ drivers/input/keyboard/opencores-kbd.c | 72 ++------- drivers/input/misc/max77693-haptic.c | 2 +- drivers/input/misc/xen-kbdfront.c | 4 +- drivers/input/mouse/alps.c | 4 +- drivers/input/mouse/synaptics.c | 22 ++- drivers/input/mouse/synaptics.h | 8 +- drivers/input/serio/i8042-x86ia64io.h | 287 ++------------------------------- drivers/input/serio/i8042.c | 2 +- drivers/input/serio/serio.c | 4 +- drivers/input/touchscreen/Kconfig | 12 ++ drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/ar1021_i2c.c | 181 +++++++++++++++++++++ 18 files changed, 280 insertions(+), 351 deletions(-) create mode 100644 drivers/input/touchscreen/ar1021_i2c.c Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) $ git merge md-current/for-linus Already up-to-date. Merging crypto-current/master (be34c4ef693f crypto: sha - Handle unaligned input data in generic sha256 and sha512.) $ git merge crypto-current/master Already up-to-date. Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_timing) $ git merge ide/master Merge made by the 'recursive' strategy. drivers/ide/atiixp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) $ git merge dwmw2/master Already up-to-date. Merging devicetree-current/devicetree/merge (e66c98c7a0ea of: Fix NULL dereference in selftest removal code) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start to remove the device) $ git merge rr-fixes/fixes Already up-to-date. 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) $ git merge vfio-fixes/for-linus Already up-to-date. Merging kselftest-fixes/fixes (ce6a144a0d01 selftests/memfd: Run test on all architectures) $ git merge kselftest-fixes/fixes Already up-to-date. Merging drm-intel-fixes/for-linux-next-fixes (bfe01a5ba249 Linux 3.17) $ git merge drm-intel-fixes/for-linux-next-fixes Already up-to-date. Merging asm-generic/master (f3670394c29f Revert "x86/efi: Fixup GOT in all boot code paths") $ git merge asm-generic/master Already up-to-date. Merging arc/for-next (56372082533a ARC: boot: cpu feature print enhancements) $ git merge arc/for-next Removing arch/arc/plat-arcfpga/include/plat/memmap.h Removing arch/arc/plat-arcfpga/include/plat/irq.h Auto-merging arch/arc/include/asm/atomic.h Merge made by the 'recursive' strategy. arch/arc/Kconfig | 6 +- arch/arc/Makefile | 17 +- arch/arc/boot/dts/angel4.dts | 5 - arch/arc/boot/dts/nsimosci.dts | 7 +- arch/arc/configs/fpga_defconfig | 1 - arch/arc/configs/fpga_noramfs_defconfig | 1 - arch/arc/configs/nsimosci_defconfig | 1 - arch/arc/include/asm/arcregs.h | 89 +++++---- arch/arc/include/asm/atomic.h | 4 - arch/arc/include/asm/bitops.h | 4 - arch/arc/include/asm/bug.h | 7 +- arch/arc/include/asm/cache.h | 2 +- arch/arc/include/asm/current.h | 4 - arch/arc/include/asm/irqflags.h | 4 - arch/arc/include/asm/kgdb.h | 32 ++-- arch/arc/include/asm/processor.h | 13 +- arch/arc/include/asm/setup.h | 1 - arch/arc/include/asm/smp.h | 10 +- arch/arc/include/asm/string.h | 3 - arch/arc/include/asm/syscalls.h | 4 - arch/arc/include/asm/thread_info.h | 4 - arch/arc/include/asm/unaligned.h | 2 +- arch/arc/kernel/Makefile | 2 +- arch/arc/kernel/disasm.c | 4 +- arch/arc/kernel/head.S | 10 - arch/arc/kernel/perf_event.c | 22 +-- arch/arc/kernel/setup.c | 272 ++++++++++++++-------------- arch/arc/kernel/smp.c | 2 +- arch/arc/mm/cache_arc700.c | 14 +- arch/arc/mm/tlb.c | 8 +- arch/arc/plat-arcfpga/Kconfig | 13 +- arch/arc/plat-arcfpga/include/plat/irq.h | 27 --- arch/arc/plat-arcfpga/include/plat/memmap.h | 29 --- arch/arc/plat-arcfpga/platform.c | 61 +------ arch/arc/plat-arcfpga/smp.c | 3 +- arch/arc/plat-tb10x/Kconfig | 1 - arch/arc/plat-tb10x/tb10x.c | 13 -- 37 files changed, 265 insertions(+), 437 deletions(-) delete mode 100644 arch/arc/plat-arcfpga/include/plat/irq.h delete mode 100644 arch/arc/plat-arcfpga/include/plat/memmap.h Merging arm/for-next (d5d16892243e Merge branches 'fiq' (early part), 'fixes', 'l2c' (early part) and 'misc' into for-next) $ git merge arm/for-next Already up-to-date. Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1) $ git merge arm-perf/for-next/perf Already up-to-date. Merging arm-soc/for-next (632beecbb196 Merge branch 'fixes' into for-next) $ git merge arm-soc/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 14 +++++++------- arch/arm/arm-soc-for-next-contents.txt | 0 arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 2 +- arch/arm/boot/dts/omap3-n900.dts | 3 +++ arch/arm/configs/exynos_defconfig | 10 ++++++++++ arch/arm/configs/omap2plus_defconfig | 1 + arch/arm/configs/sunxi_defconfig | 1 + arch/arm/mach-exynos/exynos.c | 2 ++ arch/arm/mm/proc-macros.S | 2 +- arch/arm/plat-samsung/Kconfig | 5 +++-- arch/arm/plat-samsung/pm-debug.c | 1 + 11 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 arch/arm/arm-soc-for-next-contents.txt Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) $ git merge bcm2835/for-next Already up-to-date. Merging berlin/berlin/for-next (8d4f3361e05c Merge branch 'berlin/dt' into berlin/for-next) $ git merge berlin/berlin/for-next Resolved 'arch/arm/boot/dts/berlin2q-marvell-dmp.dts' using previous resolution. Auto-merging arch/arm/boot/dts/berlin2q.dtsi Auto-merging arch/arm/boot/dts/berlin2q-marvell-dmp.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/berlin2q-marvell-dmp.dts Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1bf5bbe4b663] Merge remote-tracking branch 'berlin/berlin/for-next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/arm/marvell,berlin.txt | 10 ++ arch/arm/boot/dts/berlin2.dtsi | 1 + arch/arm/boot/dts/berlin2cd.dtsi | 1 + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 8 ++ arch/arm/boot/dts/berlin2q.dtsi | 41 ++++++- arch/arm/mach-berlin/Kconfig | 2 + drivers/reset/Makefile | 1 + drivers/reset/reset-berlin.c | 131 +++++++++++++++++++++ 8 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 drivers/reset/reset-berlin.c Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) $ git merge cortex-m/for-next Already up-to-date. Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) $ git merge ep93xx/ep93xx-for-next Merge made by the 'recursive' strategy. Merging imx-mxs/for-next (2b2244a3e7c3 ARM: dts: imx6: make gpt per clock can be from OSC) $ git merge imx-mxs/for-next Already up-to-date. Merging ixp4xx/next (19f949f52599 Linux 3.8) $ git merge ixp4xx/next Already up-to-date. Merging keystone/next (c9eaa447e77e Linux 3.15-rc1) $ git merge keystone/next Already up-to-date. Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) $ git merge msm/for-next Already up-to-date. Merging mvebu/for-next (65a3bb88bb33 Merge branch 'mvebu/dt' into mvebu/for-next) $ git merge mvebu/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging renesas/next (cc38f02b87ef Merge branches 'heads/dt-for-v3.18' and 'heads/soc-for-v3.18' into next) $ git merge renesas/next Merge made by the 'recursive' strategy. arch/arm/boot/dts/r8a7740.dtsi | 14 ++++++++++---- arch/arm/mach-shmobile/clock-r8a7740.c | 7 ++++++- include/dt-bindings/clock/r8a7740-clock.h | 1 + 3 files changed, 17 insertions(+), 5 deletions(-) Merging samsung/for-next (a84aaa7556a5 ARM: cacheflush: Fix v7_exit_coherency_flush exynos build breakage on ARMv6) $ git merge samsung/for-next Auto-merging arch/arm/plat-samsung/Makefile Removing arch/arm/mach-exynos/hotplug.c Auto-merging arch/arm/mach-exynos/exynos.c Auto-merging arch/arm/mach-exynos/Makefile Auto-merging arch/arm/boot/dts/exynos5420-arndale-octa.dts Auto-merging arch/arm/boot/dts/exynos3250.dtsi Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. Documentation/arm/firmware.txt | 28 +- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/exynos3250.dtsi | 10 + arch/arm/boot/dts/exynos4210.dtsi | 17 + arch/arm/boot/dts/exynos4212.dtsi | 17 + arch/arm/boot/dts/exynos4412-trats2.dts | 352 +++++++++- arch/arm/boot/dts/exynos4412.dtsi | 29 + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 16 + arch/arm/boot/dts/exynos5250-arndale.dts | 907 +++++++++++++------------- arch/arm/boot/dts/exynos5250-smdk5250.dts | 618 +++++++++--------- arch/arm/boot/dts/exynos5250-snow.dts | 266 ++++---- arch/arm/boot/dts/exynos5250-spring.dts | 536 +++++++++++++++ arch/arm/boot/dts/exynos5250.dtsi | 16 +- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 + arch/arm/boot/dts/exynos5420-peach-pit.dts | 15 +- arch/arm/boot/dts/exynos5420.dtsi | 4 +- arch/arm/boot/dts/exynos5800-peach-pi.dts | 15 +- arch/arm/boot/dts/s3c6410-mini6410.dts | 4 - arch/arm/boot/dts/s3c64xx.dtsi | 1 - arch/arm/configs/exynos_defconfig | 18 +- arch/arm/include/asm/firmware.h | 10 +- arch/arm/mach-exynos/Kconfig | 5 + arch/arm/mach-exynos/Makefile | 9 +- arch/arm/mach-exynos/common.h | 15 +- arch/arm/mach-exynos/exynos.c | 5 +- arch/arm/mach-exynos/firmware.c | 65 +- arch/arm/mach-exynos/hotplug.c | 91 --- arch/arm/mach-exynos/platsmp.c | 136 ++++ arch/arm/mach-exynos/pm.c | 310 ++------- arch/arm/mach-exynos/pmu.c | 1 + arch/arm/mach-exynos/regs-pmu.h | 6 + arch/arm/mach-exynos/sleep.S | 28 + arch/arm/mach-exynos/smc.h | 4 + arch/arm/mach-exynos/suspend.c | 356 ++++++++++ arch/arm/mach-tegra/cpuidle-tegra114.c | 2 +- arch/arm/plat-samsung/Makefile | 1 + 36 files changed, 2590 insertions(+), 1328 deletions(-) create mode 100644 arch/arm/boot/dts/exynos5250-spring.dts delete mode 100644 arch/arm/mach-exynos/hotplug.c create mode 100644 arch/arm/mach-exynos/suspend.c Merging sunxi/sunxi/for-next (429823087fec Merge branches 'sunxi/dt-for-3.18' and 'sunxi/drivers-for-3.18' into sunxi/for-next) $ git merge sunxi/sunxi/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into for-next) $ git merge tegra/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging arm64/for-next/core (0a6479b0ffad arm64: Remove unneeded extern keyword) $ git merge arm64/for-next/core Already up-to-date. Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) $ git merge blackfin/for-linus Merge made by the 'recursive' strategy. arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - arch/blackfin/configs/BF533-STAMP_defconfig | 1 - arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - arch/blackfin/configs/CM-BF527_defconfig | 1 - arch/blackfin/configs/CM-BF533_defconfig | 1 - arch/blackfin/configs/CM-BF537E_defconfig | 1 - arch/blackfin/configs/CM-BF537U_defconfig | 1 - arch/blackfin/configs/CM-BF548_defconfig | 1 - arch/blackfin/configs/CM-BF561_defconfig | 1 - arch/blackfin/configs/DNP5370_defconfig | 1 - arch/blackfin/configs/IP0X_defconfig | 1 - arch/blackfin/configs/PNAV-10_defconfig | 1 - arch/blackfin/configs/SRV1_defconfig | 1 - arch/blackfin/configs/TCM-BF518_defconfig | 1 - arch/blackfin/configs/TCM-BF537_defconfig | 1 - arch/blackfin/kernel/kgdb.c | 12 ++++-------- arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- 23 files changed, 10 insertions(+), 33 deletions(-) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) $ git merge c6x/for-linux-next Already up-to-date. Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) $ git merge cris/for-next Already up-to-date. Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) $ git merge hexagon/linux-next Already up-to-date. Merging ia64/next (0f33be009b89 Linux 3.17-rc6) $ git merge ia64/next Already up-to-date. Merging m68k/for-next (24cae7934cf1 m68k: Reformat arch/m68k/mm/hwtest.c) $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next (e803d4bd3118 m68k: Fix typo 'COFNIG_MBAR') $ git merge m68knommu/for-next Already up-to-date. Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) $ git merge metag/for-next Already up-to-date. Merging microblaze/next (554336c714f4 microblaze: Use empty asm-generic/linkage.h) $ git merge microblaze/next Merge made by the 'recursive' strategy. arch/microblaze/include/asm/linkage.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) Merging mips/mips-for-linux-next (31d6f57d3c65 MIPS: ralink: remove deprecated IRQF_DISABLED) $ git merge mips/mips-for-linux-next Resolved 'arch/arm64/include/asm/Kbuild' using previous resolution. Auto-merging include/asm-generic/dma-contiguous.h Removing arch/mips/ralink/dts/Makefile Removing arch/mips/netlogic/dts/Makefile Auto-merging arch/mips/net/bpf_jit.c Removing arch/mips/lantiq/dts/Makefile Auto-merging arch/mips/include/asm/Kbuild Removing arch/mips/cavium-octeon/.gitignore Removing arch/arm64/include/asm/dma-contiguous.h Auto-merging arch/arm64/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/arm64/include/asm/Kbuild Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master cf8ca293c549] Merge remote-tracking branch 'mips/mips-for-linux-next' $ git diff -M --stat --summary HEAD^.. arch/arm64/include/asm/Kbuild | 1 + arch/arm64/include/asm/dma-contiguous.h | 28 ------------ arch/mips/Kconfig | 6 +++ arch/mips/Makefile | 11 +++++ arch/mips/alchemy/devboards/db1300.c | 47 ++++++++++++++++++- arch/mips/alchemy/devboards/db1550.c | 9 ++-- arch/mips/alchemy/devboards/platform.c | 3 ++ arch/mips/boot/.gitignore | 1 + arch/mips/boot/dts/Makefile | 20 ++++++++ arch/mips/{lantiq => boot}/dts/danube.dtsi | 0 arch/mips/{lantiq => boot}/dts/easy50712.dts | 0 arch/mips/{ralink => boot}/dts/mt7620a.dtsi | 0 arch/mips/{ralink => boot}/dts/mt7620a_eval.dts | 0 .../{cavium-octeon => boot/dts}/octeon_3xxx.dts | 0 .../{cavium-octeon => boot/dts}/octeon_68xx.dts | 0 arch/mips/{ralink => boot}/dts/rt2880.dtsi | 0 arch/mips/{ralink => boot}/dts/rt2880_eval.dts | 0 arch/mips/{ralink => boot}/dts/rt3050.dtsi | 0 arch/mips/{ralink => boot}/dts/rt3052_eval.dts | 0 arch/mips/{ralink => boot}/dts/rt3883.dtsi | 0 arch/mips/{ralink => boot}/dts/rt3883_eval.dts | 0 arch/mips/{mti-sead3 => boot/dts}/sead3.dts | 0 arch/mips/{netlogic => boot}/dts/xlp_evp.dts | 0 arch/mips/{netlogic => boot}/dts/xlp_fvp.dts | 0 arch/mips/{netlogic => boot}/dts/xlp_gvp.dts | 0 arch/mips/{netlogic => boot}/dts/xlp_svp.dts | 0 arch/mips/cavium-octeon/.gitignore | 2 - arch/mips/cavium-octeon/Makefile | 10 ---- arch/mips/configs/sead3_defconfig | 2 +- arch/mips/configs/sead3micro_defconfig | 2 +- arch/mips/include/asm/Kbuild | 1 + arch/mips/include/asm/cpu-features.h | 10 ++++ arch/mips/include/asm/cpu-info.h | 5 ++ .../asm/mach-au1x00/cpu-feature-overrides.h | 12 +++++ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 + .../asm/mach-loongson/cpu-feature-overrides.h | 2 + arch/mips/include/asm/pgtable-bits.h | 44 ++++++++++++------ arch/mips/include/asm/pgtable.h | 10 ++++ arch/mips/include/uapi/asm/swab.h | 18 ++++++-- arch/mips/kernel/cpu-probe.c | 21 +++++++++ arch/mips/kernel/setup.c | 9 ++++ arch/mips/lantiq/Kconfig | 1 + arch/mips/lantiq/Makefile | 2 - arch/mips/lantiq/dts/Makefile | 1 - arch/mips/lib/csum_partial.S | 10 +++- arch/mips/mm/dma-default.c | 37 ++++++++++----- arch/mips/mti-sead3/Makefile | 4 -- arch/mips/net/bpf_jit.c | 53 ++++++++-------------- arch/mips/netlogic/Kconfig | 4 ++ arch/mips/netlogic/Makefile | 1 - arch/mips/netlogic/dts/Makefile | 4 -- arch/mips/ralink/Kconfig | 4 ++ arch/mips/ralink/Makefile | 2 - arch/mips/ralink/dts/Makefile | 4 -- arch/mips/ralink/timer.c | 2 +- arch/x86/include/asm/Kbuild | 1 + .../asm => include/asm-generic}/dma-contiguous.h | 7 +-- 57 files changed, 274 insertions(+), 138 deletions(-) delete mode 100644 arch/arm64/include/asm/dma-contiguous.h create mode 100644 arch/mips/boot/dts/Makefile rename arch/mips/{lantiq => boot}/dts/danube.dtsi (100%) rename arch/mips/{lantiq => boot}/dts/easy50712.dts (100%) rename arch/mips/{ralink => boot}/dts/mt7620a.dtsi (100%) rename arch/mips/{ralink => boot}/dts/mt7620a_eval.dts (100%) rename arch/mips/{cavium-octeon => boot/dts}/octeon_3xxx.dts (100%) rename arch/mips/{cavium-octeon => boot/dts}/octeon_68xx.dts (100%) rename arch/mips/{ralink => boot}/dts/rt2880.dtsi (100%) rename arch/mips/{ralink => boot}/dts/rt2880_eval.dts (100%) rename arch/mips/{ralink => boot}/dts/rt3050.dtsi (100%) rename arch/mips/{ralink => boot}/dts/rt3052_eval.dts (100%) rename arch/mips/{ralink => boot}/dts/rt3883.dtsi (100%) rename arch/mips/{ralink => boot}/dts/rt3883_eval.dts (100%) rename arch/mips/{mti-sead3 => boot/dts}/sead3.dts (100%) rename arch/mips/{netlogic => boot}/dts/xlp_evp.dts (100%) rename arch/mips/{netlogic => boot}/dts/xlp_fvp.dts (100%) rename arch/mips/{netlogic => boot}/dts/xlp_gvp.dts (100%) rename arch/mips/{netlogic => boot}/dts/xlp_svp.dts (100%) delete mode 100644 arch/mips/cavium-octeon/.gitignore delete mode 100644 arch/mips/lantiq/dts/Makefile delete mode 100644 arch/mips/netlogic/dts/Makefile delete mode 100644 arch/mips/ralink/dts/Makefile rename {arch/x86/include/asm => include/asm-generic}/dma-contiguous.h (57%) Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) $ git merge openrisc/for-upstream Already up-to-date. Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) $ git merge parisc/for-next Already up-to-date. Merging parisc-hd/for-next (5e40d331bd72 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) $ git merge parisc-hd/for-next Already up-to-date. Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) $ git merge powerpc/next Already up-to-date. Merging powerpc-mpe/next (d53ba6b3bba3 cxl: Fix afu_read() not doing finish_wait() on signal or non-blocking) $ git merge powerpc-mpe/next Already up-to-date. Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints across different MSIRs") $ git merge fsl/next Already up-to-date. Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) $ git merge mpc5xxx/next Already up-to-date. Merging s390/features (3476def2b86f s390: wire up bpf syscall) $ git merge s390/features Merge made by the 'recursive' strategy. arch/s390/include/uapi/asm/unistd.h | 3 ++- arch/s390/kernel/compat_wrapper.c | 1 + arch/s390/kernel/syscalls.S | 1 + arch/s390/mm/pgtable.c | 6 +++--- drivers/s390/char/Kconfig | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) Merging sparc-next/master (619df5d2870b Merge tag 'microblaze-3.17-rc5' of git://git.monstr.eu/linux-2.6-microblaze) $ git merge sparc-next/master Already up-to-date. Merging tile/master (78410af51146 tile: add clock_gettime support to vDSO) $ git merge tile/master Already up-to-date. Merging uml/next (989e59fa41c5 um: Include generic barrier.h) $ git merge uml/next Resolved 'arch/um/include/asm/Kbuild' using previous resolution. Removing arch/x86/um/shared/sysdep/skas_ptrace.h Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h Removing arch/um/sys-ia64/sysdep/skas_ptrace.h Auto-merging arch/um/os-Linux/skas/process.c Auto-merging arch/um/kernel/um_arch.c Auto-merging arch/um/kernel/trap.c Removing arch/um/include/shared/skas_ptrace.h Removing arch/um/include/shared/skas/proc_mm.h Auto-merging arch/um/include/shared/os.h Auto-merging arch/um/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 06258fa072d7] Merge remote-tracking branch 'uml/next' $ git diff -M --stat --summary HEAD^.. arch/um/include/shared/os.h | 2 - arch/um/include/shared/skas/proc_mm.h | 44 ------ arch/um/include/shared/skas/skas.h | 3 - arch/um/include/shared/skas_ptrace.h | 14 -- arch/um/kernel/ptrace.c | 32 ---- arch/um/kernel/reboot.c | 35 ++--- arch/um/kernel/skas/mmu.c | 68 +++------ arch/um/kernel/skas/process.c | 27 ---- arch/um/kernel/trap.c | 2 +- arch/um/kernel/um_arch.c | 10 -- arch/um/os-Linux/process.c | 16 -- arch/um/os-Linux/skas/mem.c | 100 ++---------- arch/um/os-Linux/skas/process.c | 200 ++++++------------------ arch/um/os-Linux/start_up.c | 154 ------------------- arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- arch/x86/um/ldt.c | 227 ++++++---------------------- arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- 20 files changed, 148 insertions(+), 858 deletions(-) delete mode 100644 arch/um/include/shared/skas/proc_mm.h delete mode 100644 arch/um/include/shared/skas_ptrace.h delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/for_next (f2589bff1ce8 xtensa/uapi: Add definition of TIOC[SG]RS485) $ git merge xtensa/for_next Merge made by the 'recursive' strategy. Merging btrfs/next (a43bb39b5c71 btrfs: Fix compile error when CONFIG_SECURITY is not set.) $ git merge btrfs/next Already up-to-date. Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket len) $ git merge ceph/master Already up-to-date. Merging cifs/for-next (9ffc5412964d Check minimum response length on query_network_interface) $ git merge cifs/for-next Merge made by the 'recursive' strategy. fs/cifs/cifs_fs_sb.h | 1 + fs/cifs/cifs_unicode.c | 203 +++++++++++++++++++++++++++++++++++++------------ fs/cifs/cifs_unicode.h | 31 +++++++- fs/cifs/cifsencrypt.c | 2 +- fs/cifs/cifsglob.h | 6 +- fs/cifs/cifssmb.c | 16 ++-- fs/cifs/connect.c | 46 +++++++++-- fs/cifs/dir.c | 22 ++++-- fs/cifs/file.c | 6 +- fs/cifs/inode.c | 57 ++++++++------ fs/cifs/link.c | 135 +++++++++++++++++++++++++++++++- fs/cifs/readdir.c | 8 +- fs/cifs/smb1ops.c | 33 ++++---- fs/cifs/smb2misc.c | 12 ++- fs/cifs/smb2ops.c | 27 ++++--- fs/cifs/smb2pdu.c | 2 + fs/cifs/smb2pdu.h | 2 + fs/cifs/smb2proto.h | 8 +- fs/cifs/smbencrypt.c | 1 + fs/cifs/xattr.c | 32 +++----- 20 files changed, 485 insertions(+), 165 deletions(-) Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next (35425ea24921 ecryptfs: avoid to access NULL pointer when write metadata in xattr) $ git merge ecryptfs/next Already up-to-date. Merging ext3/for_next (6174c2eb8ece udf: Fix loading of special inodes) $ git merge ext3/for_next Already up-to-date. Merging ext4/dev (813d32f91333 ext4: check s_chksum_driver when looking for bg csum presence) $ git merge ext4/dev Resolved 'fs/ext4/super.c' using previous resolution. Auto-merging include/linux/mm.h Auto-merging fs/ext4/super.c CONFLICT (content): Merge conflict in fs/ext4/super.c Auto-merging fs/ext4/resize.c Auto-merging fs/ext4/namei.c Auto-merging fs/ext4/mballoc.c Auto-merging fs/buffer.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master cccac0b81a39] Merge remote-tracking branch 'ext4/dev' $ git diff -M --stat --summary HEAD^.. fs/buffer.c | 48 +- fs/ext4/balloc.c | 15 +- fs/ext4/bitmap.c | 12 +- fs/ext4/dir.c | 8 +- fs/ext4/ext4.h | 50 +- fs/ext4/ext4_extents.h | 1 + fs/ext4/ext4_jbd2.c | 4 +- fs/ext4/ext4_jbd2.h | 6 +- fs/ext4/extents.c | 619 ++++++++++++++++--------- fs/ext4/extents_status.c | 200 +++++++- fs/ext4/extents_status.h | 13 +- fs/ext4/ialloc.c | 3 +- fs/ext4/indirect.c | 86 ++-- fs/ext4/inline.c | 7 +- fs/ext4/inode.c | 133 +++--- fs/ext4/ioctl.c | 13 +- fs/ext4/mballoc.c | 15 +- fs/ext4/migrate.c | 11 +- fs/ext4/mmp.c | 6 +- fs/ext4/move_extent.c | 1068 +++++-------------------------------------- fs/ext4/namei.c | 240 ++++------ fs/ext4/resize.c | 3 +- fs/ext4/super.c | 245 +++++----- fs/ext4/xattr.c | 44 +- fs/jbd/journal.c | 2 +- fs/jbd2/checkpoint.c | 334 ++++++-------- fs/jbd2/journal.c | 18 +- fs/jbd2/recovery.c | 1 + include/linux/buffer_head.h | 47 +- include/linux/jbd2.h | 2 +- include/linux/mm.h | 1 + include/trace/events/ext4.h | 59 ++- mm/truncate.c | 57 +++ 33 files changed, 1488 insertions(+), 1883 deletions(-) $ git am -3 ../patches/0001-percpu_counter-fix-for-ext4-updates.patch Applying: percpu_counter: fix for ext4 updates $ git reset HEAD^ Unstaged changes after reset: M fs/ext4/extents_status.c $ git add -A . $ git commit -v -a --amend [master 48974e449f3c] Merge remote-tracking branch 'ext4/dev' Date: Fri Oct 17 10:27:45 2014 +1100 Merging f2fs/dev (da01e61428aa Merge tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) $ git merge f2fs/dev Already up-to-date. Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) $ git merge fscache/fscache Resolved 'fs/fscache/object.c' using previous resolution. Auto-merging fs/fscache/object.c CONFLICT (content): Merge conflict in fs/fscache/object.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fd2b901ef2ab] Merge remote-tracking branch 'fscache/fscache' $ git diff -M --stat --summary HEAD^.. Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) $ git merge fuse/for-next Already up-to-date. Merging gfs2/master (d29c0afe4db7 GFS2: use _RET_IP_ instead of (unsigned long)__builtin_return_address(0)) $ git merge gfs2/master Already up-to-date. Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr) $ git merge jfs/jfs-next Already up-to-date. Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) $ git merge logfs/master Auto-merging fs/logfs/super.c Merge made by the 'recursive' strategy. fs/logfs/dev_mtd.c | 2 +- fs/logfs/super.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Merging nfs/linux-next (b8fb9c30f25e NFS: Fix a bogus warning in nfs_generic_pgio) $ git merge nfs/linux-next Auto-merging fs/nfs/nfs4file.c Merge made by the 'recursive' strategy. fs/nfs/Makefile | 1 + fs/nfs/filelayout/filelayout.c | 2 +- fs/nfs/inode.c | 2 + fs/nfs/nfs42.h | 14 ++++++ fs/nfs/nfs42proc.c | 69 +++++++++++++++++++++++++++++ fs/nfs/nfs42xdr.c | 98 ++++++++++++++++++++++++++++++++++++++++++ fs/nfs/nfs4_fs.h | 3 ++ fs/nfs/nfs4file.c | 25 +++++++++++ fs/nfs/nfs4proc.c | 4 +- fs/nfs/nfs4xdr.c | 7 +++ fs/nfs/pagelist.c | 10 ++--- fs/nfs/pnfs.c | 33 +++++++++++--- fs/nfs/pnfs.h | 7 +-- include/linux/nfs4.h | 3 ++ include/linux/nfs_fs_sb.h | 1 + include/linux/nfs_xdr.h | 19 ++++++++ 16 files changed, 278 insertions(+), 20 deletions(-) create mode 100644 fs/nfs/nfs42.h create mode 100644 fs/nfs/nfs42proc.c create mode 100644 fs/nfs/nfs42xdr.c Merging nfsd/nfsd-next (34549ab09e62 nfsd: eliminate "to_delegation" define) $ git merge nfsd/nfsd-next Already up-to-date. Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) $ git merge omfs/for-next Already up-to-date. Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (91401a34038e UBI: Fastmap: Calc fastmap size correctly) $ git merge ubifs/linux-next Already up-to-date. Merging xfs/for-next (6889e783cd68 Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next) $ git merge xfs/for-next Already up-to-date. Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING) $ git merge file-locks/linux-next Already up-to-date. Merging vfs/for-next (a457606a6f81 fs/file_table.c: Update alloc_file() comment) $ git merge vfs/for-next Already up-to-date. Merging pci/next (f92d9ee3ab39 Merge branch 'pci/host-xgene' into next) $ git merge pci/next Already up-to-date. Merging hid/for-next (3fd9127d236c Merge branch 'for-3.18/uhid' into for-next) $ git merge hid/for-next Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-hid-driver-gt683r | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r Merging i2c/i2c/for-next (a4ce47f108a6 i2c-imx: Disable the clock on probe failure) $ git merge i2c/i2c/for-next Auto-merging drivers/i2c/busses/i2c-rk3x.c Auto-merging drivers/i2c/busses/i2c-cros-ec-tunnel.c Auto-merging drivers/i2c/busses/Kconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/i2c/i2c-axxia.txt | 30 ++ .../devicetree/bindings/i2c/i2c-exynos5.txt | 2 + drivers/i2c/busses/Kconfig | 14 +- drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-axxia.c | 559 +++++++++++++++++++++ drivers/i2c/busses/i2c-cros-ec-tunnel.c | 15 +- drivers/i2c/busses/i2c-designware-platdrv.c | 96 +++- drivers/i2c/busses/i2c-exynos5.c | 71 ++- drivers/i2c/busses/i2c-imx.c | 16 +- drivers/i2c/busses/i2c-ismt.c | 2 +- drivers/i2c/busses/i2c-mxs.c | 3 + drivers/i2c/busses/i2c-rcar.c | 21 +- drivers/i2c/busses/i2c-rk3x.c | 4 +- include/linux/mfd/cros_ec_commands.h | 3 - include/linux/platform_data/i2c-designware.h | 21 + 15 files changed, 807 insertions(+), 51 deletions(-) create mode 100644 Documentation/devicetree/bindings/i2c/i2c-axxia.txt create mode 100644 drivers/i2c/busses/i2c-axxia.c create mode 100644 include/linux/platform_data/i2c-designware.h Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) $ git merge jdelvare-hwmon/master Already up-to-date. Merging hwmon-staging/hwmon-next (3afb57fa721f hwmon: (ab8500) Call kernel_power_off instead of pm_power_off) $ git merge hwmon-staging/hwmon-next Already up-to-date. Merging v4l-dvb/master (8f2f28bac3d1 Merge branch 'topic/si2165' into to_next) $ git merge v4l-dvb/master Merge made by the 'recursive' strategy. Documentation/dvb/get_dvb_firmware | 20 ++---- drivers/media/dvb-frontends/Kconfig | 1 + drivers/media/dvb-frontends/si2165.c | 105 ++++++++++++++++++------------ drivers/media/dvb-frontends/si2165_priv.h | 2 +- drivers/media/dvb-frontends/si2168.c | 2 +- 5 files changed, 71 insertions(+), 59 deletions(-) Merging kbuild/for-next (e9f717fb534c Merge branch 'kbuild/misc' into kbuild/for-next) $ git merge kbuild/for-next Auto-merging lib/Kconfig.debug Auto-merging kernel/gcov/Kconfig Auto-merging init/Kconfig Auto-merging arch/x86/Kconfig Auto-merging Makefile Merge made by the 'recursive' strategy. Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 19 +++++- arch/x86/Kconfig | 2 +- init/Kconfig | 73 ++++++++++++++++++++ kernel/gcov/Kconfig | 2 +- lib/Kconfig.debug | 2 +- scripts/Makefile.lto | 84 +++++++++++++++++++++++ scripts/Makefile.modpost | 7 +- scripts/link-vmlinux.sh | 2 +- 9 files changed, 356 insertions(+), 8 deletions(-) create mode 100644 Documentation/lto-build create mode 100644 scripts/Makefile.lto Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) $ git merge kconfig/for-next Already up-to-date. Merging libata/for-next (8ccee3cf7d8e Merge branch 'for-3.18' into for-next) $ git merge libata/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging pm/linux-next (9cfb3b700753 Merge branch 'device-properties') $ git merge pm/linux-next Auto-merging include/linux/of.h Auto-merging drivers/of/base.c Auto-merging drivers/gpio/gpiolib.c Auto-merging drivers/gpio/gpiolib-acpi.c Auto-merging drivers/base/Makefile Merge made by the 'recursive' strategy. Documentation/acpi/properties.txt | 376 ++++++++++++++++++++ drivers/acpi/Makefile | 1 + drivers/acpi/internal.h | 6 + drivers/acpi/property.c | 567 ++++++++++++++++++++++++++++++ drivers/acpi/scan.c | 119 ++++++- drivers/base/Makefile | 2 +- drivers/base/property.c | 245 +++++++++++++ drivers/gpio/devres.c | 34 ++ drivers/gpio/gpio-sch.c | 293 ++++++--------- drivers/gpio/gpiolib-acpi.c | 78 +++- drivers/gpio/gpiolib.c | 86 ++++- drivers/gpio/gpiolib.h | 7 +- drivers/input/keyboard/gpio_keys_polled.c | 118 +++---- drivers/leds/leds-gpio.c | 149 ++++---- drivers/misc/eeprom/at25.c | 34 +- drivers/of/base.c | 171 +++++++++ include/acpi/acpi_bus.h | 8 + include/linux/acpi.h | 88 ++++- include/linux/gpio/consumer.h | 5 + include/linux/gpio_keys.h | 3 + include/linux/leds.h | 1 + include/linux/of.h | 27 ++ include/linux/property.h | 216 ++++++++++++ 23 files changed, 2259 insertions(+), 375 deletions(-) create mode 100644 Documentation/acpi/properties.txt create mode 100644 drivers/acpi/property.c create mode 100644 drivers/base/property.c create mode 100644 include/linux/property.h Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format) $ git merge idle/next Already up-to-date. Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) $ git merge apm/for-next Already up-to-date. Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) $ git merge cpupowerutils/master Already up-to-date. Merging thermal/next (571ed5a8177a Thermal: int340x thermal: fix a Kconfig dependency error) $ git merge thermal/next Resolved 'drivers/acpi/fan.c' using previous resolution. Auto-merging include/linux/acpi.h Auto-merging include/acpi/acpi_bus.h Auto-merging drivers/thermal/thermal_core.c Removing drivers/thermal/int3403_thermal.c Auto-merging drivers/thermal/Kconfig Auto-merging drivers/acpi/video.c Auto-merging drivers/acpi/utils.c Auto-merging drivers/acpi/scan.c Auto-merging drivers/acpi/internal.h Auto-merging drivers/acpi/fan.c CONFLICT (content): Merge conflict in drivers/acpi/fan.c Auto-merging drivers/acpi/device_pm.c Auto-merging drivers/acpi/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 12b837f9c944] Merge remote-tracking branch 'thermal/next' $ git diff -M --stat --summary HEAD^.. .../devicetree/bindings/thermal/imx-thermal.txt | 5 +- drivers/acpi/Kconfig | 3 +- drivers/acpi/Makefile | 1 + drivers/acpi/acpi_platform.c | 1 + drivers/acpi/device_pm.c | 1 + drivers/acpi/fan.c | 338 +++++++++++---- drivers/acpi/int340x_thermal.c | 51 +++ drivers/acpi/internal.h | 10 +- drivers/acpi/scan.c | 1 + drivers/acpi/thermal.c | 18 +- drivers/acpi/utils.c | 28 +- drivers/acpi/video.c | 78 ++-- drivers/thermal/Kconfig | 50 ++- drivers/thermal/Makefile | 3 +- drivers/thermal/fair_share.c | 12 + drivers/thermal/gov_bang_bang.c | 131 ++++++ drivers/thermal/imx_thermal.c | 91 +++- drivers/thermal/int3403_thermal.c | 296 ------------- drivers/thermal/int340x_thermal/Makefile | 5 + drivers/thermal/int340x_thermal/acpi_thermal_rel.c | 400 +++++++++++++++++ drivers/thermal/int340x_thermal/acpi_thermal_rel.h | 84 ++++ drivers/thermal/int340x_thermal/int3400_thermal.c | 271 ++++++++++++ drivers/thermal/int340x_thermal/int3402_thermal.c | 242 +++++++++++ drivers/thermal/int340x_thermal/int3403_thermal.c | 477 +++++++++++++++++++++ drivers/thermal/int340x_thermal/int3406_thermal.c | 230 ++++++++++ drivers/thermal/of-thermal.c | 12 + drivers/thermal/step_wise.c | 7 +- drivers/thermal/thermal_core.c | 12 + drivers/thermal/thermal_core.h | 8 + drivers/video/backlight/backlight.c | 44 +- include/acpi/acpi_bus.h | 1 + include/acpi/video.h | 20 + include/linux/acpi.h | 1 + include/linux/backlight.h | 2 + include/linux/thermal.h | 24 +- include/trace/events/thermal.h | 83 ++++ 36 files changed, 2564 insertions(+), 477 deletions(-) create mode 100644 drivers/acpi/int340x_thermal.c create mode 100644 drivers/thermal/gov_bang_bang.c delete mode 100644 drivers/thermal/int3403_thermal.c create mode 100644 drivers/thermal/int340x_thermal/Makefile create mode 100644 drivers/thermal/int340x_thermal/acpi_thermal_rel.c create mode 100644 drivers/thermal/int340x_thermal/acpi_thermal_rel.h create mode 100644 drivers/thermal/int340x_thermal/int3400_thermal.c create mode 100644 drivers/thermal/int340x_thermal/int3402_thermal.c create mode 100644 drivers/thermal/int340x_thermal/int3403_thermal.c create mode 100644 drivers/thermal/int340x_thermal/int3406_thermal.c create mode 100644 include/trace/events/thermal.h $ git am -3 ../patches/0001-Revert-Thermal-int340x-thermal-fix-a-Kconfig-depende.patch Applying: Revert "Thermal: int340x thermal: fix a Kconfig dependency error" $ git reset HEAD^ Unstaged changes after reset: M drivers/acpi/Kconfig M drivers/thermal/Kconfig M include/linux/thermal.h $ git add -A . $ git commit -v -a --amend [master b6d9ca8004e1] Merge remote-tracking branch 'thermal/next' Date: Fri Oct 17 10:56:17 2014 +1100 Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again) $ git merge ieee1394/for-next Already up-to-date. Merging dlm/next (c07127b48c63 dlm: fix missing endian conversion of rcom_status flags) $ git merge dlm/next Merge made by the 'recursive' strategy. fs/dlm/rcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) $ git merge swiotlb/linux-next Already up-to-date. Merging slave-dma/next (f7c83930ed4d Merge branch 'for-linus' into next) $ git merge slave-dma/next Resolved 'drivers/tty/serial/8250/8250_pci.c' using previous resolution. Removing include/linux/dw_dmac.h Auto-merging include/linux/dmaengine.h Auto-merging drivers/tty/serial/8250/8250_pci.c CONFLICT (content): Merge conflict in drivers/tty/serial/8250/8250_pci.c Auto-merging drivers/tty/serial/8250/8250.h Auto-merging drivers/spi/spi-pxa2xx-pci.c Auto-merging drivers/misc/carma/carma-fpga-program.c Auto-merging drivers/dma/mv_xor.c Auto-merging drivers/dma/Kconfig Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 3576ba1ec6c9] Merge remote-tracking branch 'slave-dma/next' $ git diff -M --stat --summary HEAD^.. Documentation/devicetree/bindings/dma/qcom_adm.txt | 62 +++++ .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 65 +++++ Documentation/dmaengine.txt | 4 +- MAINTAINERS | 2 +- arch/avr32/mach-at32ap/at32ap700x.c | 19 +- arch/avr32/mach-at32ap/include/mach/atmel-mci.h | 2 +- drivers/ata/pata_arasan_cf.c | 5 +- drivers/dma/Kconfig | 2 +- drivers/dma/coh901318.c | 2 +- drivers/dma/cppi41.c | 16 +- drivers/dma/dw/core.c | 147 +++++------ drivers/dma/dw/internal.h | 61 +---- drivers/dma/dw/pci.c | 8 +- drivers/dma/dw/platform.c | 92 ++++--- drivers/dma/dw/regs.h | 41 +++- drivers/dma/edma.c | 2 +- drivers/dma/fsldma.c | 25 +- drivers/dma/imx-sdma.c | 35 ++- drivers/dma/mmp_tdma.c | 19 +- drivers/dma/mv_xor.c | 268 ++++++++------------- drivers/dma/mv_xor.h | 62 +++-- drivers/dma/pl330.c | 19 +- drivers/dma/sh/rcar-audmapp.c | 15 +- drivers/dma/sun6i-dma.c | 23 -- drivers/dma/xilinx/xilinx_vdma.c | 1 - drivers/media/platform/soc_camera/mx3_camera.c | 6 +- drivers/misc/carma/carma-fpga-program.c | 12 +- drivers/mtd/nand/fsmc_nand.c | 2 +- drivers/mtd/nand/sh_flctl.c | 2 +- drivers/net/ethernet/micrel/ks8842.c | 6 +- drivers/spi/spi-pxa2xx-dma.c | 15 +- drivers/spi/spi-pxa2xx-pci.c | 101 ++++++-- drivers/spi/spi-pxa2xx.c | 2 - drivers/tty/serial/8250/8250.h | 6 +- drivers/tty/serial/8250/8250_dw.c | 7 +- drivers/tty/serial/8250/8250_pci.c | 78 +++++- drivers/tty/serial/atmel_serial.c | 1 + drivers/tty/serial/sh-sci.c | 2 +- drivers/video/fbdev/mx3fb.c | 3 +- include/linux/dma/dw.h | 64 +++++ include/linux/dmaengine.h | 17 +- include/linux/dw_dmac.h | 111 --------- include/linux/fsldma.h | 13 + include/linux/platform_data/dma-dw.h | 59 +++++ include/linux/spi/pxa2xx_spi.h | 9 +- include/sound/atmel-abdac.h | 2 +- include/sound/atmel-ac97c.h | 2 +- sound/atmel/abdac.c | 4 +- sound/atmel/ac97c.c | 3 +- sound/soc/pxa/mmp-pcm.c | 3 +- 50 files changed, 835 insertions(+), 692 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/qcom_adm.txt create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt create mode 100644 include/linux/dma/dw.h delete mode 100644 include/linux/dw_dmac.h create mode 100644 include/linux/fsldma.h create mode 100644 include/linux/platform_data/dma-dw.h Merging net-next/master (64b1f00a0830 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge net-next/master Already up-to-date. Merging ipsec-next/master (689f1c9de2ab ipsec: Remove obsolete MAX_AH_AUTH_LEN) $ git merge ipsec-next/master Already up-to-date. Merging wireless-next/master (1fca350b7616 rtlwifi: Fix possible unaligned array in ether_addr_copy()) $ git merge wireless-next/master Already up-to-date. Merging bluetooth/master (c1d678db62b7 Bluetooth: Improve RFCOMM __test_pf macro robustness) $ git merge bluetooth/master Auto-merging net/ieee802154/reassembly.c Merge made by the 'recursive' strategy. drivers/bluetooth/ath3k.c | 2 + drivers/bluetooth/btusb.c | 1 + drivers/net/ieee802154/at86rf230.c | 180 +++++++++++++++++++------------------ drivers/net/ieee802154/mrf24j40.c | 32 ++++++- include/net/bluetooth/hci_core.h | 8 +- net/bluetooth/hci_conn.c | 3 + net/bluetooth/hci_event.c | 46 +++++----- net/bluetooth/l2cap_core.c | 4 +- net/bluetooth/mgmt.c | 83 ++++++++++++----- net/bluetooth/rfcomm/core.c | 6 +- net/ieee802154/6lowpan_rtnl.c | 46 ++++++---- net/ieee802154/reassembly.c | 8 +- net/ieee802154/reassembly.h | 4 +- net/mac802154/Kconfig | 2 +- 14 files changed, 259 insertions(+), 166 deletions(-) Merging infiniband/for-next (7b909bb49ac2 Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next) $ git merge infiniband/for-next Resolved 'drivers/infiniband/hw/mlx5/qp.c' using previous resolution. Auto-merging include/linux/mlx5/qp.h Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c Auto-merging drivers/infiniband/hw/mlx5/qp.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/qp.c Auto-merging drivers/infiniband/hw/mlx5/main.c Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 252352397d75] Merge remote-tracking branch 'infiniband/for-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 1 + drivers/infiniband/core/uverbs_cmd.c | 2 + drivers/infiniband/core/uverbs_main.c | 5 + drivers/infiniband/hw/cxgb4/cm.c | 32 +- drivers/infiniband/hw/cxgb4/device.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 8 +- drivers/infiniband/hw/mlx5/mem.c | 18 +- drivers/infiniband/hw/mlx5/mr.c | 6 +- drivers/infiniband/hw/mlx5/qp.c | 149 +++--- drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 25 +- drivers/infiniband/hw/ocrdma/ocrdma_main.c | 12 + drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 238 +++++----- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 10 +- drivers/infiniband/ulp/iser/iscsi_iser.c | 313 ++++++++++--- drivers/infiniband/ulp/iser/iscsi_iser.h | 408 +++++++++++----- drivers/infiniband/ulp/iser/iser_initiator.c | 198 ++++---- drivers/infiniband/ulp/iser/iser_memory.c | 99 ++-- drivers/infiniband/ulp/iser/iser_verbs.c | 667 +++++++++++++++------------ drivers/infiniband/ulp/isert/ib_isert.c | 65 ++- include/linux/mlx5/qp.h | 35 +- include/rdma/ib_verbs.h | 32 +- 21 files changed, 1372 insertions(+), 953 deletions(-) Merging mtd/master (8b3d58e55445 mtd: nand: omap: Correct CONFIG_MTD_NAND_OMAP_BCH help message) $ git merge mtd/master Auto-merging arch/arm/mach-omap2/gpmc.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/mtd/atmel-nand.txt | 2 + .../devicetree/bindings/mtd/mtd-physmap.txt | 4 +- MAINTAINERS | 1 + arch/arm/mach-omap2/gpmc.c | 2 + drivers/mtd/bcm47xxpart.c | 11 + drivers/mtd/chips/cfi_cmdset_0002.c | 2 + drivers/mtd/devices/Makefile | 1 - drivers/mtd/devices/docg3.c | 26 +- drivers/mtd/devices/m25p80.c | 22 +- drivers/mtd/maps/Kconfig | 2 +- drivers/mtd/maps/gpio-addr-flash.c | 42 +- drivers/mtd/maps/pcmciamtd.c | 2 +- drivers/mtd/maps/physmap_of.c | 6 +- drivers/mtd/mtdchar.c | 3 + drivers/mtd/mtdcore.c | 39 +- drivers/mtd/mtdswap.c | 8 +- drivers/mtd/nand/Kconfig | 7 +- drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/atmel_nand.c | 96 ++-- drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c | 57 ++- drivers/mtd/nand/denali.c | 565 +++++++++++---------- drivers/mtd/nand/denali.h | 27 +- drivers/mtd/nand/nand_base.c | 38 +- drivers/mtd/nand/nand_bbt.c | 23 +- drivers/mtd/nand/nand_ids.c | 4 + drivers/mtd/nand/nand_timings.c | 2 +- drivers/mtd/nand/nandsim.c | 2 +- drivers/mtd/nand/ndfc.c | 3 +- drivers/mtd/nand/omap2.c | 166 +++--- drivers/mtd/{devices/elm.c => nand/omap_elm.c} | 0 drivers/mtd/nand/sm_common.h | 2 +- drivers/mtd/sm_ftl.c | 2 +- drivers/mtd/spi-nor/Kconfig | 14 + drivers/mtd/spi-nor/spi-nor.c | 42 +- drivers/mtd/tests/mtd_test.c | 4 +- drivers/mtd/tests/nandbiterrs.c | 2 +- drivers/mtd/tests/oobtest.c | 8 +- drivers/mtd/tests/pagetest.c | 4 +- drivers/mtd/tests/readtest.c | 2 +- drivers/mtd/tests/speedtest.c | 14 +- drivers/mtd/tests/subpagetest.c | 10 +- include/linux/mtd/cfi.h | 22 +- include/linux/mtd/nand.h | 12 + include/linux/platform_data/elm.h | 16 + include/linux/platform_data/mtd-nand-omap2.h | 1 + 45 files changed, 757 insertions(+), 562 deletions(-) rename drivers/mtd/{devices/elm.c => nand/omap_elm.c} (100%) Merging l2-mtd/master (8b3d58e55445 mtd: nand: omap: Correct CONFIG_MTD_NAND_OMAP_BCH help message) $ git merge l2-mtd/master Already up-to-date. Merging crypto/master (be34c4ef693f crypto: sha - Handle unaligned input data in generic sha256 and sha512.) $ git merge crypto/master Already up-to-date. Merging drm/drm-next (dfda0df34264 drm/mst: rework payload table allocation to conform better.) $ git merge drm/drm-next Already up-to-date. Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1) $ git merge drm-panel/drm/panel/for-next Already up-to-date. Merging drm-intel/for-linux-next (07c338ce9826 drm/i915: fix short vs. long hpd detection) $ git merge drm-intel/for-linux-next Merge made by the 'recursive' strategy. drivers/gpu/drm/i915/i915_irq.c | 19 ++++++++++--------- drivers/gpu/drm/i915/intel_display.c | 36 +++++++++++++++++++++--------------- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_panel.c | 5 ++--- 4 files changed, 36 insertions(+), 27 deletions(-) Merging drm-tegra/drm/tegra/for-next (8ed05f485498 drm/tegra: Depend on COMMON_CLK) $ git merge drm-tegra/drm/tegra/for-next Merge made by the 'recursive' strategy. drivers/gpu/drm/tegra/Kconfig | 1 + 1 file changed, 1 insertion(+) Merging drm-misc/topic/core-stuff (d87af4d10558 gpu: drm: drm_dp_mst_topology.c: Fix improper use of strncat) $ git merge drm-misc/topic/core-stuff Auto-merging drivers/gpu/drm/drm_dp_mst_topology.c Merge made by the 'recursive' strategy. drivers/gpu/drm/drm_dp_mst_topology.c | 15 ++++++++------- drivers/gpu/drm/drm_drv.c | 5 +++-- drivers/gpu/drm/drm_fops.c | 12 +++++++----- include/drm/drmP.h | 8 ++++---- 4 files changed, 22 insertions(+), 18 deletions(-) Merging sound/for-next (c8b00fd2f4c5 ALSA: hda_intel: Add Device IDs for Intel Sunrise Point PCH) $ git merge sound/for-next Already up-to-date. Merging sound-asoc/for-next (c171b120c327 ASoC: sgtl500: Document the required supplies) $ git merge sound-asoc/for-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/sound/sgtl5000.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) Merging modules/modules-next (d3051b489aa8 modules, lock around setting of MODULE_STATE_UNFORMED) $ git merge modules/modules-next Auto-merging kernel/module.c Merge made by the 'recursive' strategy. kernel/module.c | 2 ++ 1 file changed, 2 insertions(+) Merging virtio/virtio-next (1bbc26062754 virtio-rng: refactor probe error handling) $ git merge virtio/virtio-next Auto-merging drivers/virtio/virtio_balloon.c Auto-merging drivers/net/virtio_net.c Auto-merging drivers/char/hw_random/virtio-rng.c Merge made by the 'recursive' strategy. drivers/block/virtio_blk.c | 40 ++++---------- drivers/char/hw_random/virtio-rng.c | 15 +++--- drivers/char/virtio_console.c | 4 ++ drivers/misc/mic/card/mic_virtio.c | 6 +-- drivers/net/virtio_net.c | 44 +++++---------- drivers/s390/kvm/kvm_virtio.c | 9 +--- drivers/s390/kvm/virtio_ccw.c | 6 +-- drivers/scsi/virtio_scsi.c | 42 +++++++++------ drivers/virtio/virtio.c | 103 ++++++++++++++++++++++++++++++++++++ drivers/virtio/virtio_balloon.c | 2 + drivers/virtio/virtio_mmio.c | 7 +-- drivers/virtio/virtio_pci.c | 33 ++---------- include/linux/virtio.h | 14 +++++ include/linux/virtio_config.h | 17 ++++++ net/9p/trans_virtio.c | 2 + 15 files changed, 207 insertions(+), 137 deletions(-) Merging input/next (68da16649165 Input: i8042 - disable active multiplexing by default) $ git merge input/next Already up-to-date. Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) $ git merge input-mt/for-next Already up-to-date. Merging block/for-next (8a240c0026ce Merge branch 'for-3.18/core' into for-next) $ git merge block/for-next Resolved 'block/blk-core.c' using previous resolution. Auto-merging mm/backing-dev.c Auto-merging include/linux/nfs_fs.h Auto-merging include/linux/fs.h Auto-merging include/linux/blkdev.h Auto-merging include/linux/blk-mq.h Auto-merging fs/xfs/xfs_buf.c Auto-merging fs/nfs/file.c Auto-merging fs/nfs/direct.c Auto-merging fs/btrfs/disk-io.c Auto-merging fs/block_dev.c Auto-merging drivers/scsi/st.c Auto-merging drivers/scsi/sd.c Auto-merging drivers/scsi/scsi_lib.c Auto-merging drivers/scsi/scsi_error.c Auto-merging drivers/scsi/Kconfig Auto-merging drivers/mmc/card/queue.c Auto-merging drivers/block/zram/zram_drv.c Auto-merging drivers/block/xen-blkfront.c Auto-merging drivers/block/xen-blkback/xenbus.c Auto-merging drivers/block/virtio_blk.c Auto-merging drivers/block/rsxx/core.c Auto-merging block/blk-sysfs.c Auto-merging block/blk-mq.c Auto-merging block/blk-core.c CONFLICT (content): Merge conflict in block/blk-core.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 57e9fd42af67] Merge remote-tracking branch 'block/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-block | 8 + Documentation/block/data-integrity.txt | 54 +---- block/Kconfig | 1 + block/Makefile | 4 +- block/bio-integrity.c | 271 ++++++--------------- block/bio.c | 61 +++-- block/blk-cgroup.c | 2 - block/blk-cgroup.h | 3 - block/blk-core.c | 67 +++-- block/blk-flush.c | 147 +++++++---- block/blk-integrity.c | 103 +++++--- block/blk-merge.c | 14 +- block/blk-mq-tag.c | 55 ++--- block/blk-mq.c | 364 ++++++++++++++-------------- block/blk-mq.h | 3 +- block/blk-settings.c | 4 +- block/blk-sysfs.c | 4 +- block/blk-timeout.c | 15 +- block/blk.h | 37 ++- block/bsg.c | 9 +- block/cfq-iosched.c | 10 +- block/compat_ioctl.c | 4 - block/ioctl.c | 4 - block/partitions/mac.c | 8 +- block/scsi_ioctl.c | 11 +- block/t10-pi.c | 197 +++++++++++++++ drivers/block/drbd/drbd_actlog.c | 4 +- drivers/block/drbd/drbd_bitmap.c | 6 +- drivers/block/drbd/drbd_debugfs.c | 2 +- drivers/block/drbd/drbd_int.h | 19 +- drivers/block/drbd/drbd_interval.c | 40 +-- drivers/block/drbd/drbd_main.c | 28 +-- drivers/block/drbd/drbd_proc.c | 4 +- drivers/block/drbd/drbd_receiver.c | 52 ++-- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/drbd/drbd_state.c | 18 +- drivers/block/drbd/drbd_worker.c | 51 ++-- drivers/block/hd.c | 12 +- drivers/block/mtip32xx/mtip32xx.c | 10 +- drivers/block/nbd.c | 1 + drivers/block/null_blk.c | 8 +- drivers/block/nvme-core.c | 1 + drivers/block/paride/pd.c | 2 + drivers/block/pktcdvd.c | 2 + drivers/block/rsxx/core.c | 2 +- drivers/block/rsxx/dev.c | 1 + drivers/block/skd_main.c | 1 + drivers/block/sx8.c | 2 +- drivers/block/virtio_blk.c | 8 +- drivers/block/xen-blkback/blkback.c | 1 + drivers/block/xen-blkback/xenbus.c | 6 +- drivers/block/xen-blkfront.c | 12 +- drivers/block/zram/zram_drv.c | 1 + drivers/cdrom/cdrom.c | 4 +- drivers/ide/ide-disk.c | 4 +- drivers/ide/ide-park.c | 2 +- drivers/md/bcache/super.c | 1 + drivers/mmc/card/queue.c | 1 + drivers/mtd/mtd_blkdevs.c | 1 + drivers/s390/block/scm_blk.c | 1 + drivers/s390/block/xpram.c | 1 + drivers/scsi/Kconfig | 1 - drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- drivers/scsi/device_handler/scsi_dh_emc.c | 2 +- drivers/scsi/device_handler/scsi_dh_hp_sw.c | 4 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 2 +- drivers/scsi/osd/osd_initiator.c | 4 +- drivers/scsi/osst.c | 2 +- drivers/scsi/scsi_error.c | 2 + drivers/scsi/scsi_lib.c | 25 +- drivers/scsi/sd.c | 77 +++--- drivers/scsi/sd.h | 66 ++++- drivers/scsi/sd_dif.c | 353 ++++----------------------- drivers/scsi/sg.c | 4 +- drivers/scsi/st.c | 2 +- drivers/target/target_core_pscsi.c | 2 +- fs/block_dev.c | 34 +-- fs/btrfs/disk-io.c | 2 +- fs/nfs/direct.c | 12 +- fs/nfs/file.c | 4 +- fs/xfs/xfs_buf.c | 2 - include/linux/backing-dev.h | 4 - include/linux/bio.h | 65 +++-- include/linux/blk-mq.h | 22 +- include/linux/blk_types.h | 18 +- include/linux/blkdev.h | 71 +++--- include/linux/crc-t10dif.h | 5 +- include/linux/fs.h | 2 - include/linux/nfs_fs.h | 4 +- include/linux/t10-pi.h | 22 ++ include/scsi/scsi_cmnd.h | 36 ++- mm/backing-dev.c | 40 ++- 92 files changed, 1343 insertions(+), 1319 deletions(-) create mode 100644 block/t10-pi.c create mode 100644 include/linux/t10-pi.h Merging device-mapper/for-next (0d4ba4b3b726 dm crypt: sort writes) $ git merge device-mapper/for-next Auto-merging drivers/md/dm-crypt.c Auto-merging drivers/md/dm-bufio.c Merge made by the 'recursive' strategy. drivers/md/dm-bufio.c | 11 +- drivers/md/dm-crypt.c | 368 +++++++++++++++++---------------- drivers/md/dm-ioctl.c | 2 +- drivers/md/dm-log-userspace-transfer.c | 2 +- drivers/md/dm-mpath.c | 4 +- drivers/md/dm-raid.c | 60 +++++- drivers/md/dm-stripe.c | 4 +- drivers/md/dm-table.c | 102 +++------ drivers/md/dm.c | 143 ++++++++++++- drivers/md/dm.h | 5 +- include/uapi/linux/dm-ioctl.h | 4 +- 11 files changed, 430 insertions(+), 275 deletions(-) Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) $ git merge embedded/master Already up-to-date. Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) $ git merge firmware/master Already up-to-date. Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) $ git merge pcmcia/master Already up-to-date. Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) $ git merge mmc/mmc-next Already up-to-date. Merging mmc-uh/next (583f958b8a23 ARM: dts: fix MMC2 regulators for Exynos5420 Arndale Octa board) $ git merge mmc-uh/next Already up-to-date. Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up) $ git merge kgdb/kgdb-next Merge made by the 'recursive' strategy. kernel/debug/debug_core.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) $ git merge uclinux/for-next Already up-to-date. Merging md/for-next (b395f75eabb3 lib/raid6: Add log level to printks) $ git merge md/for-next Merge made by the 'recursive' strategy. drivers/md/bitmap.c | 16 +- drivers/md/linear.c | 8 +- drivers/md/md.c | 601 +++++++++++++---------------------------- drivers/md/md.h | 34 ++- drivers/md/multipath.c | 28 +- drivers/md/raid0.c | 9 +- drivers/md/raid1.c | 37 +-- drivers/md/raid1.h | 2 - drivers/md/raid10.c | 18 +- drivers/md/raid5.c | 29 +- drivers/md/raid5.h | 4 +- include/uapi/linux/raid/md_u.h | 1 - lib/raid6/algos.c | 12 +- 13 files changed, 266 insertions(+), 533 deletions(-) Merging mfd/for-mfd-next (d86c21fd3111 mfd: cros_ec: wait for completion of commands that return IN_PROGRESS) $ git merge mfd/for-mfd-next Already up-to-date. Merging backlight/for-backlight-next (b6af73b42219 backlight: omap1: add blank line after declarations) $ git merge backlight/for-backlight-next Already up-to-date. Merging battery/master (7881c64716f3 power: ab8500_fg: Fix build warning) $ git merge battery/master Already up-to-date. Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) $ git merge fbdev/for-next Already up-to-date. Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next (33ac9dba859b fonts: Add 6x10 font) $ git merge omap_dss2/for-next Auto-merging drivers/video/of_display_timing.c Auto-merging drivers/video/fbdev/sis/sis_main.c Auto-merging drivers/video/fbdev/mx3fb.c Auto-merging drivers/video/fbdev/atmel_lcdfb.c Auto-merging drivers/video/fbdev/Kconfig Auto-merging Documentation/devicetree/bindings/video/atmel,lcdc.txt Merge made by the 'recursive' strategy. .../devicetree/bindings/video/atmel,lcdc.txt | 3 + drivers/video/console/bitblit.c | 3 +- drivers/video/console/fbcon_ccw.c | 3 +- drivers/video/console/fbcon_cw.c | 3 +- drivers/video/console/fbcon_ud.c | 3 +- drivers/video/fbdev/Kconfig | 3 +- drivers/video/fbdev/atmel_lcdfb.c | 20 + drivers/video/fbdev/aty/aty128fb.c | 63 +- drivers/video/fbdev/au1200fb.c | 1 - drivers/video/fbdev/controlfb.c | 15 +- drivers/video/fbdev/core/cfbcopyarea.c | 13 +- drivers/video/fbdev/core/fbsysfs.c | 12 +- drivers/video/fbdev/cyber2000fb.c | 16 +- drivers/video/fbdev/intelfb/intelfbhw.c | 3 +- drivers/video/fbdev/matrox/matroxfb_base.c | 52 +- drivers/video/fbdev/matrox/matroxfb_maven.c | 20 +- drivers/video/fbdev/msm/msm_fb.c | 25 +- drivers/video/fbdev/mx3fb.c | 2 +- drivers/video/fbdev/omap2/dss/dispc-compat.c | 9 +- drivers/video/fbdev/omap2/dss/dsi.c | 10 +- drivers/video/fbdev/omap2/dss/manager-sysfs.c | 16 +- drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 14 +- drivers/video/fbdev/pxafb.c | 20 +- drivers/video/fbdev/riva/riva_hw.c | 1 - drivers/video/fbdev/sa1100fb.c | 18 +- drivers/video/fbdev/sh_mobile_hdmi.c | 44 +- drivers/video/fbdev/sis/init301.c | 2 +- drivers/video/fbdev/sis/sis_main.c | 2 +- drivers/video/fbdev/stifb.c | 4 +- drivers/video/fbdev/udlfb.c | 7 +- drivers/video/fbdev/valkyriefb.c | 14 +- drivers/video/fbdev/vermilion/vermilion.c | 1 - drivers/video/of_display_timing.c | 3 +- include/linux/font.h | 4 +- include/video/of_display_timing.h | 16 + lib/fonts/Kconfig | 9 + lib/fonts/Makefile | 1 + lib/fonts/font_6x10.c | 3086 ++++++++++++++++++++ lib/fonts/fonts.c | 4 + 39 files changed, 3421 insertions(+), 124 deletions(-) create mode 100644 lib/fonts/font_6x10.c Merging regulator/for-next (fc5d2e6cbf03 Merge remote-tracking branch 'regulator/fix/rk808' into regulator-linus) $ git merge regulator/for-next Merge made by the 'recursive' strategy. drivers/regulator/rk808-regulator.c | 2 +- include/linux/regulator/consumer.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) Merging security/next (594081ee7145 integrity: do zero padding of the key id) $ git merge security/next Already up-to-date. Merging integrity/next (1b68bdf9cded ima: detect violations for mmaped files) $ git merge integrity/next Already up-to-date. Merging selinux/next (4093a8443941 selinux: normalize audit log formatting) $ git merge selinux/next Already up-to-date. Merging lblnet/next (d8ec26d7f828 Linux 3.13) $ git merge lblnet/next Already up-to-date. Merging watchdog/master (d2aa9ba6cdf4 watchdog: meson: remove magic value for reboot) $ git merge watchdog/master Auto-merging drivers/watchdog/Kconfig Auto-merging arch/arm/configs/multi_v7_defconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/watchdog/cadence-wdt.txt | 24 + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 3 +- .../devicetree/bindings/watchdog/meson6-wdt.txt | 13 + .../devicetree/bindings/watchdog/qcom-wdt.txt | 24 + .../devicetree/bindings/watchdog/samsung-wdt.txt | 1 + arch/arm/configs/multi_v7_defconfig | 1 + drivers/watchdog/Kconfig | 54 ++- drivers/watchdog/Makefile | 5 + drivers/watchdog/booke_wdt.c | 28 +- drivers/watchdog/cadence_wdt.c | 516 +++++++++++++++++++++ drivers/watchdog/da9063_wdt.c | 191 ++++++++ drivers/watchdog/dw_wdt.c | 36 +- drivers/watchdog/imx2_wdt.c | 43 +- drivers/watchdog/meson_wdt.c | 236 ++++++++++ drivers/watchdog/of_xilinx_wdt.c | 1 - drivers/watchdog/qcom-wdt.c | 224 +++++++++ drivers/watchdog/rn5t618_wdt.c | 198 ++++++++ drivers/watchdog/s3c2410_wdt.c | 47 ++ drivers/watchdog/stmp3xxx_rtc_wdt.c | 24 + drivers/watchdog/sunxi_wdt.c | 111 ++++- drivers/watchdog/ts72xx_wdt.c | 6 +- include/linux/watchdog.h | 9 +- 22 files changed, 1725 insertions(+), 70 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/cadence-wdt.txt create mode 100644 Documentation/devicetree/bindings/watchdog/meson6-wdt.txt create mode 100644 Documentation/devicetree/bindings/watchdog/qcom-wdt.txt create mode 100644 drivers/watchdog/cadence_wdt.c create mode 100644 drivers/watchdog/da9063_wdt.c create mode 100644 drivers/watchdog/meson_wdt.c create mode 100644 drivers/watchdog/qcom-wdt.c create mode 100644 drivers/watchdog/rn5t618_wdt.c Merging iommu/next (09b5269a1b3d Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) $ git merge iommu/next Already up-to-date. Merging dwmw2-iommu/master (1860e379875d Linux 3.15) $ git merge dwmw2-iommu/master Already up-to-date. Merging vfio/next (93899a679fd6 vfio-pci: Fix remove path locking) $ git merge vfio/next Already up-to-date. Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next (bfe01a5ba249 Linux 3.17) $ git merge jc_docs/docs-next Already up-to-date. Merging trivial/for-next (7bb38d57fd75 Remove MN10300_PROC_MN2WS0038) $ git merge trivial/for-next Already up-to-date. Merging audit/master (2991dd2b0117 audit: rename audit_log_remove_rule to disambiguate for trees) $ git merge audit/master Resolved 'arch/arm64/kernel/ptrace.c' using previous resolution. Resolved 'arch/x86/kernel/entry_64.S' using previous resolution. Resolved 'arch/x86/kernel/ptrace.c' using previous resolution. Auto-merging kernel/auditsc.c Auto-merging kernel/auditfilter.c Auto-merging kernel/audit.c Auto-merging include/uapi/linux/audit.h Auto-merging include/linux/audit.h Auto-merging arch/x86/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/x86/kernel/ptrace.c Auto-merging arch/x86/kernel/entry_64.S CONFLICT (content): Merge conflict in arch/x86/kernel/entry_64.S Auto-merging arch/x86/kernel/entry_32.S Auto-merging arch/x86/ia32/ia32entry.S Auto-merging arch/um/kernel/ptrace.c Auto-merging arch/sparc/include/asm/thread_info_64.h Auto-merging arch/s390/kernel/ptrace.c Auto-merging arch/powerpc/kernel/ptrace.c Auto-merging arch/parisc/kernel/ptrace.c Auto-merging arch/mips/kernel/ptrace.c Auto-merging arch/mips/include/asm/syscall.h Auto-merging arch/arm64/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/arm64/kernel/ptrace.c Auto-merging arch/arm/kernel/ptrace.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b5f2149f9283] Merge remote-tracking branch 'audit/master' $ git diff -M --stat --summary HEAD^.. arch/alpha/include/asm/syscall.h | 11 +++++++ arch/alpha/kernel/ptrace.c | 2 +- arch/arm/kernel/ptrace.c | 4 +-- arch/arm64/kernel/ptrace.c | 4 +-- arch/ia64/include/asm/syscall.h | 6 ++++ arch/ia64/kernel/ptrace.c | 2 +- arch/microblaze/include/asm/syscall.h | 5 +++ arch/microblaze/kernel/ptrace.c | 3 +- arch/mips/include/asm/syscall.h | 2 +- arch/mips/kernel/ptrace.c | 4 +-- arch/openrisc/include/asm/syscall.h | 5 +++ arch/openrisc/include/uapi/asm/elf.h | 3 +- arch/openrisc/kernel/ptrace.c | 3 +- arch/parisc/include/asm/syscall.h | 11 +++++++ arch/parisc/kernel/ptrace.c | 9 ++---- arch/powerpc/include/asm/syscall.h | 6 ++++ arch/powerpc/kernel/ptrace.c | 7 ++--- arch/s390/kernel/ptrace.c | 4 +-- arch/sh/include/asm/syscall_32.h | 10 ++++++ arch/sh/include/asm/syscall_64.h | 14 +++++++++ arch/sh/kernel/ptrace_32.c | 14 +-------- arch/sh/kernel/ptrace_64.c | 17 +--------- arch/sparc/include/asm/syscall.h | 7 +++++ arch/sparc/include/asm/thread_info_32.h | 2 ++ arch/sparc/include/asm/thread_info_64.h | 2 ++ arch/sparc/kernel/ptrace_64.c | 9 ++---- arch/um/kernel/ptrace.c | 3 +- arch/x86/ia32/ia32entry.S | 12 +++---- arch/x86/kernel/entry_32.S | 11 +++---- arch/x86/kernel/ptrace.c | 4 +-- arch/x86/um/asm/ptrace.h | 4 --- arch/x86/um/asm/syscall.h | 15 +++++++++ arch/xtensa/kernel/ptrace.c | 2 +- include/asm-generic/syscall.h | 2 +- include/linux/audit.h | 25 +++++++++------ include/uapi/linux/audit.h | 14 +-------- include/uapi/linux/elf-em.h | 1 + kernel/audit.c | 30 ++++++------------ kernel/audit.h | 1 - kernel/audit_tree.c | 6 ++-- kernel/audit_watch.c | 4 +-- kernel/auditfilter.c | 56 +++++++++++++++++++-------------- kernel/auditsc.c | 28 ++++++----------- 43 files changed, 204 insertions(+), 180 deletions(-) create mode 100644 arch/alpha/include/asm/syscall.h create mode 100644 arch/x86/um/asm/syscall.h Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) $ git merge fsnotify/for-next Already up-to-date. Merging devicetree/devicetree/next (2118f4b8dfc6 of/selftest: Move hash table off stack to fix large frame size) $ git merge devicetree/devicetree/next Already up-to-date. Merging dt-rh/for-next (d22e9131187d of: add vendor prefix for Chipidea) $ git merge dt-rh/for-next Already up-to-date. Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) $ git merge mailbox/mailbox-for-next Auto-merging drivers/cpufreq/highbank-cpufreq.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/mailbox/mailbox.txt | 38 ++ Documentation/mailbox.txt | 122 ++++++ MAINTAINERS | 8 + arch/arm/mach-highbank/highbank.c | 2 +- drivers/cpufreq/highbank-cpufreq.c | 2 +- drivers/mailbox/Makefile | 4 + drivers/mailbox/mailbox.c | 465 +++++++++++++++++++++ drivers/mailbox/pl320-ipc.c | 2 +- include/linux/mailbox_client.h | 46 ++ include/linux/mailbox_controller.h | 133 ++++++ include/linux/{mailbox.h => pl320-ipc.h} | 0 11 files changed, 819 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/mailbox/mailbox.txt create mode 100644 Documentation/mailbox.txt create mode 100644 drivers/mailbox/mailbox.c create mode 100644 include/linux/mailbox_client.h create mode 100644 include/linux/mailbox_controller.h rename include/linux/{mailbox.h => pl320-ipc.h} (100%) Merging spi/for-next (af2cce688353 Merge remote-tracking branches 'spi/fix/pl022', 'spi/fix/rockchip' and 'spi/fix/spidev' into spi-linus) $ git merge spi/for-next Merge made by the 'recursive' strategy. drivers/spi/spi-pl022.c | 2 +- drivers/spi/spi-rockchip.c | 46 ++++++++++++++++++++------- drivers/spi/spidev.c | 79 ++++++++++++++++++++++++++++++---------------- 3 files changed, 88 insertions(+), 39 deletions(-) Merging tip/auto-latest (bc754d2c0f0e Merge branch 'x86/efi') $ git merge tip/auto-latest Auto-merging include/linux/kernel.h Auto-merging drivers/rtc/Kconfig Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 8 +- arch/arm64/kernel/efi.c | 44 +++---- arch/ia64/kernel/efi.c | 6 +- arch/x86/boot/compressed/eboot.c | 32 +++-- arch/x86/include/asm/efi.h | 31 ++--- arch/x86/platform/efi/efi-bgrt.c | 36 +++++- arch/x86/platform/efi/efi.c | 52 ++++---- arch/x86/platform/efi/efi_32.c | 12 +- arch/x86/platform/efi/efi_64.c | 6 +- arch/x86/platform/efi/efi_stub_32.S | 4 +- drivers/firmware/efi/efi.c | 79 ++++++++++++ drivers/firmware/efi/libstub/arm-stub.c | 4 + drivers/firmware/efi/libstub/efi-stub-helper.c | 62 +++++++++- drivers/firmware/efi/runtime-wrappers.c | 164 +++++++++++++++++++++++-- drivers/firmware/efi/vars.c | 61 +++++++-- drivers/rtc/Kconfig | 2 +- drivers/rtc/rtc-efi.c | 1 + include/linux/efi.h | 17 +++ include/linux/kernel.h | 1 + lib/cmdline.c | 29 +++++ 20 files changed, 528 insertions(+), 123 deletions(-) Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible) $ git merge clockevents/clockevents/next Already up-to-date. Merging edac/linux_next (d0585cd815fa sb_edac: Claim a different PCI device) $ git merge edac/linux_next Already up-to-date. Merging edac-amd/for-next (a18c3f16a907 mpc85xx_edac: Make L2 interrupt shared too) $ git merge edac-amd/for-next Already up-to-date. Merging irqchip/irqchip/for-next (3bbccffba8d5 Merge branch 'irqchip/core' into irqchip/for-next) $ git merge irqchip/irqchip/for-next Auto-merging drivers/irqchip/irq-armada-370-xp.c Merge made by the 'recursive' strategy. drivers/irqchip/irq-armada-370-xp.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) Merging tiny/tiny/next (d45461ff03ad Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next) $ git merge tiny/tiny/next Merge made by the 'recursive' strategy. Merging ftrace/for-next (70c738a64478 Merge branch 'trace/ftrace/testing' into trace/for-next) $ git merge ftrace/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging rcu/rcu/next (3e28e377204b workqueue: Use cond_resched_rcu_qs macro) $ git merge rcu/rcu/next Already up-to-date. Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) $ git merge uprobes/for-next Already up-to-date. Merging kvm/linux-next (da01e61428aa Merge tag 'f2fs-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) $ git merge kvm/linux-next Already up-to-date. Merging kvm-arm/next (2df36a5dd679 arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs) $ git merge kvm-arm/next Recorded preimage for 'virt/kvm/arm/vgic-v2.c' Auto-merging virt/kvm/arm/vgic-v2.c CONFLICT (content): Merge conflict in virt/kvm/arm/vgic-v2.c Auto-merging arch/arm64/include/asm/pgtable.h Auto-merging arch/arm/include/asm/pgtable.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'virt/kvm/arm/vgic-v2.c'. [master b4908ba9a3ea] Merge remote-tracking branch 'kvm-arm/next' $ git diff -M --stat --summary HEAD^.. arch/arm/include/asm/kvm_mmu.h | 31 +++++- arch/arm/include/asm/pgtable.h | 2 +- arch/arm/kvm/arm.c | 5 +- arch/arm/kvm/interrupts_head.S | 7 ++ arch/arm/kvm/mmu.c | 235 ++++++++++++++++++++++++++++++++------- arch/arm64/include/asm/kvm_mmu.h | 127 +++++++++++++++++++-- arch/arm64/include/asm/pgtable.h | 2 +- arch/arm64/kvm/vgic-v2-switch.S | 12 +- include/kvm/arm_vgic.h | 12 +- virt/kvm/arm/vgic-v2.c | 24 +--- virt/kvm/arm/vgic.c | 21 +++- 11 files changed, 392 insertions(+), 86 deletions(-) Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst) $ git merge kvm-ppc/kvm-ppc-next Already up-to-date. Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) $ git merge oprofile/for-next Already up-to-date. Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) $ git merge fw-nohz/nohz/next Already up-to-date. Merging xen-tip/linux-next (95afae481414 xen: remove DEFINE_XENBUS_DRIVER() macro) $ git merge xen-tip/linux-next Already up-to-date. Merging percpu/for-next (0a15cbdaefcd Merge branch 'for-3.18' into for-next) $ git merge percpu/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()) $ git merge workqueues/for-next Already up-to-date. Merging drivers-x86/for-next (eabde0fa9670 toshiba_acpi: Adapt kbd_bl_timeout_store to the new kbd type) $ git merge drivers-x86/for-next Already up-to-date. Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) $ git merge chrome-platform/for-next Already up-to-date. Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) $ git merge sysctl/master Already up-to-date. Merging regmap/for-next (aadb5e9feaae Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus) $ git merge regmap/for-next Merge made by the 'recursive' strategy. drivers/base/regmap/regcache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging hsi/for-next (a26a42508157 HSI: remove deprecated IRQF_DISABLED) $ git merge hsi/for-next Merge made by the 'recursive' strategy. drivers/hsi/clients/nokia-modem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging leds/for-next (a4c84e6aafda leds: gpio: cleanup the leds-gpio driver) $ git merge leds/for-next Resolved 'drivers/leds/leds-gpio.c' using previous resolution. Auto-merging include/linux/leds.h Auto-merging drivers/leds/leds-gpio.c CONFLICT (content): Merge conflict in drivers/leds/leds-gpio.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 36e00e95d03c] Merge remote-tracking branch 'leds/for-next' $ git diff -M --stat --summary HEAD^.. drivers/leds/led-class.c | 23 +++++++++-------------- drivers/leds/led-core.c | 19 ++++++++++++++++++- drivers/leds/leds-gpio-register.c | 5 ++++- drivers/leds/leds-gpio.c | 13 ++++++------- drivers/leds/leds-lp3944.c | 3 ++- drivers/leds/trigger/ledtrig-gpio.c | 2 +- include/linux/leds.h | 16 +++++++++++++--- 7 files changed, 53 insertions(+), 28 deletions(-) Merging ipmi/for-next (ef4a48c51321 Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux) $ git merge ipmi/for-next Already up-to-date. Merging driver-core/driver-core-next (5e40d331bd72 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) $ git merge driver-core/driver-core-next Already up-to-date. Merging tty/tty-next (69784fa539ef Revert "serial/core: Initialize the console pm state") $ git merge tty/tty-next Already up-to-date. Merging usb/usb-next (4ed9a3d45555 USB: host: st: fix typo 'CONFIG_USB_EHCI_HCD_ST') $ git merge usb/usb-next Already up-to-date. Merging usb-gadget/next (72a65a0d19c1 Revert "usb: gadget: composite: dequeue cdev->req before free its buffer") $ git merge usb-gadget/next Already up-to-date. Merging usb-serial/usb-next (f8c0e057b489 USB: serial: remove zte_ev driver) $ git merge usb-serial/usb-next Already up-to-date. Merging staging/staging-next (80213c03c415 Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) $ git merge staging/staging-next Already up-to-date. Merging char-misc/char-misc-next (480bd3c4ad30 mei: mei_txe_fw_sts can be static) $ git merge char-misc/char-misc-next Already up-to-date. Merging cgroup/for-next (55e8955e6eba Merge branch 'for-3.18' into for-next) $ git merge cgroup/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging scsi/for-next (20c5ec4e6d71 Merge branch 'fixes' into for-next) $ git merge scsi/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging target-updates/for-next (218285965f3f vhost-scsi: Take configfs group dependency during VHOST_SCSI_SET_ENDPOINT) $ git merge target-updates/for-next Resolved 'drivers/scsi/qla2xxx/qla_target.c' using previous resolution. Auto-merging include/uapi/linux/Kbuild Auto-merging drivers/target/target_core_tpg.c Auto-merging drivers/target/target_core_pscsi.c Auto-merging drivers/target/target_core_configfs.c Auto-merging drivers/target/iscsi/iscsi_target_util.c Auto-merging drivers/target/iscsi/iscsi_target.c Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c Auto-merging drivers/scsi/qla2xxx/qla_target.h Auto-merging drivers/scsi/qla2xxx/qla_target.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c Auto-merging drivers/infiniband/ulp/isert/ib_isert.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c9e71db59684] Merge remote-tracking branch 'target-updates/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/target/tcmu-design.txt | 378 +++++++++ drivers/infiniband/ulp/isert/ib_isert.c | 6 +- drivers/scsi/qla2xxx/qla_target.c | 35 +- drivers/scsi/qla2xxx/qla_target.h | 12 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 11 +- drivers/target/Kconfig | 7 + drivers/target/Makefile | 1 + drivers/target/iscsi/iscsi_target.c | 6 +- drivers/target/iscsi/iscsi_target_configfs.c | 10 +- drivers/target/iscsi/iscsi_target_erl0.c | 6 +- drivers/target/iscsi/iscsi_target_login.c | 8 +- drivers/target/iscsi/iscsi_target_util.c | 5 +- drivers/target/loopback/tcm_loop.c | 29 +- drivers/target/target_core_alua.c | 33 +- drivers/target/target_core_configfs.c | 26 +- drivers/target/target_core_device.c | 48 +- drivers/target/target_core_fabric_configfs.c | 13 +- drivers/target/target_core_fabric_lib.c | 6 +- drivers/target/target_core_file.c | 13 +- drivers/target/target_core_internal.h | 6 +- drivers/target/target_core_pr.c | 107 +-- drivers/target/target_core_pr.h | 2 +- drivers/target/target_core_pscsi.c | 16 +- drivers/target/target_core_sbc.c | 2 +- drivers/target/target_core_tmr.c | 24 +- drivers/target/target_core_tpg.c | 53 +- drivers/target/target_core_transport.c | 27 +- drivers/target/target_core_ua.c | 15 +- drivers/target/target_core_ua.h | 1 + drivers/target/target_core_user.c | 1167 ++++++++++++++++++++++++++ drivers/target/tcm_fc/tfc_sess.c | 2 +- drivers/uio/uio.c | 12 - drivers/vhost/scsi.c | 22 + include/linux/uio_driver.h | 12 +- include/target/target_core_base.h | 17 + include/uapi/linux/Kbuild | 1 + include/uapi/linux/target_core_user.h | 142 ++++ 37 files changed, 1963 insertions(+), 318 deletions(-) create mode 100644 Documentation/target/tcmu-design.txt create mode 100644 drivers/target/target_core_user.c create mode 100644 include/uapi/linux/target_core_user.h Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) $ git merge target-merge/for-next-merge Already up-to-date. Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) $ git merge writeback/writeback-for-next Already up-to-date. Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) $ git merge hwspinlock/linux-next Already up-to-date. Merging pinctrl/for-next (9a50aaefc1b8 Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) $ git merge pinctrl/for-next Already up-to-date. Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) $ git merge vhost/linux-next Resolved 'drivers/vhost/net.c' using previous resolution. Auto-merging drivers/vhost/net.c CONFLICT (content): Merge conflict in drivers/vhost/net.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 23059408a424] Merge remote-tracking branch 'vhost/linux-next' $ git diff -M --stat --summary HEAD^.. Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) $ git merge remoteproc/for-next Already up-to-date. Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) $ git merge rpmsg/for-next Already up-to-date. Merging gpio/for-next (0429fbc0bdc2 Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu) $ git merge gpio/for-next Already up-to-date. Merging dma-mapping/dma-mapping-next (b4bbb107d73b dma-mapping: Provide write-combine allocations) $ git merge dma-mapping/dma-mapping-next Already up-to-date. Merging pwm/for-next (e2e08970100d pwm: atmel: Fix calculation of prescale value) $ git merge pwm/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/pwm/pwm-fsl-ftm.txt | 19 ++- .../devicetree/bindings/pwm/pwm-rockchip.txt | 4 +- drivers/pwm/Kconfig | 21 +++- drivers/pwm/Makefile | 2 + drivers/pwm/core.c | 31 +++-- drivers/pwm/pwm-atmel.c | 24 ++-- drivers/pwm/pwm-fsl-ftm.c | 90 +++++++------- drivers/pwm/pwm-imx.c | 71 ++++++++--- drivers/pwm/pwm-lpss-pci.c | 64 ++++++++++ drivers/pwm/pwm-lpss-platform.c | 68 ++++++++++ drivers/pwm/pwm-lpss.c | 137 +++------------------ drivers/pwm/pwm-lpss.h | 32 +++++ drivers/pwm/pwm-rockchip.c | 57 +++++++-- 13 files changed, 398 insertions(+), 222 deletions(-) create mode 100644 drivers/pwm/pwm-lpss-pci.c create mode 100644 drivers/pwm/pwm-lpss-platform.c create mode 100644 drivers/pwm/pwm-lpss.h Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) $ git merge dma-buf/for-next Merge made by the 'recursive' strategy. Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing proc entry) $ git merge userns/for-next Resolved 'fs/nfs/client.c' using previous resolution. Auto-merging fs/nfs/client.c CONFLICT (content): Merge conflict in fs/nfs/client.c Auto-merging fs/namespace.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fd2634497663] Merge remote-tracking branch 'userns/for-next' $ git diff -M --stat --summary HEAD^.. fs/namespace.c | 9 ++++ .../selftests/mount/unprivileged-remount-test.c | 51 ++++++++++++---------- 2 files changed, 36 insertions(+), 24 deletions(-) Merging ktest/for-next (d832d743385d ktest: Don't bother with bisect good or bad on replay) $ git merge ktest/for-next Already up-to-date. Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) $ git merge signal/for-next Already up-to-date. Merging clk/clk-next (98d147f50eb0 clk: pxa clocks build system fix) $ git merge clk/clk-next Already up-to-date. Merging random/dev (13aa93c70e71 random: add and use memzero_explicit() for clearing data) $ git merge random/dev Auto-merging lib/string.c Auto-merging include/linux/string.h Auto-merging drivers/char/random.c Merge made by the 'recursive' strategy. drivers/char/random.c | 8 ++++---- include/linux/string.h | 5 +++-- lib/string.c | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) $ git merge lzo-update/lzo-update Auto-merging lib/lzo/lzo1x_decompress_safe.c Merge made by the 'recursive' strategy. lib/lzo/lzo1x_decompress_safe.c | 4 ++++ lib/lzo/lzodefs.h | 6 ++++++ 2 files changed, 10 insertions(+) Merging aio/master (668044a5d632 aio: Make it possible to remap aio ring) $ git merge aio/master Auto-merging mm/mremap.c Auto-merging include/linux/fs.h Auto-merging fs/aio.c Merge made by the 'recursive' strategy. fs/aio.c | 25 +++++++++++++++++++++++++ include/linux/fs.h | 1 + mm/mremap.c | 3 ++- 3 files changed, 28 insertions(+), 1 deletion(-) Merging llvmlinux/for-next (ec25a590c29c arm: LLVMLinux: Use global stack register variable for percpu) $ git merge llvmlinux/for-next Merge made by the 'recursive' strategy. arch/arm/include/asm/percpu.h | 4 ++-- arch/arm/include/asm/ptrace.h | 5 ++--- arch/arm/include/asm/thread_info.h | 9 +++++++-- arch/arm/kernel/return_address.c | 3 +-- arch/arm/kernel/stacktrace.c | 4 +--- arch/arm/kernel/unwind.c | 3 +-- 6 files changed, 14 insertions(+), 14 deletions(-) Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL) $ git merge documentation/for-next Already up-to-date. Merging kselftest/next (49296470830a selftests/timers: change test to use ksft framework) $ git merge kselftest/next Merge made by the 'recursive' strategy. .../selftests/breakpoints/breakpoint_test.c | 10 ++-- tools/testing/selftests/ipc/msgque.c | 26 ++++----- tools/testing/selftests/kcmp/kcmp_test.c | 27 +++++++--- tools/testing/selftests/kselftest.h | 62 ++++++++++++++++++++++ tools/testing/selftests/timers/posix_timers.c | 14 ++--- 5 files changed, 110 insertions(+), 29 deletions(-) create mode 100644 tools/testing/selftests/kselftest.h Merging akpm-current/current (f221b9c91749 gcov: enable GCOV_PROFILE_ALL from ARCH Kconfigs) $ git merge --no-ff akpm-current/current Removing kernel/res_counter.c Auto-merging kernel/gcov/Kconfig Auto-merging kernel/debug/debug_core.c Removing ipc/ipcns_notifier.c Auto-merging init/Kconfig Auto-merging include/linux/string.h Removing include/linux/res_counter.h Auto-merging include/linux/mm.h Auto-merging fs/cifs/smb2pdu.h Auto-merging fs/cifs/smb2pdu.c Auto-merging fs/cifs/smb2ops.c Auto-merging fs/cifs/smb2misc.c Auto-merging fs/cifs/file.c Auto-merging fs/cifs/cifssmb.c Auto-merging drivers/video/backlight/backlight.c Auto-merging drivers/rtc/Kconfig Auto-merging drivers/input/input.c Auto-merging block/bio.c Auto-merging arch/x86/Kconfig Removing arch/powerpc/mm/gup.c Removing Documentation/cgroups/resource_counter.txt Merge made by the 'recursive' strategy. Documentation/cgroups/hugetlb.txt | 2 +- Documentation/cgroups/memory.txt | 4 +- Documentation/cgroups/resource_counter.txt | 197 ----- Documentation/leds/leds-class.txt | 3 - Documentation/printk-formats.txt | 6 + Documentation/sysctl/kernel.txt | 10 +- arch/arm/Kconfig | 1 + arch/arm64/Kconfig | 1 + arch/ia64/kernel/perfmon.c | 2 +- arch/microblaze/Kconfig | 1 + arch/powerpc/Kconfig | 2 + arch/powerpc/include/asm/hugetlb.h | 8 +- arch/powerpc/include/asm/page.h | 4 +- arch/powerpc/include/asm/pgtable-ppc64.h | 1 - arch/powerpc/include/asm/pgtable.h | 5 - arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/gup.c | 235 ------ arch/powerpc/mm/hugetlbpage.c | 27 +- arch/powerpc/platforms/cell/spufs/inode.c | 4 +- arch/s390/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/x86/Kconfig | 1 + block/bio.c | 54 +- block/genhd.c | 2 +- drivers/base/Kconfig | 8 +- drivers/base/dma-contiguous.c | 3 +- drivers/input/Kconfig | 9 + drivers/input/Makefile | 3 + drivers/input/input.c | 6 + drivers/input/leds.c | 276 +++++++ drivers/leds/Kconfig | 3 - drivers/misc/ti-st/st_core.c | 2 +- drivers/of/of_reserved_mem.c | 14 +- drivers/rtc/Kconfig | 2 +- drivers/rtc/interface.c | 8 + drivers/rtc/rtc-pm8xxx.c | 217 +++-- drivers/tty/Kconfig | 4 + drivers/tty/vt/keyboard.c | 110 ++- drivers/video/backlight/backlight.c | 2 - fs/affs/affs.h | 2 + fs/affs/amigaffs.c | 28 +- fs/affs/file.c | 54 +- fs/binfmt_misc.c | 2 +- fs/cifs/cifsacl.c | 2 +- fs/cifs/cifssmb.c | 20 +- fs/cifs/file.c | 4 +- fs/cifs/sess.c | 2 +- fs/cifs/smb2file.c | 4 +- fs/cifs/smb2misc.c | 38 +- fs/cifs/smb2ops.c | 2 +- fs/cifs/smb2pdu.c | 2 +- fs/cifs/smb2pdu.h | 28 +- fs/ext4/fsync.c | 5 +- fs/file.c | 2 +- fs/hfsplus/catalog.c | 89 +- fs/hfsplus/dir.c | 11 +- fs/hfsplus/hfsplus_fs.h | 4 +- fs/hfsplus/super.c | 4 +- fs/mpage.c | 23 +- fs/notify/inode_mark.c | 17 +- fs/ocfs2/alloc.c | 28 +- fs/ocfs2/alloc.h | 2 +- fs/ocfs2/aops.c | 268 ++++++- fs/ocfs2/dir.c | 2 +- fs/ocfs2/dlm/dlmast.c | 6 +- fs/ocfs2/dlm/dlmmaster.c | 22 +- fs/ocfs2/dlm/dlmrecovery.c | 18 +- fs/ocfs2/dlm/dlmthread.c | 10 + fs/ocfs2/file.c | 106 ++- fs/ocfs2/file.h | 9 + fs/ocfs2/inode.c | 10 +- fs/ocfs2/journal.c | 131 ++- fs/ocfs2/journal.h | 5 + fs/ocfs2/namei.c | 165 +++- fs/ocfs2/namei.h | 20 +- fs/ocfs2/ocfs2.h | 5 + fs/proc/generic.c | 164 ++-- fs/proc/internal.h | 11 +- fs/proc/proc_net.c | 1 + fs/proc/root.c | 1 + include/linux/cgroup.h | 26 + include/linux/compaction.h | 10 +- include/linux/crc64_ecma.h | 56 ++ include/linux/file.h | 1 - include/linux/gfp.h | 4 +- include/linux/hugetlb.h | 1 + include/linux/hugetlb_cgroup.h | 1 - include/linux/input.h | 21 + include/linux/ipc_namespace.h | 20 - include/linux/khugepaged.h | 17 +- include/linux/memcontrol.h | 5 +- include/linux/mm.h | 26 + include/linux/of_reserved_mem.h | 9 +- include/linux/oom.h | 2 + include/linux/page_counter.h | 51 ++ include/linux/percpu-refcount.h | 47 +- include/linux/res_counter.h | 223 ------ include/linux/string.h | 1 + include/net/sock.h | 26 +- include/uapi/linux/msg.h | 28 +- include/uapi/linux/sem.h | 18 +- init/Kconfig | 12 +- ipc/Makefile | 2 +- ipc/ipc_sysctl.c | 93 +-- ipc/ipcns_notifier.c | 92 --- ipc/msg.c | 36 +- ipc/namespace.c | 22 - ipc/sem.c | 13 +- ipc/util.c | 40 - kernel/Makefile | 1 - kernel/debug/debug_core.c | 9 +- kernel/debug/kdb/kdb_debugger.c | 4 + kernel/debug/kdb/kdb_main.c | 4 +- kernel/freezer.c | 26 +- kernel/gcov/Kconfig | 5 +- kernel/kexec.c | 2 +- kernel/power/process.c | 31 +- kernel/res_counter.c | 211 ----- kernel/sysctl.c | 14 +- kernel/time/posix-timers.c | 57 +- lib/Kconfig | 7 + lib/Makefile | 1 + lib/crc64_ecma.c | 341 ++++++++ lib/vsprintf.c | 20 +- mm/Makefile | 1 + mm/compaction.c | 92 ++- mm/gup.c | 113 ++- mm/huge_memory.c | 15 +- mm/hugetlb_cgroup.c | 103 +-- mm/internal.h | 7 +- mm/memcontrol.c | 1202 +++++++++------------------- mm/memory-failure.c | 4 +- mm/memory.c | 8 + mm/memory_hotplug.c | 4 +- mm/mmap.c | 8 +- mm/oom_kill.c | 16 +- mm/page_alloc.c | 121 +-- mm/page_cgroup.c | 1 + mm/page_counter.c | 192 +++++ mm/page_isolation.c | 2 +- mm/util.c | 30 + mm/vmalloc.c | 3 +- mm/vmscan.c | 18 +- mm/zbud.c | 2 +- mm/zsmalloc.c | 80 +- net/ipv4/tcp_memcontrol.c | 87 +- scripts/checkpatch.pl | 35 +- security/smack/smack_lsm.c | 13 +- usr/Kconfig | 24 +- 149 files changed, 3437 insertions(+), 2948 deletions(-) delete mode 100644 Documentation/cgroups/resource_counter.txt delete mode 100644 arch/powerpc/mm/gup.c create mode 100644 drivers/input/leds.c create mode 100644 include/linux/crc64_ecma.h create mode 100644 include/linux/page_counter.h delete mode 100644 include/linux/res_counter.h delete mode 100644 ipc/ipcns_notifier.c delete mode 100644 kernel/res_counter.c create mode 100644 lib/crc64_ecma.c create mode 100644 mm/page_counter.c $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git checkout -b akpm remotes/origin/akpm/master Switched to a new branch 'akpm' $ git rebase --onto master remotes/origin/akpm/master-base First, rewinding head to replay your work on top of it... Applying: drivers/gpio/gpio-zevio.c: fix build Applying: fat: add i_disksize to represent uninitialized size Applying: fat: add fat_fallocate operation Applying: fat: skip cluster allocation on fallocated region 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: mm: replace remap_file_pages() syscall with emulation Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + 5923519af8bc...a08b207c7b51 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (a08b207c7b51 mm: add strictlimit knob) $ git merge --no-ff akpm/master Removing mm/fremap.c Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-class-bdi | 8 + Documentation/filesystems/vfat.txt | 10 ++ Documentation/vm/remap_file_pages.txt | 7 +- drivers/gpio/gpio-zevio.c | 4 + drivers/w1/w1_int.c | 3 +- fs/fat/cache.c | 40 +++-- fs/fat/fat.h | 6 +- fs/fat/file.c | 82 ++++++++- fs/fat/inode.c | 79 ++++++++- include/linux/fs.h | 8 +- mm/Makefile | 2 +- mm/backing-dev.c | 35 ++++ mm/fremap.c | 283 ------------------------------ mm/mmap.c | 69 ++++++++ mm/nommu.c | 8 - 15 files changed, 325 insertions(+), 319 deletions(-) delete mode 100644 mm/fremap.c