$ date Tuesday 12 May 09:59:25 AEST 2015 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 030bbdbf4c83 Linux 4.1-rc3 Merging origin/master (4cfceaf0c087 Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux) $ git merge origin/master Updating 030bbdbf4c83..4cfceaf0c087 Fast-forward arch/arm64/crypto/crc32-arm64.c | 22 +- arch/arm64/crypto/sha1-ce-glue.c | 3 + arch/arm64/crypto/sha2-ce-glue.c | 3 + drivers/ata/Kconfig | 10 +- drivers/ata/Makefile | 1 - drivers/ata/ahci.c | 103 +++- drivers/ata/ahci_st.c | 49 +- drivers/ata/libahci.c | 3 +- drivers/ata/libata-core.c | 34 +- drivers/ata/libata-eh.c | 3 + drivers/ata/pata_scc.c | 1110 ------------------------------------- drivers/ide/Kconfig | 9 - drivers/ide/Makefile | 1 - drivers/ide/scc_pata.c | 887 ----------------------------- drivers/iommu/amd_iommu_v2.c | 1 + drivers/iommu/arm-smmu.c | 30 +- drivers/iommu/rockchip-iommu.c | 4 +- drivers/md/raid0.c | 5 +- drivers/md/raid5.c | 123 ++-- drivers/spi/Kconfig | 3 +- drivers/spi/spi-bcm2835.c | 5 +- drivers/spi/spi-bitbang.c | 17 +- drivers/spi/spi-fsl-cpm.c | 40 +- drivers/spi/spi-fsl-espi.c | 45 +- drivers/spi/spi-omap2-mcspi.c | 16 +- drivers/spi/spi.c | 9 + fs/nfsd/blocklayout.c | 11 + fs/nfsd/nfs4callback.c | 119 ++-- fs/nfsd/nfs4state.c | 147 ++++- fs/nfsd/state.h | 19 +- fs/nfsd/xdr4.h | 1 + include/linux/libata.h | 10 + net/sunrpc/auth_gss/gss_rpc_xdr.c | 23 +- 33 files changed, 586 insertions(+), 2280 deletions(-) delete mode 100644 drivers/ata/pata_scc.c delete mode 100644 drivers/ide/scc_pata.c 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 (c517d838eb7d Linux 4.0-rc1) $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) $ git merge arc-current/for-curr Already up-to-date. Merging arm-current/fixes (3b8786ff7a1b ARM: 8352/1: perf: Fix the pmu node name in warning message) $ git merge arm-current/fixes Already up-to-date. Merging m68k-current/for-linus (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization) $ git merge m68k-current/for-linus Already up-to-date. Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) $ 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-mpe/fixes (0aab3747091d powerpc/powernv: Restore non-volatile CRs after nap) $ git merge powerpc-merge-mpe/fixes Already up-to-date. Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1) $ git merge powerpc-merge/merge Already up-to-date. Merging sparc/master (acc455cffa75 sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly) $ git merge sparc/master Merge made by the 'recursive' strategy. arch/sparc/include/asm/cpudata_64.h | 3 +- arch/sparc/include/asm/topology_64.h | 3 +- arch/sparc/kernel/mdesc.c | 136 ++++++++++++++++++++++++++++------- arch/sparc/kernel/smp_64.c | 13 ++++ 4 files changed, 127 insertions(+), 28 deletions(-) Merging net/master (145a42b3a964 net_sched: gred: use correct backlog value in WRED mode) $ git merge net/master Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 5 +- arch/arm/net/bpf_jit_32.c | 42 ++- drivers/bluetooth/bt3c_cs.c | 3 - drivers/bluetooth/btbcm.c | 148 ++++---- drivers/bluetooth/btbcm.h | 6 + drivers/bluetooth/btusb.c | 403 ++++++++++++++++++++- drivers/bluetooth/hci_ath.c | 98 +++-- drivers/net/can/xilinx_can.c | 7 +- drivers/net/dsa/mv88e6xxx.c | 3 + drivers/net/ethernet/amd/Kconfig | 1 + drivers/net/ethernet/apm/xgene/Kconfig | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 10 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +- drivers/net/ethernet/cadence/macb.c | 11 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +- drivers/net/ethernet/intel/igb/igb_main.c | 4 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_port.c | 2 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 14 +- .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 4 +- drivers/net/ethernet/qualcomm/qca_spi.c | 4 +- drivers/net/ethernet/realtek/r8169.c | 4 +- drivers/net/ethernet/smsc/smc91x.c | 20 +- drivers/net/ethernet/smsc/smsc911x.c | 12 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 + drivers/net/hyperv/netvsc.c | 9 +- drivers/net/ieee802154/at86rf230.c | 390 ++++++++++---------- drivers/net/macvlan.c | 15 + drivers/net/phy/Kconfig | 1 + drivers/net/phy/mdio-gpio.c | 5 +- drivers/net/ppp/pppoe.c | 4 + drivers/net/usb/r8152.c | 1 + drivers/net/usb/usbnet.c | 4 +- drivers/net/wireless/ath/ath9k/xmit.c | 52 ++- drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 + drivers/net/wireless/iwlwifi/iwl-trans.h | 41 ++- drivers/net/wireless/iwlwifi/mvm/d3.c | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 34 ++ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 44 +-- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 13 - drivers/net/wireless/iwlwifi/mvm/fw.c | 54 ++- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 26 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 - drivers/net/wireless/iwlwifi/mvm/ops.c | 10 + drivers/net/wireless/iwlwifi/mvm/rx.c | 5 + drivers/net/wireless/iwlwifi/mvm/scan.c | 2 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 17 +- drivers/net/wireless/rtlwifi/usb.c | 2 +- include/linux/tcp.h | 8 + include/net/cfg802154.h | 2 + include/net/codel.h | 10 +- include/net/mac80211.h | 2 + include/net/mac802154.h | 94 ++++- include/net/tcp.h | 7 +- include/uapi/linux/inet_diag.h | 4 + include/uapi/linux/mpls.h | 10 + include/uapi/linux/tcp.h | 3 + net/bluetooth/hci_core.c | 3 +- net/core/dev.c | 2 +- net/core/sock.c | 2 +- net/ieee802154/Makefile | 4 +- net/ieee802154/nl-phy.c | 5 +- net/ieee802154/nl802154.c | 2 +- net/ieee802154/rdev-ops.h | 85 ++++- net/ieee802154/trace.c | 7 + net/ieee802154/trace.h | 247 +++++++++++++ net/ipv4/inet_diag.c | 8 +- net/ipv4/tcp.c | 28 +- net/ipv4/tcp_dctcp.c | 20 +- net/ipv4/tcp_fastopen.c | 1 + net/ipv4/tcp_illinois.c | 21 +- net/ipv4/tcp_input.c | 36 +- net/ipv4/tcp_vegas.c | 19 +- net/ipv4/tcp_vegas.h | 3 +- net/ipv4/tcp_westwood.c | 15 +- net/ipv6/ip6_output.c | 39 +- net/ipv6/route.c | 5 +- net/mac80211/iface.c | 12 +- net/mac80211/sta_info.c | 19 +- net/mac802154/cfg.c | 9 +- net/mac802154/ieee802154_i.h | 3 +- net/mac802154/iface.c | 5 +- net/mac802154/llsec.c | 4 +- net/mac802154/main.c | 7 +- net/mpls/af_mpls.c | 18 +- net/mpls/internal.h | 10 - net/netlink/af_netlink.c | 1 - net/packet/af_packet.c | 9 +- net/rds/connection.c | 17 +- net/rds/ib_cm.c | 13 +- net/rds/tcp_connect.c | 1 + net/rds/tcp_listen.c | 46 +++ net/sched/cls_api.c | 7 +- net/sched/sch_codel.c | 2 +- net/sched/sch_fq_codel.c | 2 +- net/sched/sch_gred.c | 4 +- 96 files changed, 1799 insertions(+), 634 deletions(-) create mode 100644 net/ieee802154/trace.c create mode 100644 net/ieee802154/trace.h Merging ipsec/master (bdddbf6996c0 xfrm: fix a race in xfrm_state_lookup_byspi) $ git merge ipsec/master Merge made by the 'recursive' strategy. net/xfrm/xfrm_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging sound-current/for-linus (2c674fac5b16 ALSA: hda/realtek - Add ALC298 alias name for Dell) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/pci/hda/patch_realtek.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Merging pci-current/for-linus (5ebe6afaf005 Linux 4.1-rc2) $ git merge pci-current/for-linus Already up-to-date. Merging wireless-drivers/master (f67382186489 ath9k: fix per-packet tx power configuration) $ git merge wireless-drivers/master Already up-to-date. Merging driver-core.current/driver-core-linus (030bbdbf4c83 Linux 4.1-rc3) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (1a48632ffed6 pty: Fix input race when closing) $ git merge tty.current/tty-linus Merge made by the 'recursive' strategy. Documentation/serial/tty.txt | 3 +++ drivers/tty/n_gsm.c | 5 ++--- drivers/tty/n_hdlc.c | 4 ++-- drivers/tty/n_tty.c | 22 +++++++++++++++++---- drivers/tty/pty.c | 5 +++-- drivers/tty/serial/amba-pl011.c | 5 ++++- drivers/tty/serial/earlycon.c | 9 ++------- drivers/tty/serial/omap-serial.c | 2 ++ drivers/tty/tty_buffer.c | 41 ++++++++++++++++++++++++++-------------- include/linux/tty.h | 2 +- 10 files changed, 64 insertions(+), 34 deletions(-) Merging usb.current/usb-linus (172115090f5e usb-storage: Add NO_WP_DETECT quirk for Lacie 059f:0651 devices) $ git merge usb.current/usb-linus Merge made by the 'recursive' strategy. drivers/usb/chipidea/debug.c | 6 +- drivers/usb/core/quirks.c | 3 + drivers/usb/dwc3/dwc3-omap.c | 94 +++++++++++++++--------------- drivers/usb/gadget/configfs.c | 1 + drivers/usb/gadget/function/f_hid.c | 16 ++++- drivers/usb/gadget/function/u_serial.c | 5 +- drivers/usb/gadget/legacy/acm_ms.c | 10 ++-- drivers/usb/gadget/legacy/audio.c | 10 ++-- drivers/usb/gadget/legacy/cdc2.c | 10 ++-- drivers/usb/gadget/legacy/dbgp.c | 4 +- drivers/usb/gadget/legacy/ether.c | 12 ++-- drivers/usb/gadget/legacy/g_ffs.c | 2 +- drivers/usb/gadget/legacy/gmidi.c | 10 ++-- drivers/usb/gadget/legacy/hid.c | 12 ++-- drivers/usb/gadget/legacy/mass_storage.c | 6 +- drivers/usb/gadget/legacy/multi.c | 10 ++-- drivers/usb/gadget/legacy/ncm.c | 10 ++-- drivers/usb/gadget/legacy/nokia.c | 10 ++-- drivers/usb/gadget/legacy/printer.c | 8 +-- drivers/usb/gadget/legacy/serial.c | 4 +- drivers/usb/gadget/legacy/tcm_usb_gadget.c | 2 +- drivers/usb/gadget/legacy/webcam.c | 8 +-- drivers/usb/gadget/legacy/zero.c | 4 +- drivers/usb/gadget/udc/at91_udc.c | 4 +- drivers/usb/gadget/udc/atmel_usba_udc.c | 4 +- drivers/usb/gadget/udc/fsl_udc_core.c | 4 +- drivers/usb/gadget/udc/fusb300_udc.c | 4 +- drivers/usb/gadget/udc/m66592-udc.c | 4 +- drivers/usb/gadget/udc/r8a66597-udc.c | 4 +- drivers/usb/gadget/udc/udc-xilinx.c | 4 +- drivers/usb/host/xhci-ring.c | 7 ++- drivers/usb/host/xhci.h | 2 +- drivers/usb/phy/phy-isp1301-omap.c | 2 +- drivers/usb/storage/unusual_devs.h | 7 +++ 34 files changed, 169 insertions(+), 134 deletions(-) Merging usb-gadget-fixes/fixes (c94e289f195e usb: gadget: remove incorrect __init/__exit annotations) $ git merge usb-gadget-fixes/fixes Already up-to-date. Merging usb-serial-fixes/usb-linus (82ee3aeb9295 USB: visor: Match I330 phone more precisely) $ git merge usb-serial-fixes/usb-linus Merge made by the 'recursive' strategy. drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/pl2303.c | 1 - drivers/usb/serial/pl2303.h | 4 ---- drivers/usb/serial/visor.c | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) Merging staging.current/staging-linus (892c89d5d7ff staging: gdm724x: Correction of variable usage after applying ALIGN()) $ git merge staging.current/staging-linus Merge made by the 'recursive' strategy. drivers/staging/gdm724x/gdm_mux.c | 16 +++++----- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 17 +++++------ drivers/staging/sm750fb/sm750.c | 2 +- drivers/staging/vt6655/card.c | 10 +++++-- drivers/staging/vt6655/card.h | 2 +- drivers/staging/vt6655/device_main.c | 42 ++++++++++++++++----------- drivers/staging/vt6656/rxtx.c | 14 +++++++-- 7 files changed, 59 insertions(+), 44 deletions(-) Merging char-misc.current/char-misc-linus (0f5b6ec67404 Merge tag 'extcon-fixes-for-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus) $ git merge char-misc.current/char-misc-linus Merge made by the 'recursive' strategy. drivers/extcon/extcon-usb-gpio.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) Merging input-current/for-linus (48853389f206 Merge branch 'next' into for-linus) $ git merge input-current/for-linus Already up-to-date. Merging crypto-current/master (ec59a65d694e crypto: arm64/sha2-ce - prevent asm code finalization in final() path) $ git merge crypto-current/master Already up-to-date. Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) $ git merge ide/master Already up-to-date. Merging devicetree-current/devicetree/merge (41d9489319f2 drivers/of: Add empty ranges quirk for PA-Semi) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging rr-fixes/fixes (f47689345931 lguest: update help text.) $ git merge rr-fixes/fixes Already up-to-date. Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) $ git merge vfio-fixes/for-linus Already up-to-date. Merging kselftest-fixes/fixes (b787f68c36d4 Linux 4.1-rc1) $ git merge kselftest-fixes/fixes Already up-to-date. Merging drm-intel-fixes/for-linux-next-fixes (364aece01a2d drm/i915: Avoid GPU hang when coming out of s3 or s4) $ git merge drm-intel-fixes/for-linux-next-fixes Merge made by the 'recursive' strategy. drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) $ git merge asm-generic/master Already up-to-date. Merging arc/for-next (b787f68c36d4 Linux 4.1-rc1) $ git merge arc/for-next Already up-to-date. Merging arm/for-next (b9254b93592a Merge branch 'bsym' into for-next) $ git merge arm/for-next Auto-merging arch/arm/mach-pxa/lubbock.c Merge made by the 'recursive' strategy. Documentation/devicetree/booting-without-of.txt | 4 + arch/arm/Kconfig | 17 ++- arch/arm/Makefile | 4 + arch/arm/boot/compressed/head.S | 4 +- arch/arm/common/mcpm_head.S | 2 +- arch/arm/include/asm/assembler.h | 17 ++- arch/arm/include/asm/entry-macro-multi.S | 4 +- arch/arm/include/asm/io.h | 52 +++++-- arch/arm/include/asm/mach/arch.h | 2 +- arch/arm/include/asm/memory.h | 16 --- arch/arm/include/asm/module.h | 12 +- arch/arm/include/asm/proc-fns.h | 7 - arch/arm/include/asm/smp.h | 2 +- arch/arm/include/asm/system_info.h | 1 + arch/arm/include/asm/unified.h | 2 - arch/arm/kernel/Makefile | 1 + arch/arm/kernel/entry-armv.S | 12 +- arch/arm/kernel/entry-common.S | 6 +- arch/arm/kernel/entry-ftrace.S | 2 +- arch/arm/kernel/entry-v7m.S | 13 +- arch/arm/kernel/head-nommu.S | 8 +- arch/arm/kernel/head.S | 50 +++++-- arch/arm/kernel/module-plts.c | 181 ++++++++++++++++++++++++ arch/arm/kernel/module.c | 32 ++++- arch/arm/kernel/module.lds | 4 + arch/arm/kernel/setup.c | 30 +++- arch/arm/kernel/sleep.S | 2 +- arch/arm/kernel/smp.c | 10 +- arch/arm/kvm/interrupts.S | 2 +- arch/arm/lib/call_with_stack.S | 2 +- arch/arm/mach-davinci/da850.c | 1 + arch/arm/mach-keystone/keystone.c | 41 +++--- arch/arm/mach-keystone/platsmp.c | 13 -- arch/arm/mach-lpc32xx/clock.c | 5 +- arch/arm/mach-omap1/board-nokia770.c | 2 +- arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 12 +- arch/arm/mach-omap2/omap_device.c | 24 ++-- arch/arm/mach-pxa/eseries.c | 1 + arch/arm/mach-pxa/lubbock.c | 1 + arch/arm/mach-pxa/tosa.c | 1 + arch/arm/mach-sa1100/irq.c | 2 +- arch/arm/mm/Kconfig | 19 +++ arch/arm/mm/Makefile | 1 + arch/arm/mm/mmu.c | 153 +++++++++----------- arch/arm/mm/nommu.c | 9 -- arch/arm/mm/proc-v7-2level.S | 12 +- arch/arm/mm/proc-v7-3level.S | 14 +- arch/arm/mm/proc-v7.S | 26 ++-- arch/arm/mm/proc-v7m.S | 2 +- arch/arm/mm/pv-fixup-asm.S | 88 ++++++++++++ arch/arm/plat-orion/common.c | 6 +- arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 3 +- arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 4 +- arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 4 +- arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 4 +- arch/sh/kernel/cpu/sh4a/clock-shx3.c | 4 +- drivers/clk/clk-s2mps11.c | 4 +- drivers/clk/clkdev.c | 83 ++++++++--- include/linux/clk.h | 27 ++-- include/linux/clkdev.h | 6 +- sound/soc/sh/migor.c | 3 +- 61 files changed, 729 insertions(+), 347 deletions(-) create mode 100644 arch/arm/kernel/module-plts.c create mode 100644 arch/arm/kernel/module.lds create mode 100644 arch/arm/mm/pv-fixup-asm.S Merging arm-perf/for-next/perf (b787f68c36d4 Linux 4.1-rc1) $ git merge arm-perf/for-next/perf Already up-to-date. Merging arm-soc/for-next (dc0e3db4ec7c ARM: multi_v7_defconfig: Select more FSL SoCs) $ git merge arm-soc/for-next Already up-to-date. Merging at91/at91-next (3c6a00e39213 Merge branch 'at91-4.2-dt' into at91-next) $ git merge at91/at91-next Removing arch/arm/boot/dts/kizbox.dts Merge made by the 'recursive' strategy. arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/at91-kizbox.dts | 159 ++++++++++++++++++++ arch/arm/boot/dts/at91-kizbox2.dts | 216 ++++++++++++++++++++++++++++ arch/arm/boot/dts/at91-kizboxmini.dts | 129 +++++++++++++++++ arch/arm/boot/dts/at91-sama5d3_xplained.dts | 6 - arch/arm/boot/dts/at91sam9rlek.dts | 6 - arch/arm/boot/dts/at91sam9x5.dtsi | 46 ++++++ arch/arm/boot/dts/kizbox.dts | 150 ------------------- arch/arm/boot/dts/sama5d3xcm.dtsi | 6 - arch/arm/boot/dts/sama5d4.dtsi | 124 ++++++++++++++++ 10 files changed, 677 insertions(+), 169 deletions(-) create mode 100644 arch/arm/boot/dts/at91-kizbox.dts create mode 100644 arch/arm/boot/dts/at91-kizbox2.dts create mode 100644 arch/arm/boot/dts/at91-kizboxmini.dts delete mode 100644 arch/arm/boot/dts/kizbox.dts Merging bcm2835/for-next (b2776bf7149b Linux 3.18) $ git merge bcm2835/for-next Already up-to-date. Merging rpi/for-rpi-next (31fd7fe00b0d ARM: bcm2835: Drop the init_irq() hook) $ git merge rpi/for-rpi-next Merge made by the 'recursive' strategy. .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 31 ++++++++++++++++++++-- .../devicetree/bindings/vendor-prefixes.txt | 1 + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +-- arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 +-- arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +++--- arch/arm/boot/dts/bcm2835.dtsi | 5 ++-- arch/arm/mach-bcm/board_bcm2835.c | 18 ------------- include/dt-bindings/pinctrl/bcm2835.h | 27 +++++++++++++++++++ 8 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 include/dt-bindings/pinctrl/bcm2835.h Merging berlin/berlin/for-next (4412971984ea Merge branches 'berlin/soc', 'berlin/driver' and 'berlin/dt' into berlin/for-next) $ git merge berlin/berlin/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/arm/marvell,berlin.txt | 100 +++---------- .../devicetree/bindings/clock/marvell,berlin.txt | 31 +++++ .../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 43 ++++++ .../devicetree/bindings/reset/berlin,reset.txt | 23 +++ arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 34 ++++- arch/arm/boot/dts/berlin2.dtsi | 125 +++++++++++------ arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 34 ++++- arch/arm/boot/dts/berlin2cd.dtsi | 103 ++++++++++---- arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 34 ++++- arch/arm/boot/dts/berlin2q.dtsi | 155 +++++++++++++-------- arch/arm/mach-berlin/Kconfig | 1 + drivers/clk/berlin/bg2.c | 7 +- drivers/clk/berlin/bg2q.c | 7 +- drivers/pinctrl/berlin/berlin-bg2.c | 26 +--- drivers/pinctrl/berlin/berlin-bg2cd.c | 26 +--- drivers/pinctrl/berlin/berlin-bg2q.c | 26 +--- drivers/pinctrl/berlin/berlin.c | 9 +- drivers/reset/reset-berlin.c | 71 ++++------ 18 files changed, 518 insertions(+), 337 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/marvell,berlin.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt create mode 100644 Documentation/devicetree/bindings/reset/berlin,reset.txt Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) $ git merge cortex-m/for-next Merge made by the 'recursive' strategy. Merging imx-mxs/for-next (6aa6ad8384fb Merge branch 'imx/defconfig' into for-next) $ git merge imx-mxs/for-next Auto-merging drivers/clk/imx/clk.h Auto-merging drivers/clk/imx/clk-pllv3.c Auto-merging drivers/clk/imx/clk-pllv1.c Auto-merging drivers/clk/imx/clk-imx6sx.c Auto-merging drivers/clk/imx/clk-imx6sl.c Auto-merging drivers/clk/imx/clk-imx6q.c Auto-merging drivers/clk/imx/clk-imx51-imx53.c Auto-merging drivers/clk/imx/clk-imx35.c Auto-merging drivers/clk/imx/clk-imx31.c Auto-merging drivers/clk/imx/clk-imx27.c Auto-merging drivers/clk/imx/clk-imx25.c Auto-merging drivers/clk/imx/clk-imx21.c Auto-merging drivers/clk/imx/clk-imx1.c Auto-merging drivers/clk/imx/clk-cpu.c Removing arch/arm/mach-imx/mach-cpuimx35.c Removing arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c Auto-merging arch/arm/boot/dts/Makefile Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/clock/imx7d-clock.txt | 13 + .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 27 + MAINTAINERS | 2 + arch/arm/Kconfig.debug | 13 +- arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/imx23-olinuxino.dts | 6 + arch/arm/boot/dts/imx23.dtsi | 40 +- arch/arm/boot/dts/imx28-cfa10036.dts | 3 + arch/arm/boot/dts/imx28-evk.dts | 2 +- arch/arm/boot/dts/imx28-m28evk.dts | 2 +- arch/arm/boot/dts/imx28-sps1.dts | 2 +- arch/arm/boot/dts/imx50-evk.dts | 2 +- arch/arm/boot/dts/imx53-smd.dts | 2 +- arch/arm/boot/dts/imx6dl-gw551x.dts | 55 ++ arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +- arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- arch/arm/boot/dts/imx6q-gw551x.dts | 55 ++ arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +- arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 314 ++++++ arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 14 +- arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- arch/arm/boot/dts/imx6qdl.dtsi | 57 +- arch/arm/boot/dts/imx6sl-evk.dts | 2 +- arch/arm/boot/dts/imx6sl-warp.dts | 39 +- arch/arm/boot/dts/imx7d-pinfunc.h | 1038 ++++++++++++++++++++ arch/arm/configs/imx_v6_v7_defconfig | 3 + arch/arm/include/debug/imx-uart.h | 15 +- arch/arm/mach-imx/Kconfig | 41 +- arch/arm/mach-imx/Makefile | 30 +- arch/arm/mach-imx/anatop.c | 5 +- arch/arm/mach-imx/common.h | 11 +- arch/arm/mach-imx/cpu.c | 3 + arch/arm/mach-imx/cpuidle-imx6q.c | 4 +- arch/arm/mach-imx/cpuidle-imx6sl.c | 4 +- arch/arm/mach-imx/cpuidle-imx6sx.c | 4 +- arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 318 ------ arch/arm/mach-imx/gpc.c | 3 +- arch/arm/mach-imx/hardware.h | 1 + arch/arm/mach-imx/mach-cpuimx35.c | 206 ---- arch/arm/mach-imx/mach-imx6q.c | 1 + arch/arm/mach-imx/mach-imx6sl.c | 1 + arch/arm/mach-imx/mach-imx6sx.c | 1 + arch/arm/mach-imx/mach-imx7d.c | 43 + arch/arm/mach-imx/mmdc.c | 2 + arch/arm/mach-imx/mx27.h | 4 - arch/arm/mach-imx/mx3x.h | 7 - arch/arm/mach-imx/mxc.h | 24 +- arch/arm/mach-imx/pm-imx5.c | 9 +- arch/arm/mach-imx/pm-imx6.c | 38 +- arch/arm/mach-imx/time.c | 13 +- drivers/clk/Makefile | 1 + drivers/clk/imx/Makefile | 25 + {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c | 0 {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c | 1 + .../mach-imx => drivers/clk/imx}/clk-fixup-div.c | 0 .../mach-imx => drivers/clk/imx}/clk-fixup-mux.c | 0 .../clk/imx}/clk-gate-exclusive.c | 0 {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c | 0 {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c | 16 +- {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c | 13 +- {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c | 6 +- {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c | 14 +- {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c | 34 +- {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c | 35 +- .../mach-imx => drivers/clk/imx}/clk-imx51-imx53.c | 5 +- {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c | 34 +- .../arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c | 7 - .../arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c | 6 - {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c | 0 {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c | 33 +- {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c | 0 {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c | 4 +- {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c | 0 {arch/arm/mach-imx => drivers/clk/imx}/clk.c | 0 {arch/arm/mach-imx => drivers/clk/imx}/clk.h | 20 +- include/soc/imx/revision.h | 37 + 83 files changed, 1977 insertions(+), 817 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/imx7d-clock.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt create mode 100644 arch/arm/boot/dts/imx6dl-gw551x.dts create mode 100644 arch/arm/boot/dts/imx6q-gw551x.dts create mode 100644 arch/arm/boot/dts/imx6qdl-gw551x.dtsi create mode 100644 arch/arm/boot/dts/imx7d-pinfunc.h delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c delete mode 100644 arch/arm/mach-imx/mach-cpuimx35.c create mode 100644 arch/arm/mach-imx/mach-imx7d.c create mode 100644 drivers/clk/imx/Makefile rename {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c (99%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-div.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-mux.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate-exclusive.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c (92%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c (96%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c (98%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c (97%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c (92%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c (94%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx51-imx53.c (99%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c (98%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c (99%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c (99%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c (75%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c (99%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk.c (100%) rename {arch/arm/mach-imx => drivers/clk/imx}/clk.h (89%) create mode 100644 include/soc/imx/revision.h Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size) $ git merge keystone/next Merge made by the 'recursive' strategy. arch/arm/boot/dts/k2e-evm.dts | 1 + arch/arm/boot/dts/k2e-netcp.dtsi | 206 +++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/k2e.dtsi | 1 + arch/arm/boot/dts/k2hk-evm.dts | 1 + arch/arm/boot/dts/k2hk-netcp.dtsi | 208 ++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/k2hk.dtsi | 1 + arch/arm/boot/dts/k2l-evm.dts | 1 + arch/arm/boot/dts/k2l-netcp.dtsi | 189 ++++++++++++++++++++++++++++++++ arch/arm/boot/dts/k2l.dtsi | 1 + arch/arm/configs/keystone_defconfig | 6 ++ 10 files changed, 615 insertions(+) create mode 100644 arch/arm/boot/dts/k2e-netcp.dtsi create mode 100644 arch/arm/boot/dts/k2hk-netcp.dtsi create mode 100644 arch/arm/boot/dts/k2l-netcp.dtsi Merging mvebu/for-next (689bc92a6492 Merge branch 'mvebu/dt' into mvebu/for-next) $ git merge mvebu/for-next Removing arch/arm/boot/dts/dove-cm-a510.dts Auto-merging arch/arm/boot/dts/Makefile Merge made by the 'recursive' strategy. arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/armada-375.dtsi | 2 +- arch/arm/boot/dts/armada-38x.dtsi | 4 +- arch/arm/boot/dts/armada-39x.dtsi | 2 +- arch/arm/boot/dts/dove-cm-a510.dts | 38 ------- arch/arm/boot/dts/dove-cm-a510.dtsi | 195 ++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/dove-cubox.dts | 1 + arch/arm/boot/dts/dove-sbc-a510.dts | 182 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/dove.dtsi | 40 +++++++- 9 files changed, 422 insertions(+), 46 deletions(-) delete mode 100644 arch/arm/boot/dts/dove-cm-a510.dts create mode 100644 arch/arm/boot/dts/dove-cm-a510.dtsi create mode 100644 arch/arm/boot/dts/dove-sbc-a510.dts Merging omap/for-next (8be7646999c7 Merge tag 'omap-for-v4.1/fixes-rc2' into for-next) $ git merge omap/for-next Merge made by the 'recursive' strategy. arch/arm/mach-omap2/omap_hwmod.c | 68 ++++++----------------------- arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 70 ++++++++++++++++++++++++++++++ arch/arm/mach-omap2/prcm43xx.h | 3 +- arch/arm/mach-omap2/prminst44xx.c | 20 +++------ arch/arm/mach-omap2/timer.c | 13 +++--- 5 files changed, 98 insertions(+), 76 deletions(-) Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) $ git merge omap-pending/for-next Recorded preimage for 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c'. [master 425d291bb8dd] Merge remote-tracking branch 'omap-pending/for-next' $ git diff -M --stat --summary HEAD^.. Merging renesas/next (6566c61b01eb Merge branch 'heads/dt-for-v4.2' into next) $ git merge renesas/next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +- arch/arm/boot/dts/emev2-kzm9d.dts | 4 ++-- arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- arch/arm/boot/dts/r8a73a4.dtsi | 11 +++++++---- arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- arch/arm/boot/dts/r8a7740.dtsi | 10 +++++----- arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +- arch/arm/boot/dts/r8a7778-bockw.dts | 4 ++-- arch/arm/boot/dts/r8a7778.dtsi | 2 +- arch/arm/boot/dts/r8a7779-marzen.dts | 6 +++--- arch/arm/boot/dts/r8a7779.dtsi | 2 +- arch/arm/boot/dts/r8a7790-lager.dts | 4 ++-- arch/arm/boot/dts/r8a7790.dtsi | 19 ++++++++++++++----- arch/arm/boot/dts/r8a7791-henninger.dts | 2 +- arch/arm/boot/dts/r8a7791-koelsch.dts | 4 ++-- arch/arm/boot/dts/r8a7791.dtsi | 17 +++++++++++++---- arch/arm/boot/dts/r8a7794.dtsi | 9 +++++++++ arch/arm/boot/dts/sh73a0-kzm9g.dts | 1 + arch/arm/boot/dts/sh73a0.dtsi | 10 +++++----- arch/arm/configs/shmobile_defconfig | 4 ++-- include/dt-bindings/clock/r8a73a4-clock.h | 1 + include/dt-bindings/clock/r8a7790-clock.h | 3 +++ include/dt-bindings/clock/r8a7791-clock.h | 3 +++ include/dt-bindings/clock/r8a7794-clock.h | 3 +++ 24 files changed, 84 insertions(+), 43 deletions(-) Merging samsung/for-next (77b0ffdc4bbd Merge branch 'v4.2-next/dt-samsung' into for-next) $ git merge samsung/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/arm/samsung/pmu.txt | 1 + arch/arm/boot/dts/exynos3250.dtsi | 13 + arch/arm/boot/dts/exynos5250-smdk5250.dts | 12 + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 29 +- arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 +++++++++++++++ .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 + arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 231 +++++ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 931 +++++++++++++++++++++ 8 files changed, 1935 insertions(+), 2 deletions(-) create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi Merging sunxi/sunxi/for-next (a426b3379698 Merge branch 'sunxi/dt-for-4.2' into sunxi/for-next) $ git merge sunxi/sunxi/for-next Auto-merging arch/arm/configs/multi_v7_defconfig Auto-merging arch/arm/boot/dts/Makefile Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/arm/cpus.txt | 1 + .../devicetree/bindings/soc/sunxi/sram.txt | 64 ++ .../devicetree/bindings/vendor-prefixes.txt | 2 + arch/arm/boot/dts/Makefile | 23 +- arch/arm/boot/dts/axp209.dtsi | 5 - arch/arm/boot/dts/sun4i-a10-a1000.dts | 207 +++---- arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 181 +++--- arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 40 +- arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 222 +++---- arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 171 ++++++ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 196 +++---- arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 13 +- arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 123 ++-- arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 189 ++++++ arch/arm/boot/dts/sun4i-a10-marsboard.dts | 16 +- arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 149 +++-- arch/arm/boot/dts/sun4i-a10-mk802.dts | 13 +- arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 13 +- arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 224 ++++--- arch/arm/boot/dts/sun4i-a10-pcduino.dts | 185 +++--- arch/arm/boot/dts/sun4i-a10.dtsi | 163 +++++- arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 154 +++++ arch/arm/boot/dts/sun5i-a10s-mk802.dts | 13 +- arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 324 ++++++----- arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 139 ++--- arch/arm/boot/dts/sun5i-a10s.dtsi | 642 +++------------------ arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 143 +++-- arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 155 +++-- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 245 ++++---- arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 226 ++++++++ arch/arm/boot/dts/sun5i-a13.dtsi | 608 +++---------------- arch/arm/boot/dts/sun5i.dtsi | 613 ++++++++++++++++++++ arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 63 +- arch/arm/boot/dts/sun6i-a31-colombus.dts | 145 +++-- arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 108 +++- arch/arm/boot/dts/sun6i-a31-i7.dts | 149 +++++ arch/arm/boot/dts/sun6i-a31-m9.dts | 159 +++-- arch/arm/boot/dts/sun6i-a31.dtsi | 133 ++++- arch/arm/boot/dts/sun6i-a31s-cs908.dts | 48 +- arch/arm/boot/dts/sun6i-a31s.dtsi | 5 - arch/arm/boot/dts/sun7i-a20-bananapi.dts | 271 +++++---- arch/arm/boot/dts/sun7i-a20-bananapro.dts | 21 +- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 205 +++---- arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 331 +++++------ arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 426 +++++++------- arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 267 ++++----- arch/arm/boot/dts/sun7i-a20-m3.dts | 191 +++--- arch/arm/boot/dts/sun7i-a20-mk808c.dts | 148 +++++ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 197 +++---- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 301 +++++----- arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 411 +++++++------ arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 250 ++++++++ arch/arm/boot/dts/sun7i-a20-orangepi.dts | 228 ++++++++ arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 194 +++++++ arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 217 +++---- arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 183 ++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 186 ++++-- arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts | 5 - arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 117 ++-- arch/arm/boot/dts/sun8i-a23.dtsi | 33 +- arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 99 ++++ arch/arm/boot/dts/sun9i-a80-optimus.dts | 72 ++- arch/arm/boot/dts/sun9i-a80.dtsi | 139 ++++- arch/arm/boot/dts/sunxi-common-regulators.dtsi | 5 - arch/arm/configs/multi_v7_defconfig | 1 - arch/arm/configs/sunxi_defconfig | 6 +- arch/arm/mach-sunxi/platsmp.c | 69 +++ drivers/clk/sunxi/clk-sun9i-core.c | 10 +- drivers/clk/sunxi/clk-sunxi.c | 2 + drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/sunxi/Kconfig | 10 + drivers/soc/sunxi/Makefile | 1 + drivers/soc/sunxi/sunxi_sram.c | 236 ++++++++ include/linux/soc/sunxi/sunxi_sram.h | 24 + 75 files changed, 6972 insertions(+), 4158 deletions(-) create mode 100644 Documentation/devicetree/bindings/soc/sunxi/sram.txt create mode 100644 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts create mode 100644 arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts create mode 100644 arch/arm/boot/dts/sun5i-a13-utoo-p66.dts create mode 100644 arch/arm/boot/dts/sun5i.dtsi create mode 100644 arch/arm/boot/dts/sun6i-a31-i7.dts create mode 100644 arch/arm/boot/dts/sun7i-a20-mk808c.dts create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi.dts create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts create mode 100644 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts create mode 100644 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts create mode 100644 drivers/soc/sunxi/Kconfig create mode 100644 drivers/soc/sunxi/Makefile create mode 100644 drivers/soc/sunxi/sunxi_sram.c create mode 100644 include/linux/soc/sunxi/sunxi_sram.h Merging tegra/for-next (4fd17a726126 Merge branch for-4.2/defconfig into for-next) $ git merge tegra/for-next Merge made by the 'recursive' strategy. .../bindings/clock/nvidia,tegra124-car.txt | 44 +- .../bindings/fuse/nvidia,tegra20-fuse.txt | 2 +- .../memory-controllers/nvidia,tegra-mc.txt | 84 +- .../bindings/memory-controllers/tegra-emc.txt | 374 +++++++ .../bindings/misc/nvidia,tegra20-apbmisc.txt | 2 + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 + arch/arm/boot/dts/tegra124-venice2.dts | 3 + arch/arm/boot/dts/tegra124.dtsi | 14 +- arch/arm/boot/dts/tegra20-seaboard.dts | 12 + arch/arm/boot/dts/tegra20.dtsi | 2 +- arch/arm/boot/dts/tegra30-cardhu.dtsi | 30 +- arch/arm/boot/dts/tegra30.dtsi | 15 + arch/arm/configs/tegra_defconfig | 10 + arch/arm/mach-tegra/cpuidle-tegra20.c | 5 +- arch/arm/mach-tegra/reset-handler.S | 10 +- arch/arm/mach-tegra/reset.h | 4 + arch/arm/mach-tegra/sleep-tegra20.S | 37 +- arch/arm/mach-tegra/sleep-tegra30.S | 2 +- arch/arm/mach-tegra/sleep.h | 4 + arch/arm/mach-tegra/tegra.c | 1 - drivers/clk/Kconfig | 1 + drivers/clk/clk.c | 8 + drivers/clk/tegra/Kconfig | 3 + drivers/clk/tegra/Makefile | 1 + drivers/clk/tegra/clk-emc.c | 538 +++++++++ drivers/clk/tegra/clk-tegra124.c | 19 +- drivers/clk/tegra/clk-tegra30.c | 2 +- drivers/clk/tegra/clk.h | 12 + drivers/iommu/Kconfig | 2 +- drivers/iommu/tegra-smmu.c | 109 ++ drivers/memory/tegra/Kconfig | 10 + drivers/memory/tegra/Makefile | 3 + drivers/memory/tegra/mc.c | 143 ++- drivers/memory/tegra/mc.h | 4 + drivers/memory/tegra/tegra114.c | 32 +- drivers/memory/tegra/tegra124-emc.c | 1140 ++++++++++++++++++++ drivers/memory/tegra/tegra124.c | 123 ++- drivers/memory/tegra/tegra30.c | 32 +- drivers/soc/tegra/fuse/fuse-tegra20.c | 6 +- drivers/soc/tegra/fuse/tegra-apbmisc.c | 21 + drivers/soc/tegra/pmc.c | 23 +- include/linux/clk-provider.h | 1 + include/soc/tegra/emc.h | 19 + include/soc/tegra/fuse.h | 1 + include/soc/tegra/mc.h | 20 +- include/soc/tegra/pmc.h | 2 - 46 files changed, 2813 insertions(+), 121 deletions(-) create mode 100644 Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt create mode 100644 drivers/clk/tegra/Kconfig create mode 100644 drivers/clk/tegra/clk-emc.c create mode 100644 drivers/memory/tegra/tegra124-emc.c create mode 100644 include/soc/tegra/emc.h Merging arm64/for-next/core (6d1966dfd6e0 arm64: fix midr range for Cortex-A57 erratum 832075) $ git merge arm64/for-next/core Already up-to-date. Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) $ git merge blackfin/for-linus Already up-to-date. Merging c6x/for-linux-next (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback) $ git merge c6x/for-linux-next Already up-to-date. Merging cris/for-next (f5691735f6cd cris: arch-v32: gpio: Use kzalloc instead of kmalloc/memset) $ git merge cris/for-next Merge made by the 'recursive' strategy. arch/cris/arch-v32/drivers/mach-fs/gpio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) $ git merge hexagon/linux-next Already up-to-date. Merging ia64/next (62f269ef8191 pstore: Fix the ramoops module parameters update) $ git merge ia64/next Already up-to-date. Merging m68k/for-next (2b8520f1f256 m68k: Use for_each_sg()) $ git merge m68k/for-next Merge made by the 'recursive' strategy. arch/m68k/configs/amiga_defconfig | 9 +++++++-- arch/m68k/configs/apollo_defconfig | 9 +++++++-- arch/m68k/configs/atari_defconfig | 9 +++++++-- arch/m68k/configs/bvme6000_defconfig | 9 +++++++-- arch/m68k/configs/hp300_defconfig | 9 +++++++-- arch/m68k/configs/mac_defconfig | 9 +++++++-- arch/m68k/configs/multi_defconfig | 9 +++++++-- arch/m68k/configs/mvme147_defconfig | 9 +++++++-- arch/m68k/configs/mvme16x_defconfig | 9 +++++++-- arch/m68k/configs/q40_defconfig | 9 +++++++-- arch/m68k/configs/sun3_defconfig | 9 +++++++-- arch/m68k/configs/sun3x_defconfig | 9 +++++++-- arch/m68k/kernel/dma.c | 19 ++++++++++++------- 13 files changed, 96 insertions(+), 31 deletions(-) Merging m68knommu/for-next (030bbdbf4c83 Linux 4.1-rc3) $ git merge m68knommu/for-next Already up-to-date. Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg') $ git merge metag/for-next Already up-to-date. Merging microblaze/next (c2219eda5478 microblaze: Fix syscall error recovery for invalid syscall IDs) $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next (3e20a26b02bd Merge branch '4.0-fixes' into mips-for-linux-next) $ git merge mips/mips-for-linux-next Already up-to-date. Merging nios2/nios2-next (1a70db49a735 nios2: rework cache) $ git merge nios2/nios2-next Already up-to-date. Merging parisc-hd/for-next (5fec97d0e3d9 parisc: copy_thread(): rename 'arg' argument to 'kthread_arg') $ git merge parisc-hd/for-next Merge made by the 'recursive' strategy. arch/parisc/kernel/process.c | 10 ++++++---- drivers/parisc/superio.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) Merging powerpc-mpe/next (b787f68c36d4 Linux 4.1-rc1) $ git merge powerpc-mpe/next Already up-to-date. Merging powerpc/next (65e7bb2a34fe Merge branch 'next-sriov' into next) $ git merge powerpc/next Already up-to-date! Merge made by the 'recursive' strategy. Merging fsl/next (d41444daba1f powerpc/corenet: enable CONFIG_I2C_MUX and CONFIG_I2C_MUX_PCA954x) $ 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 (6f469dae3aac zcrypt: fixed ap poll timer behavior) $ git merge s390/features Merge made by the 'recursive' strategy. arch/s390/net/bpf_jit_comp.c | 14 ++++++-------- drivers/s390/crypto/ap_bus.c | 16 +++++++--------- 2 files changed, 13 insertions(+), 17 deletions(-) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) $ git merge sparc-next/master Already up-to-date. Merging tile/master (47ad7b9bbeaa tile: improve stack backtrace) $ git merge tile/master Auto-merging arch/tile/kernel/setup.c Merge made by the 'recursive' strategy. arch/tile/Kconfig | 3 + arch/tile/include/asm/irq.h | 5 ++ arch/tile/include/asm/processor.h | 2 - arch/tile/include/asm/spinlock_32.h | 6 +- arch/tile/include/asm/spinlock_64.h | 5 +- arch/tile/include/asm/stack.h | 13 ++-- arch/tile/include/asm/thread_info.h | 1 + arch/tile/include/asm/traps.h | 8 ++ arch/tile/include/asm/uaccess.h | 66 +++------------- arch/tile/include/asm/word-at-a-time.h | 36 +++++++++ arch/tile/include/hv/hypervisor.h | 60 +++++++++++++- arch/tile/kernel/entry.S | 7 -- arch/tile/kernel/hvglue.S | 3 +- arch/tile/kernel/hvglue_trace.c | 4 + arch/tile/kernel/intvec_64.S | 6 ++ arch/tile/kernel/process.c | 138 +++++++++++++++++++++++++++++---- arch/tile/kernel/setup.c | 2 +- arch/tile/kernel/stack.c | 125 +++++++++++++++++------------ arch/tile/kernel/traps.c | 15 ++++ arch/tile/lib/exports.c | 3 - arch/tile/lib/spinlock_32.c | 11 ++- arch/tile/lib/spinlock_64.c | 11 ++- arch/tile/lib/usercopy_32.S | 46 ----------- arch/tile/lib/usercopy_64.S | 46 ----------- drivers/tty/hvc/hvc_tile.c | 3 +- 25 files changed, 384 insertions(+), 241 deletions(-) create mode 100644 arch/tile/include/asm/word-at-a-time.h Merging uml/linux-next (fe205bdd1321 um: Print minimum physical memory requirement) $ git merge uml/linux-next Already up-to-date. Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/for_next (06a631433460 xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs()) $ git merge xtensa/for_next Merge made by the 'recursive' strategy. arch/xtensa/include/asm/dma-mapping.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) Merging btrfs/next (e082f56313f3 btrfs: quota: Update quota tree after qgroup relationship change.) $ git merge btrfs/next Already up-to-date. Merging ceph/master (84b54fefaa05 libceph: announce support for straw2 buckets) $ git merge ceph/master Merge made by the 'recursive' strategy. Merging cifs/for-next (bc8ebdc4f54c Fix that several functions handle incorrect value of mapchars) $ git merge cifs/for-next Merge made by the 'recursive' strategy. fs/cifs/cifs_dfs_ref.c | 3 ++- fs/cifs/cifsfs.c | 2 ++ fs/cifs/cifsproto.h | 4 ++-- fs/cifs/cifssmb.c | 21 +++++++++++---------- fs/cifs/dir.c | 3 +-- fs/cifs/file.c | 3 +-- fs/cifs/inode.c | 6 ++---- fs/cifs/link.c | 3 ++- fs/cifs/readdir.c | 2 ++ fs/cifs/smb1ops.c | 3 ++- 10 files changed, 27 insertions(+), 23 deletions(-) Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through) $ git merge ecryptfs/next Already up-to-date. Merging ext3/for_next (3adc12e96482 udf: Update ctime and mtime when directory is modified) $ git merge ext3/for_next Already up-to-date. Merging ext4/dev (fd64e6fd4575 ext4 crypto: reorganize how we store keys in the inode) $ git merge ext4/dev Merge made by the 'recursive' strategy. fs/ext4/crypto.c | 19 +- fs/ext4/crypto_fname.c | 502 ++++++++++++++---------------------------------- fs/ext4/crypto_key.c | 87 ++++++--- fs/ext4/crypto_policy.c | 76 ++++---- fs/ext4/dir.c | 24 ++- fs/ext4/ext4.h | 107 +++++++---- fs/ext4/ext4_crypto.h | 31 +-- fs/ext4/file.c | 4 +- fs/ext4/inline.c | 31 ++- fs/ext4/namei.c | 340 ++++++++++++-------------------- fs/ext4/super.c | 7 +- fs/ext4/symlink.c | 16 +- 12 files changed, 515 insertions(+), 729 deletions(-) Merging f2fs/dev (e592bac1339b f2fs crypto: remove checking key context during lookup) $ git merge f2fs/dev Merge made by the 'recursive' strategy. fs/f2fs/Kconfig | 18 ++ fs/f2fs/Makefile | 2 + fs/f2fs/acl.c | 48 ++-- fs/f2fs/checkpoint.c | 27 +- fs/f2fs/crypto.c | 563 ++++++++++++++++++++++++++++++++++++++++ fs/f2fs/crypto_fname.c | 490 +++++++++++++++++++++++++++++++++++ fs/f2fs/crypto_key.c | 200 ++++++++++++++ fs/f2fs/crypto_policy.c | 206 +++++++++++++++ fs/f2fs/data.c | 618 +++++++++++++++++++++++++++++++++----------- fs/f2fs/debug.c | 5 +- fs/f2fs/dir.c | 191 +++++++++----- fs/f2fs/f2fs.h | 321 +++++++++++++++++++++-- fs/f2fs/f2fs_crypto.h | 150 +++++++++++ fs/f2fs/file.c | 411 +++++++++++++++++++++++++++-- fs/f2fs/gc.c | 104 +++++++- fs/f2fs/hash.c | 3 +- fs/f2fs/inline.c | 43 ++- fs/f2fs/namei.c | 217 +++++++++++++--- fs/f2fs/node.c | 48 ++-- fs/f2fs/node.h | 22 -- fs/f2fs/recovery.c | 21 +- fs/f2fs/segment.c | 155 +++++++---- fs/f2fs/segment.h | 1 + fs/f2fs/super.c | 45 +++- fs/f2fs/trace.c | 6 +- fs/f2fs/trace.h | 4 +- fs/f2fs/xattr.c | 3 + fs/f2fs/xattr.h | 4 + include/linux/f2fs_fs.h | 8 + include/trace/events/f2fs.h | 33 ++- 30 files changed, 3491 insertions(+), 476 deletions(-) create mode 100644 fs/f2fs/crypto.c create mode 100644 fs/f2fs/crypto_fname.c create mode 100644 fs/f2fs/crypto_key.c create mode 100644 fs/f2fs/crypto_policy.c create mode 100644 fs/f2fs/f2fs_crypto.h Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) $ git merge fscache/fscache Auto-merging fs/cachefiles/namei.c Merge made by the 'recursive' strategy. Documentation/filesystems/caching/backend-api.txt | 23 ++ Documentation/filesystems/caching/fscache.txt | 7 +- fs/cachefiles/internal.h | 1 - fs/cachefiles/namei.c | 33 ++- fs/fscache/cookie.c | 8 +- fs/fscache/internal.h | 12 +- fs/fscache/netfs.c | 38 ++-- fs/fscache/object.c | 69 +++++- fs/fscache/operation.c | 254 ++++++++++++++-------- fs/fscache/page.c | 86 ++++---- fs/fscache/stats.c | 14 +- include/linux/fscache-cache.h | 55 +++-- 12 files changed, 396 insertions(+), 204 deletions(-) Merging fuse/for-next (94e4fe2cab3d fuse: explicitly set /dev/fuse file's private_data) $ git merge fuse/for-next Already up-to-date. Merging gfs2/for-next (1272574bf948 gfs2: kerneldoc warning fixes) $ git merge gfs2/for-next Auto-merging fs/gfs2/ops_fstype.c Auto-merging fs/gfs2/inode.c Auto-merging fs/gfs2/file.c Auto-merging fs/gfs2/aops.c Merge made by the 'recursive' strategy. fs/gfs2/aops.c | 12 ++- fs/gfs2/file.c | 2 +- fs/gfs2/inode.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++----- fs/gfs2/ops_fstype.c | 1 + fs/gfs2/rgrp.c | 21 ++++-- fs/gfs2/sys.c | 66 +++++++++++----- 6 files changed, 264 insertions(+), 47 deletions(-) Merging jfs/jfs-next (7d2ac45611b0 jfs: %pf is only for function pointers) $ git merge jfs/jfs-next Already up-to-date. Merging nfs/linux-next (b787f68c36d4 Linux 4.1-rc1) $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next (d57a97bbdb5f nfsd: Pin to vfsmnt instead of mntget) $ git merge nfsd/nfsd-next Auto-merging fs/namei.c Merge made by the 'recursive' strategy. Documentation/filesystems/nfs/knfsd-stats.txt | 44 ++-------------- fs/fs_pin.c | 3 ++ fs/namei.c | 74 +++++++++++++++++++++++++++ fs/nfsd/export.c | 37 +++++++++++--- fs/nfsd/export.h | 10 +++- fs/nfsd/nfs3xdr.c | 14 ++--- fs/nfsd/nfs4state.c | 2 +- fs/nfsd/nfs4xdr.c | 8 +-- fs/nfsd/vfs.c | 42 +++++---------- fs/nfsd/vfs.h | 1 - include/linux/fs_pin.h | 1 + include/linux/namei.h | 1 + include/linux/sunrpc/cache.h | 11 ++++ 13 files changed, 160 insertions(+), 88 deletions(-) Merging overlayfs/overlayfs-next (71cbad7e694e ovl: upper fs should not be R/O) $ git merge overlayfs/overlayfs-next Already up-to-date. Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (98fb1ffd8154 UBI: block: Add missing cache flushes) $ git merge ubifs/linux-next Merge made by the 'recursive' strategy. drivers/mtd/ubi/block.c | 2 ++ 1 file changed, 2 insertions(+) Merging xfs/for-next (5ebe6afaf005 Linux 4.1-rc2) $ git merge xfs/for-next Already up-to-date. Merging file-locks/linux-next (7505256626b0 Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux) $ git merge file-locks/linux-next Already up-to-date. Merging vfs/for-next (0ad7e33ea980 don't pass nameidata to ->follow_link()) $ git merge vfs/for-next Resolved 'fs/ext4/symlink.c' using previous resolution. Resolved 'fs/f2fs/namei.c' using previous resolution. Auto-merging include/linux/namei.h Removing fs/sysv/symlink.c Auto-merging fs/namei.c Auto-merging fs/gfs2/inode.c Auto-merging fs/f2fs/namei.c CONFLICT (content): Merge conflict in fs/f2fs/namei.c Auto-merging fs/ext4/symlink.c CONFLICT (content): Merge conflict in fs/ext4/symlink.c Auto-merging fs/ext4/namei.c Auto-merging fs/ext4/ext4.h Removing fs/exofs/symlink.c Auto-merging fs/cifs/link.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ac3272c71a59] Merge remote-tracking branch 'vfs/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/filesystems/Locking | 4 +- Documentation/filesystems/vfs.txt | 4 +- drivers/staging/lustre/lustre/llite/symlink.c | 26 +- fs/9p/v9fs.h | 2 - fs/9p/vfs_inode.c | 122 +---- fs/9p/vfs_inode_dotl.c | 36 +- fs/autofs4/symlink.c | 5 +- fs/befs/linuxvfs.c | 57 +- fs/ceph/inode.c | 11 +- fs/cifs/cifsfs.h | 2 +- fs/cifs/link.c | 28 +- fs/configfs/symlink.c | 28 +- fs/debugfs/file.c | 12 - fs/debugfs/inode.c | 6 +- fs/ecryptfs/inode.c | 8 +- fs/exofs/Kbuild | 2 +- fs/exofs/exofs.h | 4 - fs/exofs/inode.c | 9 +- fs/exofs/namei.c | 5 +- fs/exofs/symlink.c | 55 -- fs/ext2/inode.c | 1 + fs/ext2/namei.c | 3 +- fs/ext2/symlink.c | 10 +- fs/ext3/inode.c | 1 + fs/ext3/namei.c | 3 +- fs/ext3/symlink.c | 10 +- fs/ext4/ext4.h | 1 + fs/ext4/inode.c | 7 +- fs/ext4/namei.c | 11 +- fs/ext4/symlink.c | 46 +- fs/f2fs/namei.c | 18 +- fs/freevxfs/vxfs_extern.h | 3 - fs/freevxfs/vxfs_immed.c | 34 -- fs/freevxfs/vxfs_inode.c | 7 +- fs/fuse/dir.c | 19 +- fs/gfs2/inode.c | 10 +- fs/hostfs/hostfs_kern.c | 15 +- fs/hppfs/hppfs.c | 9 +- fs/inode.c | 1 + fs/jffs2/dir.c | 1 + fs/jffs2/fs.c | 1 + fs/jffs2/symlink.c | 45 +- fs/jfs/inode.c | 3 +- fs/jfs/namei.c | 5 +- fs/jfs/symlink.c | 10 +- fs/kernfs/symlink.c | 22 +- fs/libfs.c | 19 +- fs/logfs/dir.c | 1 + fs/namei.c | 753 ++++++++++++++------------ fs/nfs/symlink.c | 19 +- fs/overlayfs/inode.c | 35 +- fs/proc/base.c | 4 +- fs/proc/inode.c | 9 +- fs/proc/namespaces.c | 4 +- fs/proc/self.c | 24 +- fs/proc/thread_self.c | 22 +- fs/sysv/Makefile | 2 +- fs/sysv/inode.c | 5 +- fs/sysv/symlink.c | 20 - fs/sysv/sysv.h | 1 - fs/ubifs/dir.c | 1 + fs/ubifs/file.c | 11 +- fs/ubifs/super.c | 1 + fs/ufs/inode.c | 5 +- fs/ufs/namei.c | 3 +- fs/ufs/symlink.c | 13 +- fs/xfs/xfs_iops.c | 11 +- include/linux/debugfs.h | 1 - include/linux/fs.h | 13 +- include/linux/namei.h | 6 +- include/linux/sched.h | 2 +- include/linux/security.h | 9 +- mm/shmem.c | 32 +- security/capability.c | 3 +- security/security.c | 4 +- security/selinux/hooks.c | 2 +- 76 files changed, 712 insertions(+), 1045 deletions(-) delete mode 100644 fs/exofs/symlink.c delete mode 100644 fs/sysv/symlink.c $ git am -3 ../patches/0001-f2fs-merge-fix-for-follow_link-and-put_link-changes.patch Applying: f2fs: merge fix for follow_link and put_link changes $ git reset HEAD^ Unstaged changes after reset: M fs/f2fs/namei.c $ git add -A . $ git commit -v -a --amend [master 328ee9f3f5a4] Merge remote-tracking branch 'vfs/for-next' Date: Tue May 12 10:51:17 2015 +1000 Merging pci/next (9b08ae0dde00 Merge branch 'pci/msi' into next) $ git merge pci/next Merge made by the 'recursive' strategy. drivers/ntb/ntb_hw.c | 2 -- drivers/pci/msi.c | 53 +++++++------------------------------- drivers/pci/pci.c | 33 ------------------------ drivers/pci/pci.h | 21 +++++++++++++++ drivers/pci/probe.c | 18 +++++++++++++ drivers/pci/quirks.c | 2 -- drivers/virtio/virtio_pci_common.c | 3 --- include/linux/pci.h | 1 - 8 files changed, 49 insertions(+), 84 deletions(-) Merging hid/for-next (09f6f31e82f1 Merge branch 'for-4.2/logitech' into for-next) $ git merge hid/for-next Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 8 +- drivers/hid/hid-core.c | 5 +- drivers/hid/hid-ids.h | 9 + drivers/hid/hid-lenovo.c | 50 +++ drivers/hid/hid-lg.c | 24 +- drivers/hid/hid-lg4ff.c | 458 ++++++++++++++------- drivers/hid/hid-lg4ff.h | 4 +- drivers/hid/hid-logitech-hidpp.c | 20 - drivers/hid/hid-prodikeys.c | 3 +- drivers/hid/hid-sjoy.c | 3 + drivers/hid/hid-sony.c | 213 ++++++++-- drivers/hid/i2c-hid/i2c-hid.c | 5 +- drivers/hid/usbhid/hid-quirks.c | 4 +- drivers/hid/wacom.h | 2 +- drivers/hid/wacom_sys.c | 129 +++--- drivers/hid/wacom_wac.c | 41 +- drivers/hid/wacom_wac.h | 12 +- 17 files changed, 683 insertions(+), 307 deletions(-) Merging i2c/i2c/for-next (b787f68c36d4 Linux 4.1-rc1) $ git merge i2c/i2c/for-next Already up-to-date. Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) $ git merge jdelvare-hwmon/master Already up-to-date. Merging dmi/master (9432bf142f77 firmware: dmi: List my quilt tree) $ git merge dmi/master Auto-merging MAINTAINERS Auto-merging Documentation/ABI/testing/sysfs-firmware-dmi-entries Merge made by the 'recursive' strategy. ...sfs-firmware-dmi => sysfs-firmware-dmi-entries} | 2 +- .../ABI/testing/sysfs-firmware-dmi-tables | 22 ++++ MAINTAINERS | 2 + drivers/firmware/dmi-sysfs.c | 17 ++- drivers/firmware/dmi_scan.c | 115 ++++++++++++++++++--- include/linux/dmi.h | 2 + 6 files changed, 134 insertions(+), 26 deletions(-) rename Documentation/ABI/testing/{sysfs-firmware-dmi => sysfs-firmware-dmi-entries} (99%) create mode 100644 Documentation/ABI/testing/sysfs-firmware-dmi-tables Merging hwmon-staging/hwmon-next (0f8b11419e2f hwmon: Allow compile test of GPIO consumers if !GPIOLIB) $ git merge hwmon-staging/hwmon-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/hwmon/ntc_thermistor.txt | 1 + Documentation/hwmon/ntc_thermistor | 6 ++- MAINTAINERS | 2 +- drivers/hwmon/Kconfig | 8 ++-- drivers/hwmon/max197.c | 2 +- drivers/hwmon/ntc_thermistor.c | 44 ++++++++++++++++++++++ drivers/hwmon/sht15.c | 2 +- include/linux/platform_data/ntc_thermistor.h | 1 + 8 files changed, 57 insertions(+), 9 deletions(-) Merging v4l-dvb/master (e7f8fd8aa7f2 Merge branch 'patchwork' into to_next) $ git merge v4l-dvb/master Removing drivers/staging/media/dt3155v4l/dt3155v4l.c Removing drivers/staging/media/dt3155v4l/Makefile Removing drivers/staging/media/dt3155v4l/Kconfig Auto-merging drivers/media/pci/dt3155/dt3155.h Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/DocBook/media/v4l/controls.xml | 4 +- .../DocBook/media/v4l/media-func-open.xml | 2 +- Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 7 + .../devicetree/bindings/media/i2c/adp1653.txt | 37 + Documentation/video4linux/v4l2-pci-skeleton.c | 2 - MAINTAINERS | 8 + drivers/input/touchscreen/Kconfig | 3 +- drivers/media/dvb-frontends/af9013.c | 4 + drivers/media/dvb-frontends/bcm3510.c | 4 +- drivers/media/dvb-frontends/cx24116.c | 8 +- drivers/media/dvb-frontends/cx24117.c | 2 +- drivers/media/dvb-frontends/cx24123.h | 2 +- drivers/media/dvb-frontends/dib0070.c | 575 ++++++------ drivers/media/dvb-frontends/dib3000mc.c | 18 +- drivers/media/dvb-frontends/dib8000.h | 2 +- drivers/media/dvb-frontends/drx39xyj/drxj.c | 38 +- drivers/media/dvb-frontends/lgdt3306a.c | 2 +- drivers/media/dvb-frontends/mb86a20s.h | 2 +- drivers/media/dvb-frontends/s5h1420.c | 20 +- drivers/media/dvb-frontends/s921.h | 2 +- drivers/media/dvb-frontends/stv0288.c | 28 +- drivers/media/dvb-frontends/stv0297.c | 8 +- drivers/media/dvb-frontends/stv0900_sw.c | 6 +- drivers/media/dvb-frontends/tda1004x.c | 2 +- drivers/media/dvb-frontends/tda10086.c | 4 +- drivers/media/dvb-frontends/zl10353.c | 10 +- drivers/media/i2c/adp1653.c | 100 ++- drivers/media/i2c/adv7170.c | 42 +- drivers/media/i2c/adv7175.c | 42 +- drivers/media/i2c/adv7183.c | 61 +- drivers/media/i2c/adv7604.c | 69 +- drivers/media/i2c/adv7842.c | 25 +- drivers/media/i2c/ak881x.c | 39 +- drivers/media/i2c/cx25840/cx25840-core.c | 17 +- drivers/media/i2c/ml86v7667.c | 29 +- drivers/media/i2c/mt9v011.c | 53 +- drivers/media/i2c/ov2659.c | 2 +- drivers/media/i2c/ov7670.c | 65 +- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- drivers/media/i2c/s5k5baf.c | 2 +- drivers/media/i2c/s5k6aa.c | 2 +- drivers/media/i2c/saa6752hs.c | 42 +- drivers/media/i2c/saa7115.c | 16 +- drivers/media/i2c/saa717x.c | 20 +- drivers/media/i2c/smiapp/smiapp-core.c | 38 +- drivers/media/i2c/soc_camera/imx074.c | 66 +- drivers/media/i2c/soc_camera/mt9m001.c | 43 +- drivers/media/i2c/soc_camera/mt9m111.c | 57 +- drivers/media/i2c/soc_camera/mt9t031.c | 74 +- drivers/media/i2c/soc_camera/mt9t112.c | 41 +- drivers/media/i2c/soc_camera/mt9v022.c | 43 +- drivers/media/i2c/soc_camera/ov2640.c | 62 +- drivers/media/i2c/soc_camera/ov5642.c | 60 +- drivers/media/i2c/soc_camera/ov6650.c | 43 +- drivers/media/i2c/soc_camera/ov772x.c | 41 +- drivers/media/i2c/soc_camera/ov9640.c | 32 +- drivers/media/i2c/soc_camera/ov9740.c | 35 +- drivers/media/i2c/soc_camera/rj54n1cb0c.c | 66 +- drivers/media/i2c/soc_camera/tw9910.c | 41 +- drivers/media/i2c/sr030pc30.c | 62 +- drivers/media/i2c/tvp514x.c | 55 +- drivers/media/i2c/tvp5150.c | 30 +- drivers/media/i2c/tvp7002.c | 48 - drivers/media/i2c/vs6624.c | 55 +- drivers/media/pci/Kconfig | 1 + drivers/media/pci/Makefile | 1 + drivers/media/pci/bt8xx/bttv-audio-hook.c | 443 ++++++---- drivers/media/pci/bt8xx/bttv-driver.c | 5 +- drivers/media/pci/cx18/cx18-av-core.c | 16 +- drivers/media/pci/cx18/cx18-controls.c | 13 +- drivers/media/pci/cx18/cx18-driver.c | 4 +- drivers/media/pci/cx18/cx18-ioctl.c | 12 +- drivers/media/pci/cx18/cx18-streams.c | 1 + drivers/media/pci/cx23885/altera-ci.c | 2 +- drivers/media/pci/cx23885/cx23885-video.c | 12 +- drivers/media/pci/cx88/cx88-core.c | 2 + drivers/media/pci/cx88/cx88-mpeg.c | 6 +- drivers/media/pci/cx88/cx88-vbi.c | 6 +- drivers/media/pci/cx88/cx88-video.c | 7 +- drivers/media/pci/cx88/cx88.h | 1 - drivers/media/pci/dt3155/Kconfig | 13 + drivers/media/pci/dt3155/Makefile | 1 + drivers/media/pci/dt3155/dt3155.c | 632 +++++++++++++ .../dt3155v4l.h => media/pci/dt3155/dt3155.h} | 64 +- drivers/media/pci/ivtv/ivtv-controls.c | 12 +- drivers/media/pci/ivtv/ivtv-driver.c | 4 +- drivers/media/pci/ivtv/ivtv-ioctl.c | 12 +- drivers/media/pci/mantis/mantis_cards.c | 3 - drivers/media/pci/ngene/ngene-core.c | 10 +- drivers/media/pci/saa7134/saa7134-cards.c | 19 +- drivers/media/pci/saa7134/saa7134-dvb.c | 2 +- drivers/media/pci/saa7134/saa7134-empress.c | 32 +- drivers/media/pci/saa7164/saa7164-api.c | 22 +- drivers/media/pci/saa7164/saa7164-buffer.c | 2 +- drivers/media/pci/saa7164/saa7164-bus.c | 2 +- drivers/media/pci/saa7164/saa7164-cards.c | 188 +++- drivers/media/pci/saa7164/saa7164-cmd.c | 2 +- drivers/media/pci/saa7164/saa7164-core.c | 16 +- drivers/media/pci/saa7164/saa7164-dvb.c | 238 ++++- drivers/media/pci/saa7164/saa7164-encoder.c | 13 +- drivers/media/pci/saa7164/saa7164-fw.c | 2 +- drivers/media/pci/saa7164/saa7164-i2c.c | 9 +- drivers/media/pci/saa7164/saa7164-reg.h | 2 +- drivers/media/pci/saa7164/saa7164-types.h | 2 +- drivers/media/pci/saa7164/saa7164-vbi.c | 13 +- drivers/media/pci/saa7164/saa7164.h | 7 +- drivers/media/pci/zoran/zoran_device.c | 13 +- drivers/media/platform/am437x/am437x-vpfe.c | 32 +- drivers/media/platform/blackfin/bfin_capture.c | 40 +- drivers/media/platform/davinci/vpfe_capture.c | 19 +- drivers/media/platform/m2m-deinterlace.c | 1 - drivers/media/platform/marvell-ccic/cafe-driver.c | 13 +- drivers/media/platform/marvell-ccic/mcam-core.c | 471 ++++------ drivers/media/platform/marvell-ccic/mcam-core.h | 3 +- drivers/media/platform/marvell-ccic/mmp-driver.c | 1 + drivers/media/platform/s3c-camif/camif-capture.c | 13 +- drivers/media/platform/s5p-mfc/s5p_mfc.c | 2 - drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +- drivers/media/platform/s5p-tv/hdmi_drv.c | 12 +- drivers/media/platform/s5p-tv/mixer_drv.c | 15 +- drivers/media/platform/s5p-tv/sdo_drv.c | 14 +- drivers/media/platform/sh_vou.c | 61 +- drivers/media/platform/soc_camera/atmel-isi.c | 74 +- drivers/media/platform/soc_camera/mx2_camera.c | 113 +-- drivers/media/platform/soc_camera/mx3_camera.c | 105 ++- drivers/media/platform/soc_camera/omap1_camera.c | 106 ++- drivers/media/platform/soc_camera/pxa_camera.c | 99 ++- drivers/media/platform/soc_camera/rcar_vin.c | 109 ++- .../platform/soc_camera/sh_mobile_ceu_camera.c | 115 +-- drivers/media/platform/soc_camera/sh_mobile_csi2.c | 35 +- drivers/media/platform/soc_camera/soc_camera.c | 30 +- .../platform/soc_camera/soc_camera_platform.c | 24 +- drivers/media/platform/soc_camera/soc_scale_crop.c | 37 +- drivers/media/platform/via-camera.c | 19 +- drivers/media/platform/vim2m.c | 4 - drivers/media/platform/vivid/vivid-core.c | 13 +- drivers/media/platform/vivid/vivid-core.h | 1 - drivers/media/platform/vivid/vivid-radio-rx.c | 2 + drivers/media/platform/vivid/vivid-tpg.c | 109 ++- drivers/media/platform/vivid/vivid-tpg.h | 1 + drivers/media/platform/vivid/vivid-vid-cap.c | 17 +- drivers/media/platform/vivid/vivid-vid-common.c | 50 -- drivers/media/platform/vivid/vivid-vid-out.c | 3 +- drivers/media/platform/xilinx/Kconfig | 2 +- drivers/media/radio/radio-si476x.c | 4 +- drivers/media/radio/radio-timb.c | 4 +- drivers/media/radio/si4713/si4713.c | 4 +- drivers/media/radio/wl128x/fmdrv.h | 2 +- drivers/media/rc/ir-sony-decoder.c | 28 +- drivers/media/rc/rc-main.c | 2 +- drivers/media/rc/redrat3.c | 2 +- drivers/media/tuners/qt1010.c | 8 +- drivers/media/tuners/r820t.c | 4 +- drivers/media/usb/as102/as102_drv.c | 1 + drivers/media/usb/cx231xx/cx231xx-417.c | 18 +- drivers/media/usb/cx231xx/cx231xx-avcore.c | 44 +- drivers/media/usb/cx231xx/cx231xx-core.c | 30 +- drivers/media/usb/cx231xx/cx231xx-video.c | 23 +- drivers/media/usb/dvb-usb/af9005-fe.c | 2 +- drivers/media/usb/dvb-usb/dib0700_devices.c | 32 +- drivers/media/usb/dvb-usb/dw2102.c | 2 +- drivers/media/usb/dvb-usb/vp702x.c | 7 +- drivers/media/usb/em28xx/em28xx-camera.c | 12 +- drivers/media/usb/go7007/go7007-driver.c | 3 +- drivers/media/usb/go7007/go7007-usb.c | 4 + drivers/media/usb/go7007/go7007-v4l2.c | 12 +- drivers/media/usb/go7007/s2250-board.c | 18 +- drivers/media/usb/gspca/benq.c | 4 +- drivers/media/usb/gspca/sonixj.c | 2 +- drivers/media/usb/gspca/stk014.c | 2 +- drivers/media/usb/gspca/xirlink_cit.c | 12 +- drivers/media/usb/gspca/zc3xx.c | 16 +- drivers/media/usb/pvrusb2/pvrusb2-context.c | 3 +- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 35 +- drivers/media/usb/pvrusb2/pvrusb2-io.c | 30 +- drivers/media/usb/pvrusb2/pvrusb2-ioread.c | 24 +- drivers/media/usb/ttusb-dec/ttusb_dec.c | 4 +- drivers/media/usb/usbtv/usbtv-video.c | 12 +- drivers/media/usb/usbvision/usbvision-core.c | 4 +- drivers/media/v4l2-core/Kconfig | 2 +- drivers/media/v4l2-core/v4l2-dv-timings.c | 29 +- drivers/media/v4l2-core/v4l2-ioctl.c | 199 ++++- drivers/media/v4l2-core/v4l2-of.c | 92 +- drivers/media/v4l2-core/videobuf2-core.c | 2 - drivers/media/v4l2-core/videobuf2-dma-contig.c | 7 + drivers/media/v4l2-core/videobuf2-dma-sg.c | 6 + drivers/media/v4l2-core/videobuf2-vmalloc.c | 6 +- drivers/staging/media/Kconfig | 2 - drivers/staging/media/Makefile | 1 - drivers/staging/media/bcm2048/radio-bcm2048.c | 3 +- drivers/staging/media/dt3155v4l/Kconfig | 29 - drivers/staging/media/dt3155v4l/Makefile | 1 - drivers/staging/media/dt3155v4l/dt3155v4l.c | 981 --------------------- include/media/adp1653.h | 8 +- include/media/v4l2-of.h | 20 +- include/media/v4l2-subdev.h | 16 - 196 files changed, 4424 insertions(+), 3448 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/i2c/adp1653.txt create mode 100644 drivers/media/pci/dt3155/Kconfig create mode 100644 drivers/media/pci/dt3155/Makefile create mode 100644 drivers/media/pci/dt3155/dt3155.c rename drivers/{staging/media/dt3155v4l/dt3155v4l.h => media/pci/dt3155/dt3155.h} (82%) delete mode 100644 drivers/staging/media/dt3155v4l/Kconfig delete mode 100644 drivers/staging/media/dt3155v4l/Makefile delete mode 100644 drivers/staging/media/dt3155v4l/dt3155v4l.c Merging kbuild/for-next (d1809fd6c20c Merge branch 'kbuild/misc' into kbuild/for-next) $ git merge kbuild/for-next Auto-merging lib/Kconfig.debug Auto-merging Makefile Merge made by the 'recursive' strategy. Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 35 +++++++--- 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 +- scripts/package/builddeb | 24 +++++-- scripts/package/mkspec | 4 +- 11 files changed, 381 insertions(+), 27 deletions(-) create mode 100644 Documentation/lto-build create mode 100644 scripts/Makefile.lto Merging kconfig/for-next (bfa76d495765 Linux 3.19) $ git merge kconfig/for-next Already up-to-date. Merging libata/for-next (beb856eebad6 Merge branch 'for-4.2' into for-next) $ git merge libata/for-next Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/ABI/testing/sysfs-ata | 11 ++++ Documentation/kernel-parameters.txt | 2 + drivers/ata/ahci.h | 2 + drivers/ata/ahci_xgene.c | 105 +++++++++++++++++++++++++++++------- drivers/ata/libahci.c | 89 +++++++++++++++++++++++------- drivers/ata/libata-core.c | 2 + drivers/ata/libata-eh.c | 12 ++++- drivers/ata/libata-transport.c | 22 ++++++++ drivers/ata/pata_samsung_cf.c | 2 +- include/linux/ata.h | 12 ++++- include/linux/libata.h | 1 + 11 files changed, 218 insertions(+), 42 deletions(-) Merging pm/linux-next (3ab54c8c46ed Merge branch 'powercap' into linux-next) $ git merge pm/linux-next Merge made by the 'recursive' strategy. Documentation/cpu-freq/user-guide.txt | 2 - drivers/acpi/apei/ghes.c | 108 ++++++++++++++++--------------- drivers/acpi/osl.c | 6 +- drivers/acpi/power.c | 2 - drivers/cpufreq/arm_big_little.c | 13 +++- drivers/cpufreq/cpufreq.c | 74 +++++++++++++-------- drivers/cpufreq/intel_pstate.c | 31 ++++++--- drivers/cpufreq/pxa2xx-cpufreq.c | 20 +++--- drivers/cpuidle/cpuidle.c | 4 +- drivers/cpuidle/governors/menu.c | 4 +- drivers/powercap/intel_rapl.c | 50 ++++++++++++--- include/trace/events/power.h | 25 +++++--- kernel/sched/idle.c | 117 ++++++++++++++++++---------------- 13 files changed, 268 insertions(+), 188 deletions(-) Merging idle/next (64887b6882de Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) $ 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 thermal/next (699f417cbf8f Merge branches 'for-rc' and 'release' of .git into next) $ git merge thermal/next Merge made by the 'recursive' strategy. drivers/thermal/Kconfig | 24 +- drivers/thermal/Makefile | 2 + .../int340x_thermal/processor_thermal_device.c | 59 ++- drivers/thermal/intel_powerclamp.c | 90 ++-- drivers/thermal/intel_quark_dts_thermal.c | 473 ++++++++++++++++++++ drivers/thermal/intel_soc_dts_iosf.c | 478 +++++++++++++++++++++ drivers/thermal/intel_soc_dts_iosf.h | 62 +++ drivers/thermal/intel_soc_dts_thermal.c | 430 +----------------- drivers/thermal/rockchip_thermal.c | 2 +- drivers/thermal/thermal_core.h | 2 +- tools/thermal/tmon/Makefile | 8 - 11 files changed, 1168 insertions(+), 462 deletions(-) create mode 100644 drivers/thermal/intel_quark_dts_thermal.c create mode 100644 drivers/thermal/intel_soc_dts_iosf.c create mode 100644 drivers/thermal/intel_soc_dts_iosf.h Merging thermal-soc/next (bcacb3e5fd10 Merge branch 'work-linus' into work-next) $ git merge thermal-soc/next Auto-merging drivers/thermal/thermal_core.h Auto-merging drivers/thermal/Makefile Auto-merging drivers/thermal/Kconfig Merge made by the 'recursive' strategy. .../bindings/thermal/qcom-spmi-temp-alarm.txt | 57 ++ .../devicetree/bindings/thermal/thermal.txt | 9 + Documentation/thermal/cpu-cooling-api.txt | 156 +++++- Documentation/thermal/power_allocator.txt | 247 +++++++++ Documentation/thermal/sysfs-api.txt | 83 ++- drivers/acpi/thermal.c | 9 +- drivers/platform/x86/acerhdf.c | 3 +- drivers/thermal/Kconfig | 36 ++ drivers/thermal/Makefile | 2 + drivers/thermal/armada_thermal.c | 6 +- drivers/thermal/cpu_cooling.c | 585 ++++++++++++++++++++- drivers/thermal/db8500_thermal.c | 2 +- drivers/thermal/fair_share.c | 41 +- drivers/thermal/imx_thermal.c | 3 +- drivers/thermal/of-thermal.c | 15 +- drivers/thermal/power_allocator.c | 539 +++++++++++++++++++ drivers/thermal/qcom-spmi-temp-alarm.c | 309 +++++++++++ drivers/thermal/samsung/exynos_tmu.c | 187 ++++++- drivers/thermal/samsung/exynos_tmu.h | 1 + drivers/thermal/thermal_core.c | 310 ++++++++++- drivers/thermal/thermal_core.h | 11 + .../thermal/ti-soc-thermal/dra752-thermal-data.c | 3 +- .../thermal/ti-soc-thermal/omap5-thermal-data.c | 3 +- drivers/thermal/ti-soc-thermal/ti-bandgap.c | 180 +++++-- drivers/thermal/ti-soc-thermal/ti-bandgap.h | 6 + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +- drivers/thermal/x86_pkg_temp_thermal.c | 2 +- include/linux/cpu_cooling.h | 39 ++ include/linux/thermal.h | 86 ++- include/trace/events/thermal.h | 58 ++ include/trace/events/thermal_power_allocator.h | 87 +++ 31 files changed, 2939 insertions(+), 141 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt create mode 100644 Documentation/thermal/power_allocator.txt create mode 100644 drivers/thermal/power_allocator.c create mode 100644 drivers/thermal/qcom-spmi-temp-alarm.c create mode 100644 include/trace/events/thermal_power_allocator.h Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) $ git merge ieee1394/for-next Already up-to-date. Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) $ git merge dlm/next Already up-to-date. 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 (23e257a2049f Merge branch 'topic/omap' into next) $ git merge slave-dma/next Removing include/linux/platform_data/dma-rcar-audmapp.h Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/dma/dma.txt | 28 +++++++ .../devicetree/bindings/dma/sun6i-dma.txt | 5 +- .../devicetree/bindings/dma/ti-dma-crossbar.txt | 52 +++++++++++++ drivers/dma/amba-pl08x.c | 2 +- drivers/dma/dmaengine.c | 7 ++ drivers/dma/ep93xx_dma.c | 2 +- drivers/dma/imx-dma.c | 2 +- drivers/dma/imx-sdma.c | 2 +- drivers/dma/mxs-dma.c | 2 +- drivers/dma/nbpfaxi.c | 2 +- drivers/dma/of-dma.c | 89 ++++++++++++++++++++++ drivers/dma/omap-dma.c | 80 +++++++++++++++++-- drivers/dma/s3c24xx-dma.c | 2 +- drivers/dma/sun6i-dma.c | 12 +++ include/linux/dmaengine.h | 17 +++++ include/linux/of_dma.h | 21 +++++ include/linux/platform_data/dma-rcar-audmapp.h | 34 --------- 17 files changed, 309 insertions(+), 50 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt delete mode 100644 include/linux/platform_data/dma-rcar-audmapp.h Merging net-next/master (b396cca6fafc net: sched: deprecate enqueue_root()) $ git merge net-next/master Recorded preimage for 'drivers/net/ethernet/qualcomm/qca_spi.c' Recorded preimage for 'include/net/codel.h' Recorded preimage for 'net/core/sock.c' Auto-merging net/sched/sch_fq_codel.c Auto-merging net/sched/sch_codel.c Auto-merging net/packet/af_packet.c Auto-merging net/netlink/af_netlink.c Auto-merging net/mac80211/sta_info.c Auto-merging net/mac80211/iface.c Auto-merging net/ipv6/route.c Auto-merging net/core/sock.c CONFLICT (content): Merge conflict in net/core/sock.c Auto-merging net/core/dev.c Auto-merging include/net/mac80211.h Auto-merging include/net/codel.h CONFLICT (content): Merge conflict in include/net/codel.h Auto-merging drivers/staging/vt6655/device_main.c Auto-merging drivers/net/ppp/pppoe.c Auto-merging drivers/net/ethernet/qualcomm/qca_spi.c CONFLICT (content): Merge conflict in drivers/net/ethernet/qualcomm/qca_spi.c Auto-merging drivers/net/ethernet/intel/igb/igb_main.c Auto-merging drivers/net/ethernet/cadence/macb.c Auto-merging drivers/net/dsa/mv88e6xxx.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/net/ethernet/qualcomm/qca_spi.c'. Recorded resolution for 'include/net/codel.h'. Recorded resolution for 'net/core/sock.c'. [master b32f026f642d] Merge remote-tracking branch 'net-next/master' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-bus-pci-drivers-janz-cmodio | 8 + Documentation/ABI/testing/sysfs-class-net | 19 + .../ABI/testing/sysfs-class-net-janz-ican3 | 19 + Documentation/devicetree/bindings/net/macb.txt | 1 + Documentation/networking/bonding.txt | 84 +++ Documentation/networking/can.txt | 3 + Documentation/networking/ip-sysctl.txt | 8 + Documentation/networking/pktgen.txt | 9 + Documentation/networking/tc-actions-env-rules.txt | 2 - crypto/af_alg.c | 4 +- drivers/block/drbd/drbd_receiver.c | 4 +- drivers/isdn/mISDN/socket.c | 12 +- drivers/mfd/janz-cmodio.c | 4 + drivers/net/bonding/bond_3ad.c | 26 +- drivers/net/bonding/bond_main.c | 23 + drivers/net/bonding/bond_netlink.c | 50 ++ drivers/net/bonding/bond_options.c | 91 +++ drivers/net/bonding/bond_procfs.c | 8 + drivers/net/bonding/bond_sysfs.c | 46 ++ drivers/net/can/flexcan.c | 53 +- drivers/net/can/janz-ican3.c | 125 ++-- drivers/net/dsa/Kconfig | 12 +- drivers/net/dsa/mv88e6123_61_65.c | 186 +----- drivers/net/dsa/mv88e6131.c | 185 +----- drivers/net/dsa/mv88e6171.c | 234 +------- drivers/net/dsa/mv88e6352.c | 188 +----- drivers/net/dsa/mv88e6xxx.c | 636 +++++++++++++++++---- drivers/net/dsa/mv88e6xxx.h | 99 +++- drivers/net/ethernet/apm/xgene/Makefile | 2 +- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 36 +- drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 8 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 207 +++++-- drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 30 +- drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 200 +++++++ drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h | 49 ++ drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 62 +- drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 1 - drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 20 + drivers/net/ethernet/cadence/macb.c | 52 +- drivers/net/ethernet/cadence/macb.h | 9 + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 29 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 48 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 1 + drivers/net/ethernet/chelsio/cxgb4/sge.c | 160 +++--- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 180 +++++- drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 9 + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 3 + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 15 +- drivers/net/ethernet/emulex/benet/be.h | 6 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 23 +- drivers/net/ethernet/emulex/benet/be_cmds.h | 33 +- drivers/net/ethernet/emulex/benet/be_ethtool.c | 10 +- drivers/net/ethernet/emulex/benet/be_hw.h | 14 +- drivers/net/ethernet/emulex/benet/be_main.c | 286 +++++---- drivers/net/ethernet/emulex/benet/be_roce.c | 2 +- drivers/net/ethernet/emulex/benet/be_roce.h | 2 +- drivers/net/ethernet/freescale/fec_main.c | 78 +++ drivers/net/ethernet/freescale/gianfar.c | 53 +- drivers/net/ethernet/ibm/ibmveth.c | 41 +- drivers/net/ethernet/ibm/ibmveth.h | 5 +- drivers/net/ethernet/intel/e100.c | 2 +- drivers/net/ethernet/intel/e1000e/82571.c | 2 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 23 +- drivers/net/ethernet/intel/e1000e/netdev.c | 32 +- drivers/net/ethernet/intel/igb/igb_main.c | 27 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 10 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 8 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 106 ++-- drivers/net/ethernet/qualcomm/qca_spi.c | 46 +- drivers/net/ethernet/rocker/rocker.c | 4 +- drivers/net/ethernet/sfc/Makefile | 2 +- drivers/net/ethernet/sfc/ef10.c | 373 +++++++++++- drivers/net/ethernet/sfc/ef10_sriov.c | 430 ++++++++++++++ drivers/net/ethernet/sfc/ef10_sriov.h | 70 +++ drivers/net/ethernet/sfc/efx.c | 198 ++++--- drivers/net/ethernet/sfc/efx.h | 10 + drivers/net/ethernet/sfc/ethtool.c | 5 +- drivers/net/ethernet/sfc/falcon.c | 33 +- drivers/net/ethernet/sfc/farch.c | 64 ++- drivers/net/ethernet/sfc/mcdi.c | 118 ++-- drivers/net/ethernet/sfc/mcdi.h | 2 + drivers/net/ethernet/sfc/mcdi_pcol.h | 23 + drivers/net/ethernet/sfc/net_driver.h | 21 +- drivers/net/ethernet/sfc/nic.h | 133 +---- drivers/net/ethernet/sfc/siena.c | 25 +- drivers/net/ethernet/sfc/siena_sriov.c | 142 +++-- drivers/net/ethernet/sfc/siena_sriov.h | 79 +++ drivers/net/ethernet/sfc/sriov.c | 60 ++ drivers/net/ethernet/sfc/sriov.h | 27 + drivers/net/ethernet/via/via-rhine.c | 249 +++++--- drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +- drivers/net/ethernet/xilinx/xilinx_axienet.h | 108 ++-- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 288 +++++----- drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 30 +- drivers/net/ipvlan/ipvlan.h | 5 + drivers/net/ipvlan/ipvlan_core.c | 138 +++-- drivers/net/ipvlan/ipvlan_main.c | 25 +- drivers/net/macvtap.c | 2 +- drivers/net/ppp/pppoe.c | 4 +- drivers/net/ppp/pppox.c | 2 +- drivers/net/ppp/pptp.c | 4 +- drivers/net/tun.c | 26 +- drivers/net/vxlan.c | 5 +- drivers/net/wireless/adm8211.c | 7 +- drivers/net/wireless/at76c50x-usb.h | 2 +- drivers/net/wireless/ath/ar5523/ar5523.c | 3 +- drivers/net/wireless/ath/ath10k/mac.c | 7 +- drivers/net/wireless/ath/ath5k/ath5k.h | 1 - drivers/net/wireless/ath/ath5k/led.c | 2 +- drivers/net/wireless/ath/ath5k/mac80211-ops.c | 16 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 +- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 9 +- drivers/net/wireless/ath/ath9k/main.c | 3 +- drivers/net/wireless/ath/ath9k/recv.c | 5 - drivers/net/wireless/ath/carl9170/fw.c | 3 +- drivers/net/wireless/ath/carl9170/led.c | 2 +- drivers/net/wireless/ath/carl9170/main.c | 7 +- drivers/net/wireless/b43/main.c | 8 +- drivers/net/wireless/b43legacy/main.c | 8 +- .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 5 +- drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +- drivers/net/wireless/cw1200/sta.c | 10 +- drivers/net/wireless/iwlegacy/3945-mac.c | 4 +- drivers/net/wireless/iwlegacy/4965-mac.c | 4 +- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 8 +- drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 2 +- drivers/net/wireless/libertas_tf/main.c | 7 +- drivers/net/wireless/mac80211_hwsim.c | 55 +- drivers/net/wireless/mwl8k.c | 2 +- drivers/net/wireless/p54/fwio.c | 3 +- drivers/net/wireless/p54/led.c | 2 +- drivers/net/wireless/p54/main.c | 6 +- drivers/net/wireless/rt2x00/rt2400pci.c | 4 +- drivers/net/wireless/rt2x00/rt2500pci.c | 4 +- drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 19 +- drivers/net/wireless/rt2x00/rt2800lib.h | 5 +- drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- drivers/net/wireless/rt2x00/rt2800soc.c | 2 +- drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +- drivers/net/wireless/rt2x00/rt61pci.c | 4 +- drivers/net/wireless/rt2x00/rt73usb.c | 4 +- drivers/net/wireless/rtlwifi/core.h | 3 +- drivers/net/wireless/ti/wl1251/main.c | 9 +- drivers/net/wireless/ti/wlcore/main.c | 6 +- drivers/net/wireless/zd1211rw/zd_mac.c | 4 +- drivers/staging/vt6655/device_main.c | 11 +- drivers/staging/vt6656/main_usb.c | 11 +- fs/afs/rxrpc.c | 2 +- fs/dlm/lowcomms.c | 16 +- include/linux/etherdevice.h | 42 +- include/linux/filter.h | 10 +- include/linux/if_pppox.h | 2 +- include/linux/if_vlan.h | 2 +- include/linux/igmp.h | 1 + include/linux/net.h | 3 +- include/linux/netdevice.h | 4 + include/linux/netlink.h | 2 + include/linux/skbuff.h | 5 + include/linux/tcp.h | 8 + include/net/addrconf.h | 1 + include/net/af_vsock.h | 2 +- include/net/bond_options.h | 3 + include/net/bonding.h | 3 + include/net/cfg80211.h | 4 +- include/net/codel.h | 12 +- include/net/dst.h | 6 - include/net/flow_keys.h | 16 + include/net/inet_common.h | 2 +- include/net/ip6_fib.h | 41 +- include/net/ipv6.h | 9 +- include/net/llc_conn.h | 2 +- include/net/mac80211.h | 161 +++--- include/net/net_namespace.h | 2 + include/net/netns/ipv6.h | 1 + include/net/request_sock.h | 4 +- include/net/sch_generic.h | 8 - include/net/sock.h | 21 +- include/net/tcp.h | 29 +- include/uapi/linux/can.h | 6 + include/uapi/linux/if_link.h | 3 + include/uapi/linux/netlink.h | 1 + include/uapi/linux/nl80211.h | 28 +- include/uapi/linux/pkt_cls.h | 5 + include/uapi/linux/pkt_sched.h | 4 + include/uapi/linux/snmp.h | 2 + include/uapi/linux/tcp.h | 2 + kernel/seccomp.c | 70 +-- lib/rhashtable.c | 8 +- lib/test_bpf.c | 15 +- lib/test_rhashtable.c | 215 ++++--- net/appletalk/ddp.c | 2 +- net/atm/common.c | 4 +- net/atm/common.h | 2 +- net/atm/pvc.c | 2 +- net/atm/svc.c | 2 +- net/ax25/af_ax25.c | 4 +- net/bluetooth/bnep/sock.c | 2 +- net/bluetooth/cmtp/sock.c | 2 +- net/bluetooth/hci_sock.c | 2 +- net/bluetooth/hidp/sock.c | 2 +- net/bluetooth/l2cap_sock.c | 10 +- net/bluetooth/rfcomm/core.c | 2 +- net/bluetooth/rfcomm/sock.c | 8 +- net/bluetooth/sco.c | 8 +- net/bridge/br_multicast.c | 238 +------- net/bridge/br_private.h | 4 +- net/bridge/netfilter/ebtables.c | 2 +- net/caif/caif_socket.c | 2 +- net/can/af_can.c | 2 +- net/ceph/messenger.c | 4 +- net/core/dev.c | 59 +- net/core/filter.c | 82 ++- net/core/flow_dissector.c | 65 ++- net/core/net_namespace.c | 132 +++-- net/core/pktgen.c | 85 ++- net/core/rtnetlink.c | 2 +- net/core/skbuff.c | 87 +++ net/core/sock.c | 30 +- net/core/stream.c | 6 +- net/decnet/af_decnet.c | 8 +- net/dsa/slave.c | 14 +- net/ethernet/eth.c | 7 +- net/ieee802154/socket.c | 2 +- net/ipv4/af_inet.c | 6 +- net/ipv4/fib_semantics.c | 4 - net/ipv4/igmp.c | 162 ++++++ net/ipv4/ip_tunnel_core.c | 2 +- net/ipv4/proc.c | 2 + net/ipv4/route.c | 23 +- net/ipv4/tcp.c | 35 ++ net/ipv4/tcp_input.c | 106 ++-- net/ipv4/tcp_ipv4.c | 1 + net/ipv4/tcp_minisocks.c | 3 + net/ipv4/tcp_output.c | 15 +- net/ipv4/tcp_timer.c | 2 +- net/ipv4/udp_tunnel.c | 8 +- net/ipv6/Makefile | 1 + net/ipv6/addrconf.c | 2 + net/ipv6/af_inet6.c | 3 +- net/ipv6/ip6_flowlabel.c | 4 + net/ipv6/ip6_udp_tunnel.c | 6 +- net/ipv6/mcast_snoop.c | 213 +++++++ net/ipv6/route.c | 176 +++--- net/ipv6/sysctl_net_ipv6.c | 8 + net/ipv6/xfrm6_policy.c | 14 - net/ipx/af_ipx.c | 2 +- net/irda/af_irda.c | 2 +- net/iucv/af_iucv.c | 10 +- net/key/af_key.c | 2 +- net/l2tp/l2tp_core.c | 15 +- net/l2tp/l2tp_ppp.c | 4 +- net/llc/af_llc.c | 2 +- net/llc/llc_conn.c | 6 +- net/mac80211/Kconfig | 16 +- net/mac80211/cfg.c | 117 ++-- net/mac80211/chan.c | 6 + net/mac80211/debugfs.c | 74 +-- net/mac80211/debugfs_sta.c | 85 --- net/mac80211/driver-ops.h | 11 +- net/mac80211/ethtool.c | 3 +- net/mac80211/ieee80211_i.h | 35 +- net/mac80211/iface.c | 64 ++- net/mac80211/key.c | 12 +- net/mac80211/key.h | 3 +- net/mac80211/led.c | 256 ++++++--- net/mac80211/led.h | 44 +- net/mac80211/main.c | 15 +- net/mac80211/mesh_plink.c | 37 +- net/mac80211/mlme.c | 57 +- net/mac80211/rate.c | 8 +- net/mac80211/rate.h | 14 +- net/mac80211/rx.c | 201 +++---- net/mac80211/sta_info.c | 10 +- net/mac80211/sta_info.h | 41 +- net/mac80211/status.c | 28 +- net/mac80211/trace.h | 42 +- net/mac80211/tx.c | 528 ++++++++++++++++- net/netfilter/ipvs/ip_vs_sync.c | 30 +- net/netlink/af_netlink.c | 132 +++-- net/netrom/af_netrom.c | 4 +- net/nfc/af_nfc.c | 2 +- net/nfc/llcp.h | 2 +- net/nfc/llcp_core.c | 2 +- net/nfc/llcp_sock.c | 8 +- net/nfc/nfc.h | 2 +- net/nfc/rawsock.c | 4 +- net/openvswitch/datapath.c | 2 +- net/openvswitch/flow.c | 4 +- net/openvswitch/flow_netlink.c | 2 +- net/packet/af_packet.c | 2 +- net/phonet/af_phonet.c | 2 +- net/phonet/pep.c | 2 +- net/rds/af_rds.c | 2 +- net/rose/af_rose.c | 4 +- net/rxrpc/af_rxrpc.c | 2 +- net/rxrpc/ar-local.c | 4 +- net/sched/act_api.c | 5 - net/sched/act_pedit.c | 5 +- net/sched/sch_choke.c | 14 +- net/sched/sch_codel.c | 15 +- net/sched/sch_fq_codel.c | 26 +- net/sched/sch_hhf.c | 19 +- net/sched/sch_ingress.c | 59 +- net/sched/sch_netem.c | 4 +- net/sched/sch_sfb.c | 24 +- net/sched/sch_sfq.c | 27 +- net/sctp/ipv6.c | 2 +- net/sctp/protocol.c | 2 +- net/socket.c | 7 +- net/tipc/bcast.c | 21 + net/tipc/bcast.h | 1 + net/tipc/bearer.c | 2 +- net/tipc/core.c | 4 +- net/tipc/link.c | 66 ++- net/tipc/name_table.c | 34 +- net/tipc/netlink_compat.c | 137 ++++- net/tipc/server.c | 4 + net/tipc/socket.c | 2 +- net/tipc/subscr.c | 242 ++++---- net/tipc/subscr.h | 18 +- net/unix/af_unix.c | 8 +- net/vmw_vsock/af_vsock.c | 7 +- net/vmw_vsock/vmci_transport.c | 2 +- net/wireless/chan.c | 65 ++- net/wireless/nl80211.c | 7 +- net/wireless/reg.c | 4 +- net/x25/af_x25.c | 8 +- 331 files changed, 8065 insertions(+), 4282 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-drivers-janz-cmodio create mode 100644 Documentation/ABI/testing/sysfs-class-net-janz-ican3 create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h create mode 100644 drivers/net/ethernet/sfc/ef10_sriov.c create mode 100644 drivers/net/ethernet/sfc/ef10_sriov.h create mode 100644 drivers/net/ethernet/sfc/siena_sriov.h create mode 100644 drivers/net/ethernet/sfc/sriov.c create mode 100644 drivers/net/ethernet/sfc/sriov.h create mode 100644 net/ipv6/mcast_snoop.c Merging ipsec-next/master (de2ad486cb6c xfrm: move the checking for old xfrm_policy hold_queue to beginning) $ git merge ipsec-next/master Auto-merging net/xfrm/xfrm_state.c Merge made by the 'recursive' strategy. net/xfrm/xfrm_input.c | 12 ++++++------ net/xfrm/xfrm_policy.c | 31 ++++++++++++------------------- net/xfrm/xfrm_state.c | 4 ++-- 3 files changed, 20 insertions(+), 27 deletions(-) Merging wireless-drivers-next/master (6e65104504fe brcmfmac: check result of USB firmware request) $ git merge wireless-drivers-next/master Resolved 'drivers/net/wireless/ath/ath10k/mac.c' using previous resolution. Auto-merging drivers/net/wireless/ti/wlcore/main.c Auto-merging drivers/net/wireless/ath/ath10k/mac.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/mac.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9e2a3ec1985b] Merge remote-tracking branch 'wireless-drivers-next/master' $ git diff -M --stat --summary HEAD^.. drivers/bcma/driver_gpio.c | 20 +- drivers/net/wireless/ath/ath.h | 2 + drivers/net/wireless/ath/ath10k/Makefile | 4 +- drivers/net/wireless/ath/ath10k/core.c | 161 +- drivers/net/wireless/ath/ath10k/core.h | 48 +- drivers/net/wireless/ath/ath10k/debug.c | 127 +- drivers/net/wireless/ath/ath10k/htc.c | 50 +- drivers/net/wireless/ath/ath10k/htt.c | 98 + drivers/net/wireless/ath/ath10k/htt.h | 132 +- drivers/net/wireless/ath/ath10k/htt_rx.c | 194 +- drivers/net/wireless/ath/ath10k/htt_tx.c | 34 +- drivers/net/wireless/ath/ath10k/hw.h | 53 +- drivers/net/wireless/ath/ath10k/mac.c | 2819 +++++++++++++++----- drivers/net/wireless/ath/ath10k/mac.h | 29 + drivers/net/wireless/ath/ath10k/p2p.c | 156 ++ drivers/net/wireless/ath/ath10k/p2p.h | 28 + drivers/net/wireless/ath/ath10k/pci.c | 101 +- drivers/net/wireless/ath/ath10k/rx_desc.h | 22 + drivers/net/wireless/ath/ath10k/thermal.c | 134 +- drivers/net/wireless/ath/ath10k/thermal.h | 10 +- drivers/net/wireless/ath/ath10k/trace.h | 22 +- drivers/net/wireless/ath/ath10k/txrx.c | 9 +- drivers/net/wireless/ath/ath10k/wmi-ops.h | 194 +- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 579 +++- drivers/net/wireless/ath/ath10k/wmi-tlv.h | 168 ++ drivers/net/wireless/ath/ath10k/wmi.c | 272 +- drivers/net/wireless/ath/ath10k/wmi.h | 230 +- drivers/net/wireless/ath/ath10k/wow.c | 321 +++ drivers/net/wireless/ath/ath10k/wow.h | 40 + drivers/net/wireless/ath/ath9k/common-spectral.c | 740 ++++- drivers/net/wireless/ath/ath9k/common-spectral.h | 35 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +- drivers/net/wireless/ath/dfs_pattern_detector.c | 72 +- drivers/net/wireless/ath/dfs_pattern_detector.h | 4 + drivers/net/wireless/ath/dfs_pri_detector.c | 4 + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 18 +- drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 202 +- drivers/net/wireless/brcm80211/brcmfmac/chip.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/feature.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/feature.h | 4 + drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 189 +- drivers/net/wireless/brcm80211/brcmfmac/firmware.h | 6 + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 27 +- drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 11 +- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 9 +- .../net/wireless/brcm80211/include/brcm_hw_ids.h | 3 + drivers/net/wireless/iwlwifi/Kconfig | 12 +- drivers/net/wireless/iwlwifi/iwl-7000.c | 23 + drivers/net/wireless/iwlwifi/iwl-config.h | 44 + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 8 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 3 + drivers/net/wireless/iwlwifi/mvm/d3.c | 7 +- drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 56 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 7 - drivers/net/wireless/iwlwifi/mvm/fw.c | 15 - drivers/net/wireless/iwlwifi/mvm/mac80211.c | 157 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 109 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 9 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 20 +- drivers/net/wireless/iwlwifi/mvm/rs.h | 2 - drivers/net/wireless/iwlwifi/mvm/scan.c | 988 ++++--- drivers/net/wireless/iwlwifi/mvm/tt.c | 40 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 77 +- drivers/net/wireless/mwifiex/join.c | 12 +- drivers/net/wireless/mwifiex/main.c | 11 +- drivers/net/wireless/mwifiex/sta_ioctl.c | 2 + drivers/net/wireless/mwifiex/tdls.c | 2 +- drivers/net/wireless/mwifiex/uap_cmd.c | 2 +- drivers/net/wireless/mwifiex/util.c | 7 +- drivers/net/wireless/mwifiex/wmm.c | 9 + drivers/net/wireless/rtlwifi/rtl8192ee/fw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8723be/fw.c | 2 +- drivers/net/wireless/ti/wl18xx/main.c | 71 +- drivers/net/wireless/ti/wl18xx/reg.h | 1 + drivers/net/wireless/ti/wlcore/main.c | 26 +- 75 files changed, 6729 insertions(+), 2380 deletions(-) create mode 100644 drivers/net/wireless/ath/ath10k/p2p.c create mode 100644 drivers/net/wireless/ath/ath10k/p2p.h create mode 100644 drivers/net/wireless/ath/ath10k/wow.c create mode 100644 drivers/net/wireless/ath/ath10k/wow.h Merging bluetooth/master (1add15646672 ieee802154: trace: fix endian convertion) $ git merge bluetooth/master Already up-to-date. Merging infiniband/for-next (c1c2fef6cfb0 Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1) $ git merge infiniband/for-next Already up-to-date. Merging mtd/master (b787f68c36d4 Linux 4.1-rc1) $ git merge mtd/master Already up-to-date. Merging l2-mtd/master (5844feeaa415 mtd: nand: add common DT init code) $ git merge l2-mtd/master Auto-merging fs/jffs2/fs.c Merge made by the 'recursive' strategy. drivers/mtd/devices/docg3.c | 2 +- drivers/mtd/devices/m25p80.c | 60 ++++++++++++++++----------------------- drivers/mtd/maps/physmap_of.c | 4 +-- drivers/mtd/mtdcore.c | 44 +++++++++++++++------------- drivers/mtd/nand/diskonchip.c | 27 +++++++++++------- drivers/mtd/nand/fsmc_nand.c | 8 +++--- drivers/mtd/nand/mpc5121_nfc.c | 2 +- drivers/mtd/nand/mxc_nand.c | 2 +- drivers/mtd/nand/nand_base.c | 44 ++++++++++++++++++++++++++-- drivers/mtd/nand/nand_bbt.c | 24 +++++++++------- drivers/mtd/nand/pxa3xx_nand.c | 43 +++++++++++++--------------- drivers/mtd/nand/s3c2410.c | 2 +- drivers/mtd/onenand/samsung.c | 2 +- drivers/mtd/spi-nor/fsl-quadspi.c | 2 +- drivers/mtd/spi-nor/spi-nor.c | 4 +++ fs/jffs2/fs.c | 7 ++--- fs/jffs2/readinode.c | 27 +++--------------- include/linux/mtd/nand.h | 6 +++- 18 files changed, 166 insertions(+), 144 deletions(-) Merging crypto/master (6499e8cfaa8f crypto: arm/aes - streamline AES-192 code path) $ git merge crypto/master Auto-merging net/mac802154/llsec.c Auto-merging lib/Makefile Auto-merging lib/Kconfig Auto-merging drivers/crypto/Kconfig Removing arch/arm/crypto/sha512_neon_glue.c Removing arch/arm/crypto/sha512-armv7-neon.S Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/crypto/fsl-sec2.txt | 6 +- MAINTAINERS | 5 +- arch/arm/crypto/Kconfig | 15 +- arch/arm/crypto/Makefile | 10 +- arch/arm/crypto/aes-ce-core.S | 7 +- arch/arm/crypto/sha512-armv4.pl | 649 +++++++ arch/arm/crypto/sha512-armv7-neon.S | 455 ----- arch/arm/crypto/sha512-core.S_shipped | 1861 ++++++++++++++++++++ arch/arm/crypto/sha512-glue.c | 121 ++ arch/arm/crypto/sha512-neon-glue.c | 98 ++ arch/arm/crypto/sha512.h | 8 + arch/arm/crypto/sha512_neon_glue.c | 305 ---- arch/arm64/crypto/aes-ce-ccm-glue.c | 2 +- arch/powerpc/include/asm/icswx.h | 184 ++ arch/powerpc/include/asm/ppc-opcode.h | 13 + arch/powerpc/kernel/prom.c | 1 + arch/x86/crypto/sha-mb/sha1_mb.c | 3 +- crypto/842.c | 174 +- crypto/Kconfig | 7 +- crypto/ablkcipher.c | 2 +- crypto/aead.c | 2 +- crypto/algapi.c | 14 +- crypto/algif_aead.c | 1 + crypto/algif_rng.c | 2 +- crypto/ansi_cprng.c | 88 +- crypto/drbg.c | 380 ++-- crypto/fips.c | 53 +- crypto/internal.h | 3 +- crypto/krng.c | 33 +- crypto/pcompress.c | 7 +- crypto/proc.c | 41 - crypto/rng.c | 105 +- crypto/shash.c | 7 +- crypto/tcrypt.c | 9 +- crypto/testmgr.c | 11 + crypto/testmgr.h | 442 ++++- crypto/zlib.c | 4 +- drivers/crypto/Kconfig | 28 +- drivers/crypto/caam/caamalg.c | 4 - drivers/crypto/mv_cesa.c | 2 +- drivers/crypto/nx/Kconfig | 55 +- drivers/crypto/nx/Makefile | 6 + drivers/crypto/nx/nx-842-crypto.c | 585 ++++++ drivers/crypto/nx/nx-842-powernv.c | 625 +++++++ drivers/crypto/nx/nx-842-pseries.c | 1128 ++++++++++++ drivers/crypto/nx/nx-842.c | 1623 ++--------------- drivers/crypto/nx/nx-842.h | 131 ++ drivers/crypto/nx/nx-sha256.c | 84 +- drivers/crypto/nx/nx-sha512.c | 85 +- drivers/crypto/nx/nx.c | 69 +- drivers/crypto/nx/nx.h | 2 - drivers/crypto/qat/qat_common/adf_common_drv.h | 7 + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 1 + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 3 +- drivers/crypto/talitos.c | 727 +++++--- drivers/crypto/talitos.h | 153 +- include/crypto/compress.h | 8 +- include/crypto/drbg.h | 54 +- include/crypto/internal/rng.h | 12 +- include/crypto/rng.h | 100 +- include/linux/crypto.h | 42 - include/linux/module.h | 12 + include/linux/nx842.h | 21 +- include/linux/sw842.h | 12 + lib/842/842.h | 127 ++ lib/842/842_compress.c | 626 +++++++ lib/842/842_debugfs.h | 52 + lib/842/842_decompress.c | 405 +++++ lib/842/Makefile | 2 + lib/Kconfig | 6 + lib/Makefile | 2 + net/mac80211/aes_ccm.c | 3 +- net/mac80211/aes_gcm.c | 3 +- net/mac80211/aes_gmac.c | 2 +- net/mac802154/llsec.c | 3 +- 75 files changed, 8568 insertions(+), 3370 deletions(-) create mode 100644 arch/arm/crypto/sha512-armv4.pl delete mode 100644 arch/arm/crypto/sha512-armv7-neon.S create mode 100644 arch/arm/crypto/sha512-core.S_shipped create mode 100644 arch/arm/crypto/sha512-glue.c create mode 100644 arch/arm/crypto/sha512-neon-glue.c create mode 100644 arch/arm/crypto/sha512.h delete mode 100644 arch/arm/crypto/sha512_neon_glue.c create mode 100644 arch/powerpc/include/asm/icswx.h create mode 100644 drivers/crypto/nx/nx-842-crypto.c create mode 100644 drivers/crypto/nx/nx-842-powernv.c create mode 100644 drivers/crypto/nx/nx-842-pseries.c create mode 100644 drivers/crypto/nx/nx-842.h create mode 100644 include/linux/sw842.h create mode 100644 lib/842/842.h create mode 100644 lib/842/842_compress.c create mode 100644 lib/842/842_debugfs.h create mode 100644 lib/842/842_decompress.c create mode 100644 lib/842/Makefile Merging drm/drm-next (e1dee1973c74 Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next) $ git merge drm/drm-next Resolved 'drivers/gpu/drm/drm_irq.c' using previous resolution. Auto-merging drivers/gpu/drm/i915/intel_lvds.c Auto-merging drivers/gpu/drm/i915/intel_dp.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/drm_irq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_irq.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a459daf87c90] Merge remote-tracking branch 'drm/drm-next' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/drm.tmpl | 4 +- arch/x86/kernel/early-quirks.c | 1 + drivers/gpu/drm/drm_atomic_helper.c | 9 +- drivers/gpu/drm/drm_auth.c | 178 +--- drivers/gpu/drm/drm_crtc.c | 23 + drivers/gpu/drm/drm_dp_helper.c | 12 +- drivers/gpu/drm/drm_drv.c | 20 +- drivers/gpu/drm/drm_fops.c | 7 +- drivers/gpu/drm/drm_internal.h | 1 - drivers/gpu/drm/drm_irq.c | 102 ++- drivers/gpu/drm/drm_modeset_lock.c | 8 +- drivers/gpu/drm/drm_probe_helper.c | 4 +- drivers/gpu/drm/i915/dvo_ivch.c | 21 +- drivers/gpu/drm/i915/dvo_ns2501.c | 670 +++++++------- drivers/gpu/drm/i915/i915_cmd_parser.c | 12 +- drivers/gpu/drm/i915/i915_debugfs.c | 460 +++++++--- drivers/gpu/drm/i915/i915_dma.c | 270 +++--- drivers/gpu/drm/i915/i915_drv.c | 68 +- drivers/gpu/drm/i915/i915_drv.h | 171 ++-- drivers/gpu/drm/i915/i915_gem.c | 236 ++--- drivers/gpu/drm/i915/i915_gem_batch_pool.c | 84 +- drivers/gpu/drm/i915/i915_gem_batch_pool.h | 42 + drivers/gpu/drm/i915/i915_gem_context.c | 37 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 50 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 1046 +++++++++++----------- drivers/gpu/drm/i915/i915_gem_gtt.h | 101 ++- drivers/gpu/drm/i915/i915_gem_shrinker.c | 8 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 10 +- drivers/gpu/drm/i915/i915_irq.c | 282 +++--- drivers/gpu/drm/i915/i915_reg.h | 489 ++++++++++- drivers/gpu/drm/i915/i915_trace.h | 44 +- drivers/gpu/drm/i915/intel_atomic.c | 173 ++++ drivers/gpu/drm/i915/intel_atomic_plane.c | 28 +- drivers/gpu/drm/i915/intel_audio.c | 4 +- drivers/gpu/drm/i915/intel_bios.c | 30 +- drivers/gpu/drm/i915/intel_bios.h | 4 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 763 +++++++++++++--- drivers/gpu/drm/i915/intel_display.c | 1295 ++++++++++++++++++++++------ drivers/gpu/drm/i915/intel_dp.c | 215 ++++- drivers/gpu/drm/i915/intel_dp_mst.c | 14 +- drivers/gpu/drm/i915/intel_drv.h | 105 ++- drivers/gpu/drm/i915/intel_dvo.c | 27 +- drivers/gpu/drm/i915/intel_frontbuffer.c | 2 + drivers/gpu/drm/i915/intel_hdmi.c | 30 +- drivers/gpu/drm/i915/intel_i2c.c | 97 ++- drivers/gpu/drm/i915/intel_lrc.c | 502 +++++------ drivers/gpu/drm/i915/intel_lrc.h | 5 +- drivers/gpu/drm/i915/intel_lvds.c | 4 +- drivers/gpu/drm/i915/intel_overlay.c | 66 +- drivers/gpu/drm/i915/intel_pm.c | 115 ++- drivers/gpu/drm/i915/intel_psr.c | 118 ++- drivers/gpu/drm/i915/intel_ringbuffer.c | 121 +-- drivers/gpu/drm/i915/intel_ringbuffer.h | 10 + drivers/gpu/drm/i915/intel_runtime_pm.c | 121 +++ drivers/gpu/drm/i915/intel_sdvo.c | 5 +- drivers/gpu/drm/i915/intel_sprite.c | 80 +- drivers/gpu/drm/i915/intel_uncore.c | 98 ++- drivers/gpu/drm/qxl/qxl_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_fb.c | 275 ++---- include/drm/drmP.h | 14 +- include/drm/drm_crtc.h | 1 + include/drm/i915_pciids.h | 6 + include/uapi/drm/i915_drm.h | 1 + 66 files changed, 5911 insertions(+), 2896 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h Merging drm-panel/drm/panel/for-next (1c550fa193d0 drm/panel: Add support for Ampire AM-800480R3TMQW-A1H 800x480 7" panel) $ git merge drm-panel/drm/panel/for-next Already up-to-date. Merging drm-intel/for-linux-next (c0c7e68899d7 drm/i915: Fix race on unreferencing the wrong mmio-flip-request) $ git merge drm-intel/for-linux-next Auto-merging drivers/gpu/drm/i915/intel_dp.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/i915_drv.c Merge made by the 'recursive' strategy. drivers/gpu/drm/drm_atomic_helper.c | 5 + drivers/gpu/drm/drm_edid.c | 32 +- drivers/gpu/drm/drm_edid_load.c | 7 +- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_debugfs.c | 240 +++- drivers/gpu/drm/i915/i915_dma.c | 11 +- drivers/gpu/drm/i915/i915_drv.c | 64 +- drivers/gpu/drm/i915/i915_drv.h | 55 +- drivers/gpu/drm/i915/i915_gem.c | 201 +-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 32 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 87 +- drivers/gpu/drm/i915/i915_gem_gtt.h | 20 +- drivers/gpu/drm/i915/i915_gpu_error.c | 1 + drivers/gpu/drm/i915/i915_params.c | 8 + drivers/gpu/drm/i915/i915_reg.h | 100 +- drivers/gpu/drm/i915/intel_atomic.c | 13 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 20 +- drivers/gpu/drm/i915/intel_audio.c | 20 +- drivers/gpu/drm/i915/intel_bios.c | 9 +- drivers/gpu/drm/i915/intel_csr.c | 414 +++++++ drivers/gpu/drm/i915/intel_ddi.c | 101 +- drivers/gpu/drm/i915/intel_display.c | 1840 +++++++++++++--------------- drivers/gpu/drm/i915/intel_dp.c | 151 ++- drivers/gpu/drm/i915/intel_dp_mst.c | 13 +- drivers/gpu/drm/i915/intel_drv.h | 61 +- drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 46 +- drivers/gpu/drm/i915/intel_lrc.c | 13 +- drivers/gpu/drm/i915/intel_panel.c | 87 +- drivers/gpu/drm/i915/intel_pm.c | 165 +-- drivers/gpu/drm/i915/intel_ringbuffer.c | 67 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 255 +++- drivers/gpu/drm/i915/intel_sdvo.c | 6 +- drivers/gpu/drm/i915/intel_sprite.c | 266 +--- include/drm/drm_crtc.h | 9 +- 35 files changed, 2827 insertions(+), 1597 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_csr.c Merging drm-tegra/drm/tegra/for-next (535a65db484f drm/tegra: sor: Reset during initialization) $ git merge drm-tegra/drm/tegra/for-next Already up-to-date. Merging drm-misc/topic/drm-misc (9a6e1b1181b4 drm/prime: Allow internal imports without import_sg_table) $ git merge drm-misc/topic/drm-misc Auto-merging include/drm/drm_crtc.h Auto-merging drivers/gpu/drm/drm_edid.c Auto-merging drivers/gpu/drm/drm_crtc.c Merge made by the 'recursive' strategy. drivers/gpu/drm/drm_crtc.c | 326 +++++++++++++++++++++++++++++++------- drivers/gpu/drm/drm_crtc_helper.c | 7 +- drivers/gpu/drm/drm_edid.c | 202 +++++++++++++---------- drivers/gpu/drm/drm_prime.c | 6 +- include/drm/drm_crtc.h | 20 ++- 5 files changed, 405 insertions(+), 156 deletions(-) Merging drm-exynos/exynos-drm/for-next (477bb8da58e4 drm/exynos: 'win' is always unsigned) $ git merge drm-exynos/exynos-drm/for-next Removing drivers/gpu/drm/exynos/exynos_drm_fimd.h Merge made by the 'recursive' strategy. drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 +- drivers/gpu/drm/exynos/exynos_dp_core.c | 11 +++-- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 ++--- drivers/gpu/drm/exynos/exynos_drm_crtc.h | 10 ++--- drivers/gpu/drm/exynos/exynos_drm_drv.h | 7 ++- drivers/gpu/drm/exynos/exynos_drm_fb.c | 39 +--------------- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 53 ++++++++++------------ drivers/gpu/drm/exynos/exynos_drm_fimd.h | 15 ------- drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +- drivers/gpu/drm/exynos/exynos_mixer.c | 72 ++++++++++++++++-------------- 11 files changed, 91 insertions(+), 134 deletions(-) delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_fimd.h Merging drm-msm/msm-next (d5af49c92a8a drm/msm/mdp5: Enable DSI connector in msm drm driver) $ git merge drm-msm/msm-next Already up-to-date. Merging sound/for-next (3b90f4072730 ALSA: hda/tegra - Fix oops) $ git merge sound/for-next Auto-merging drivers/gpu/drm/i915/intel_audio.c Auto-merging drivers/gpu/drm/i915/i915_reg.h Merge made by the 'recursive' strategy. Documentation/sound/alsa/Jack-Controls.txt | 43 + drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_audio.c | 27 + include/drm/i915_component.h | 1 + include/sound/control.h | 2 +- include/sound/core.h | 4 - include/sound/hda_register.h | 152 ++++ include/sound/hdaudio.h | 290 +++++- include/sound/info.h | 29 +- include/sound/jack.h | 13 +- include/sound/pcm.h | 5 +- sound/core/Kconfig | 3 - sound/core/Makefile | 11 +- sound/core/ctljack.c | 41 +- sound/core/info.c | 779 +++++++--------- sound/core/info_oss.c | 29 +- sound/core/init.c | 33 +- sound/core/jack.c | 142 ++- sound/core/seq/Makefile | 3 +- sound/core/seq/seq_info.c | 19 +- sound/core/sound.c | 24 +- sound/core/sound_oss.c | 30 +- sound/hda/Kconfig | 3 + sound/hda/Makefile | 2 +- sound/hda/hdac_bus.c | 20 +- sound/hda/hdac_controller.c | 507 +++++++++++ sound/hda/hdac_device.c | 315 +++++++ sound/hda/hdac_stream.c | 686 ++++++++++++++ sound/pci/ad1889.c | 4 +- sound/pci/ali5451/ali5451.c | 4 +- sound/pci/als300.c | 4 +- sound/pci/als4000.c | 4 +- sound/pci/au88x0/au88x0.c | 4 +- sound/pci/aw2/aw2-alsa.c | 4 +- sound/pci/azt3328.c | 4 +- sound/pci/ca0106/ca0106_main.c | 4 +- sound/pci/cs5535audio/cs5535audio.c | 4 +- sound/pci/ctxfi/cthw20k1.c | 4 +- sound/pci/ctxfi/cthw20k2.c | 4 +- sound/pci/emu10k1/emu10k1_main.c | 4 +- sound/pci/es1938.c | 4 +- sound/pci/es1968.c | 4 +- sound/pci/hda/Kconfig | 13 +- sound/pci/hda/Makefile | 3 +- sound/pci/hda/hda_codec.c | 425 +-------- sound/pci/hda/hda_codec.h | 82 +- sound/pci/hda/hda_controller.c | 1341 ++++++---------------------- sound/pci/hda/hda_controller.h | 272 +----- sound/pci/hda/hda_i915.c | 39 +- sound/pci/hda/hda_intel.c | 309 ++++--- sound/pci/hda/hda_intel.h | 10 +- sound/pci/hda/hda_intel_trace.h | 4 +- sound/pci/hda/hda_jack.c | 90 +- sound/pci/hda/hda_jack.h | 5 +- sound/pci/hda/hda_tegra.c | 76 +- sound/pci/hda/patch_ca0132.c | 7 +- sound/pci/hda/patch_hdmi.c | 13 +- sound/pci/ice1712/ice1712.c | 4 +- sound/pci/lx6464es/lx6464es.c | 2 +- sound/pci/maestro3.c | 4 +- sound/pci/mixart/mixart.c | 2 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/pci/pcxhr/pcxhr.c | 2 +- sound/pci/sis7019.c | 10 +- sound/pci/sonicvibes.c | 4 +- sound/pci/trident/trident_main.c | 4 +- sound/soc/soc-jack.c | 3 +- 67 files changed, 3306 insertions(+), 2692 deletions(-) create mode 100644 Documentation/sound/alsa/Jack-Controls.txt create mode 100644 include/sound/hda_register.h create mode 100644 sound/hda/hdac_controller.c create mode 100644 sound/hda/hdac_stream.c Merging sound-asoc/for-next (34d220d6f387 Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/ssm2518', 'asoc/topic/ssm2602', 'asoc/topic/ssm4567' and 'asoc/topic/tas571x' into asoc-next) $ git merge sound-asoc/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/sound/adi,adau1701.txt | 4 + Documentation/devicetree/bindings/sound/gtm601.txt | 13 + .../devicetree/bindings/sound/renesas,rsnd.txt | 2 +- .../devicetree/bindings/sound/tas571x.txt | 41 + MAINTAINERS | 6 + include/sound/dmaengine_pcm.h | 5 - include/sound/rt5645.h | 3 - include/sound/soc-dapm.h | 39 + include/sound/soc.h | 104 +- sound/soc/atmel/atmel-pcm-dma.c | 3 +- sound/soc/atmel/sam9g20_wm8731.c | 10 +- sound/soc/au1x/db1200.c | 2 +- sound/soc/cirrus/ep93xx-pcm.c | 1 - sound/soc/codecs/88pm860x-codec.c | 3 +- sound/soc/codecs/Kconfig | 7 +- sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ab8500-codec.c | 20 +- sound/soc/codecs/ad1836.c | 2 +- sound/soc/codecs/adau1373.c | 1 - sound/soc/codecs/adau1701.c | 126 ++- sound/soc/codecs/adau1761.c | 27 +- sound/soc/codecs/adau1781.c | 10 +- sound/soc/codecs/adau17x1.c | 20 +- sound/soc/codecs/adau1977.c | 14 +- sound/soc/codecs/adav80x.c | 11 +- sound/soc/codecs/ak4535.c | 1 - sound/soc/codecs/ak4641.c | 3 +- sound/soc/codecs/ak4642.c | 1 - sound/soc/codecs/ak4671.c | 1 - sound/soc/codecs/alc5623.c | 1 - sound/soc/codecs/alc5632.c | 1 - sound/soc/codecs/arizona.h | 4 +- sound/soc/codecs/bt-sco.c | 2 +- sound/soc/codecs/cq93vc.c | 1 - sound/soc/codecs/cs35l32.c | 1 - sound/soc/codecs/cs4265.c | 1 - sound/soc/codecs/cs42l52.c | 1 - sound/soc/codecs/cs42l56.c | 1 - sound/soc/codecs/cs42l73.c | 1 - sound/soc/codecs/cx20442.c | 6 +- sound/soc/codecs/da7213.c | 1 - sound/soc/codecs/da732x.c | 2 - sound/soc/codecs/da9055.c | 1 - sound/soc/codecs/es8328.c | 3 +- sound/soc/codecs/isabelle.c | 2 - sound/soc/codecs/jz4740.c | 4 +- sound/soc/codecs/lm4857.c | 114 +- sound/soc/codecs/lm49453.c | 2 - sound/soc/codecs/max98088.c | 1 - sound/soc/codecs/max98090.c | 1 - sound/soc/codecs/max98095.c | 5 +- sound/soc/codecs/max9850.c | 1 - sound/soc/codecs/mc13783.c | 4 +- sound/soc/codecs/ml26124.c | 3 +- sound/soc/codecs/pcm512x.c | 2 - sound/soc/codecs/rt286.c | 1 - sound/soc/codecs/rt5631.c | 1 - sound/soc/codecs/rt5640.c | 5 +- sound/soc/codecs/rt5645.c | 810 +++++++++++--- sound/soc/codecs/rt5645.h | 30 +- sound/soc/codecs/rt5651.c | 3 +- sound/soc/codecs/rt5670.c | 1 - sound/soc/codecs/rt5677.c | 114 +- sound/soc/codecs/rt5677.h | 14 + sound/soc/codecs/sgtl5000.c | 56 +- sound/soc/codecs/sirf-audio-codec.c | 2 +- sound/soc/codecs/sn95031.c | 1 - sound/soc/codecs/ssm2518.c | 9 +- sound/soc/codecs/ssm2602.c | 5 +- sound/soc/codecs/ssm4567.c | 9 +- sound/soc/codecs/sta32x.c | 3 +- sound/soc/codecs/sta350.c | 3 +- sound/soc/codecs/sta529.c | 6 - sound/soc/codecs/stac9766.c | 1 - sound/soc/codecs/tas571x.c | 514 +++++++++ sound/soc/codecs/tas571x.h | 33 + sound/soc/codecs/tlv320aic23.c | 1 - sound/soc/codecs/tlv320aic31xx.c | 1 - sound/soc/codecs/tlv320aic32x4.c | 1 - sound/soc/codecs/tlv320aic3x.c | 1 - sound/soc/codecs/tlv320dac33.c | 1 - sound/soc/codecs/twl4030.c | 1 - sound/soc/codecs/twl6040.c | 4 +- sound/soc/codecs/uda134x.c | 4 +- sound/soc/codecs/uda1380.c | 8 +- sound/soc/codecs/wm0010.c | 2 - sound/soc/codecs/wm1250-ev1.c | 2 - sound/soc/codecs/wm8350.c | 1 - sound/soc/codecs/wm8400.c | 1 - sound/soc/codecs/wm8510.c | 1 - sound/soc/codecs/wm8523.c | 1 - sound/soc/codecs/wm8580.c | 1 - sound/soc/codecs/wm8711.c | 1 - sound/soc/codecs/wm8728.c | 1 - sound/soc/codecs/wm8731.c | 3 +- sound/soc/codecs/wm8737.c | 3 +- sound/soc/codecs/wm8750.c | 1 - sound/soc/codecs/wm8753.c | 1 - sound/soc/codecs/wm8770.c | 1 - sound/soc/codecs/wm8776.c | 1 - sound/soc/codecs/wm8900.c | 7 +- sound/soc/codecs/wm8903.c | 2 - sound/soc/codecs/wm8904.c | 1 - sound/soc/codecs/wm8940.c | 4 +- sound/soc/codecs/wm8955.c | 3 +- sound/soc/codecs/wm8960.c | 4 - sound/soc/codecs/wm8961.c | 2 - sound/soc/codecs/wm8962.c | 1 - sound/soc/codecs/wm8971.c | 1 - sound/soc/codecs/wm8974.c | 1 - sound/soc/codecs/wm8978.c | 5 +- sound/soc/codecs/wm8983.c | 1 - sound/soc/codecs/wm8985.c | 1 - sound/soc/codecs/wm8988.c | 1 - sound/soc/codecs/wm8990.c | 3 +- sound/soc/codecs/wm8991.c | 1 - sound/soc/codecs/wm8993.c | 6 +- sound/soc/codecs/wm8994.c | 4 +- sound/soc/codecs/wm8995.c | 1 - sound/soc/codecs/wm8996.c | 2 - sound/soc/codecs/wm9081.c | 2 - sound/soc/codecs/wm9090.c | 2 - sound/soc/codecs/wm9712.c | 3 +- sound/soc/codecs/wm9713.c | 3 +- sound/soc/codecs/wm_adsp.c | 1132 ++++++++++++-------- sound/soc/codecs/wm_adsp.h | 6 +- sound/soc/codecs/wmfw.h | 44 +- sound/soc/davinci/davinci-mcasp.c | 169 +-- sound/soc/fsl/fsl_dma.c | 4 +- sound/soc/fsl/fsl_sai.c | 3 +- sound/soc/fsl/fsl_ssi.c | 7 - sound/soc/fsl/imx-audmux.c | 2 +- sound/soc/fsl/imx-mc13783.c | 6 +- sound/soc/generic/simple-card.c | 16 +- sound/soc/intel/Kconfig | 16 +- sound/soc/intel/atom/sst-atom-controls.c | 167 ++- sound/soc/intel/atom/sst-atom-controls.h | 9 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 47 +- sound/soc/intel/atom/sst-mfld-platform.h | 2 + sound/soc/intel/atom/sst/sst_acpi.c | 4 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 318 ++++++ sound/soc/intel/boards/cht_bsw_rt5645.c | 118 +- sound/soc/omap/omap-twl4030.c | 3 +- sound/soc/pxa/brownstone.c | 25 +- sound/soc/pxa/poodle.c | 19 +- sound/soc/pxa/tosa.c | 13 +- sound/soc/pxa/z2.c | 9 +- sound/soc/qcom/lpass-cpu.c | 10 +- sound/soc/qcom/lpass-platform.c | 6 - sound/soc/samsung/Kconfig | 15 +- sound/soc/samsung/i2s.c | 2 +- sound/soc/samsung/lowland.c | 2 +- sound/soc/samsung/smartq_wm8987.c | 6 +- sound/soc/samsung/smdk_wm8994.c | 3 +- sound/soc/samsung/speyside.c | 2 +- sound/soc/sh/rcar/core.c | 34 +- sound/soc/sh/rcar/ssi.c | 52 +- sound/soc/soc-dapm.c | 273 ++++- sound/soc/soc-generic-dmaengine-pcm.c | 25 +- sound/soc/ux500/ux500_pcm.c | 1 - 161 files changed, 3618 insertions(+), 1327 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/gtm601.txt create mode 100644 Documentation/devicetree/bindings/sound/tas571x.txt create mode 100644 sound/soc/codecs/tas571x.c create mode 100644 sound/soc/codecs/tas571x.h create mode 100644 sound/soc/intel/boards/cht_bsw_max98090_ti.c Merging modules/modules-next (4a3893d069b7 modpost: don't emit section mismatch warnings for compiler optimizations) $ git merge modules/modules-next Already up-to-date. Merging input/next (4d10da13467e Input: add TI drv2665 haptics driver) $ git merge input/next Merge made by the 'recursive' strategy. .../devicetree/bindings/input/ti,drv2665.txt | 17 ++ drivers/input/ff-core.c | 2 +- drivers/input/keyboard/adp5589-keys.c | 6 +- drivers/input/keyboard/samsung-keypad.c | 2 +- drivers/input/misc/Kconfig | 13 +- drivers/input/misc/Makefile | 1 + drivers/input/misc/drv2665.c | 322 +++++++++++++++++++++ drivers/input/touchscreen/goodix.c | 3 + drivers/input/touchscreen/s3c2410_ts.c | 2 +- drivers/input/touchscreen/stmpe-ts.c | 2 +- 10 files changed, 362 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/ti,drv2665.txt create mode 100644 drivers/input/misc/drv2665.c Merging block/for-next (a66bcf6fe8e5 Merge branch 'for-4.2/core' into for-next) $ git merge block/for-next Auto-merging include/linux/blk_types.h Removing include/asm-generic/scatterlist.h Auto-merging drivers/block/loop.c Auto-merging block/blk-mq.c Auto-merging block/blk-core.c Merge made by the 'recursive' strategy. arch/alpha/include/asm/pci.h | 2 +- arch/arm/include/asm/dma.h | 2 +- arch/arm/mach-footbridge/dma.c | 2 +- arch/blackfin/include/asm/pci.h | 2 +- arch/cris/include/asm/dma-mapping.h | 2 +- arch/cris/include/asm/pci.h | 2 +- arch/frv/include/asm/dma-mapping.h | 2 +- arch/frv/include/asm/pci.h | 2 +- arch/ia64/include/asm/pci.h | 2 +- arch/microblaze/include/asm/pci.h | 2 +- arch/mips/include/asm/dma-mapping.h | 2 +- arch/mips/include/asm/pci.h | 2 +- arch/mn10300/include/asm/pci.h | 2 +- arch/parisc/include/asm/dma-mapping.h | 2 +- arch/parisc/include/asm/pci.h | 2 +- arch/powerpc/include/asm/pci.h | 2 +- arch/powerpc/include/asm/vio.h | 2 +- arch/sparc/kernel/iommu_common.h | 2 +- arch/x86/include/asm/pci.h | 2 +- arch/xtensa/include/asm/pci.h | 2 +- block/bio.c | 56 ++++++++++----- block/blk-core.c | 40 +++++++---- block/blk-exec.c | 10 --- block/blk-mq.c | 124 ++++++++++++++++++++++------------ block/blk.h | 5 +- drivers/block/loop.c | 30 ++++---- drivers/block/loop.h | 1 + drivers/block/nbd.c | 50 +++++++------- drivers/block/paride/pd.c | 4 +- drivers/block/sx8.c | 4 +- drivers/block/virtio_blk.c | 6 +- drivers/ide/ide-atapi.c | 10 +-- drivers/ide/ide-cd.c | 10 +-- drivers/ide/ide-cd_ioctl.c | 2 +- drivers/ide/ide-devsets.c | 2 +- drivers/ide/ide-eh.c | 4 +- drivers/ide/ide-floppy.c | 8 +-- drivers/ide/ide-io.c | 12 ++-- drivers/ide/ide-ioctls.c | 2 +- drivers/ide/ide-park.c | 4 +- drivers/ide/ide-pm.c | 56 +++++++++++---- drivers/ide/ide-tape.c | 6 +- drivers/ide/ide-taskfile.c | 2 +- drivers/md/bcache/request.c | 2 +- drivers/md/dm-cache-target.c | 2 +- drivers/md/dm-raid1.c | 2 +- drivers/md/dm-snap.c | 2 +- drivers/md/dm-thin.c | 4 +- drivers/mmc/host/android-goldfish.c | 2 +- fs/btrfs/volumes.c | 2 +- fs/xfs/xfs_aops.c | 1 - include/asm-generic/scatterlist.h | 34 ---------- include/linux/bio.h | 27 +++++++- include/linux/blk_types.h | 6 +- include/linux/blkdev.h | 37 ++-------- include/linux/dmapool.h | 2 +- include/linux/ide.h | 27 ++++++++ include/linux/scatterlist.h | 39 +++++++++-- include/uapi/linux/nbd.h | 2 - kernel/sched/core.c | 5 +- lib/swiotlb.c | 2 +- 61 files changed, 390 insertions(+), 296 deletions(-) delete mode 100644 include/asm-generic/scatterlist.h Merging device-mapper/for-next (cb31ef485dd4 init: fix regression by supporting devices with major:minor:offset format) $ git merge device-mapper/for-next 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 (d689a660983c mmc: cast unsigned int to typeof(sector_t) to avoid unexpected error) $ git merge mmc-uh/next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. .../devicetree/bindings/mmc/arasan,sdhci.txt | 3 +- .../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 4 +- Documentation/devicetree/bindings/mmc/mmc.txt | 5 + MAINTAINERS | 2 +- drivers/mmc/card/block.c | 17 ++- drivers/mmc/card/mmc_test.c | 100 +++-------------- drivers/mmc/card/queue.h | 1 + drivers/mmc/core/core.c | 57 ++++++++-- drivers/mmc/core/core.h | 2 + drivers/mmc/core/host.c | 88 +++++++++++++++ drivers/mmc/core/host.h | 6 ++ drivers/mmc/core/mmc.c | 104 +++++++++++++++++- drivers/mmc/core/mmc_ops.c | 44 +++++--- drivers/mmc/core/mmc_ops.h | 1 + drivers/mmc/core/sd.c | 30 ++++-- drivers/mmc/core/sdio.c | 13 ++- drivers/mmc/host/Kconfig | 1 + drivers/mmc/host/atmel-mci.c | 9 +- drivers/mmc/host/davinci_mmc.c | 2 +- drivers/mmc/host/mxcmmc.c | 6 +- drivers/mmc/host/mxs-mmc.c | 2 +- drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +- drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +- drivers/mmc/host/s3cmci.c | 2 +- drivers/mmc/host/sdhci-esdhc-imx.c | 50 +++++++-- drivers/mmc/host/sdhci-of-arasan.c | 7 ++ drivers/mmc/host/sdhci-of-esdhc.c | 35 ++---- drivers/mmc/host/sdhci-pxav2.c | 4 +- drivers/mmc/host/sdhci-pxav3.c | 4 +- drivers/mmc/host/sdhci-s3c.c | 2 +- drivers/mmc/host/sdhci-sirf.c | 44 +++++++- drivers/mmc/host/sdhci.c | 118 +++------------------ drivers/mmc/host/sdhci.h | 3 - drivers/mmc/host/sdhci_f_sdh30.c | 9 +- drivers/mmc/host/sh_mmcif.c | 90 ++++++++-------- drivers/mmc/host/tmio_mmc.c | 10 +- drivers/mmc/host/tmio_mmc_pio.c | 5 +- include/linux/mmc/host.h | 24 +++++ 38 files changed, 561 insertions(+), 347 deletions(-) Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) $ git merge kgdb/kgdb-next Merge made by the 'recursive' strategy. kernel/debug/kdb/kdb_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging md/for-next (bb27051f9fd7 md/raid5: fix handling of degraded stripes in batches.) $ git merge md/for-next Already up-to-date. Merging mfd/for-mfd-next (74c24e06460e MAINTAINERS: Extend Samsung MFD drivers entry and add Krzysztof Kozlowski) $ git merge mfd/for-mfd-next Auto-merging drivers/rtc/Makefile Auto-merging drivers/rtc/Kconfig Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mfd/max77686.txt | 2 +- Documentation/devicetree/bindings/mfd/max77693.txt | 67 ++++ .../devicetree/bindings/rtc/rtc-st-lpc.txt | 25 ++ .../devicetree/bindings/watchdog/st_lpc_wdt.txt | 38 +++ MAINTAINERS | 10 +- drivers/mfd/88pm860x-core.c | 2 +- drivers/mfd/Kconfig | 6 +- drivers/mfd/ab8500-core.c | 2 +- drivers/mfd/arizona-core.c | 8 - drivers/mfd/arizona-irq.c | 2 +- drivers/mfd/da9052-irq.c | 4 +- drivers/mfd/da9055-core.c | 6 +- drivers/mfd/da9063-irq.c | 4 +- drivers/mfd/da9150-core.c | 4 +- drivers/mfd/db8500-prcmu.c | 2 +- drivers/mfd/intel_soc_pmic_core.h | 2 +- drivers/mfd/intel_soc_pmic_crc.c | 2 +- drivers/mfd/lp8788-irq.c | 2 +- drivers/mfd/max8925-core.c | 2 +- drivers/mfd/max8997-irq.c | 2 +- drivers/mfd/max8998-irq.c | 2 +- drivers/mfd/mt6397-core.c | 2 +- drivers/mfd/stmpe.c | 2 +- drivers/mfd/tc3589x.c | 2 +- drivers/mfd/tps6586x.c | 2 +- drivers/mfd/twl4030-power.c | 45 ++- drivers/mfd/twl6030-irq.c | 2 +- drivers/mfd/wm831x-irq.c | 2 +- drivers/mfd/wm8994-irq.c | 6 +- drivers/rtc/Kconfig | 11 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-st-lpc.c | 354 +++++++++++++++++++++ drivers/watchdog/Kconfig | 12 + drivers/watchdog/Makefile | 1 + drivers/watchdog/st_lpc_wdt.c | 344 ++++++++++++++++++++ include/dt-bindings/mfd/st-lpc.h | 15 + include/linux/i2c/twl.h | 1 + include/linux/mfd/da9055/core.h | 2 +- include/linux/mfd/max77686.h | 5 - 39 files changed, 950 insertions(+), 53 deletions(-) create mode 100644 Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt create mode 100644 Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt create mode 100644 drivers/rtc/rtc-st-lpc.c create mode 100644 drivers/watchdog/st_lpc_wdt.c create mode 100644 include/dt-bindings/mfd/st-lpc.h Merging backlight/for-backlight-next (d57184f49f13 backlight: Allow compile test of GPIO consumers if !GPIOLIB) $ git merge backlight/for-backlight-next Merge made by the 'recursive' strategy. drivers/video/backlight/Kconfig | 8 +++++--- drivers/video/backlight/da9052_bl.c | 2 +- drivers/video/backlight/gpio_backlight.c | 2 ++ drivers/video/fbdev/imxfb.c | 2 +- drivers/video/fbdev/mxsfb.c | 2 +- drivers/video/fbdev/s3c-fb.c | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) Merging battery/master (8ebb7e9c1a50 power: bq27x00_battery: Add missing MODULE_ALIAS) $ git merge battery/master Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 11 +++++++++++ drivers/power/axp288_fuel_gauge.c | 1 + drivers/power/bq27x00_battery.c | 8 ++++++++ drivers/power/collie_battery.c | 2 +- drivers/power/reset/Kconfig | 1 + drivers/power/reset/at91-reset.c | 4 ++-- drivers/power/reset/ltc2952-poweroff.c | 18 +++--------------- 7 files changed, 27 insertions(+), 18 deletions(-) Merging omap_dss2/for-next (72fc8b7187cd Merge branches '4.1/fbdev' and '4.1/omapdss' into for-next) $ git merge omap_dss2/for-next Merge made by the 'recursive' strategy. drivers/video/fbdev/omap2/dss/hdmi4.c | 50 +++++++++++++++++++++++++++++++++++ drivers/video/fbdev/omap2/dss/hdmi5.c | 50 +++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) Merging regulator/for-next (6e8d612d6f2f Merge remote-tracking branches 'regulator/topic/max14577', 'regulator/topic/max77693', 'regulator/topic/max77843' and 'regulator/topic/max8973' into regulator-next) $ git merge regulator/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/regulator/regulator.txt | 2 +- drivers/regulator/88pm8607.c | 2 +- drivers/regulator/Kconfig | 2 +- drivers/regulator/arizona-ldo1.c | 15 +++ drivers/regulator/helpers.c | 2 +- drivers/regulator/max14577.c | 128 ++++++++------------- drivers/regulator/max77686.c | 2 +- drivers/regulator/max77693.c | 17 +-- drivers/regulator/max77843.c | 68 ++++------- drivers/regulator/max8973-regulator.c | 6 +- drivers/regulator/of_regulator.c | 2 +- drivers/regulator/s2mps11.c | 10 +- 12 files changed, 102 insertions(+), 154 deletions(-) Merging security/next (b787f68c36d4 Linux 4.1-rc1) $ git merge security/next Already up-to-date. Merging integrity/next (0ce8300ef0d4 KEYS: fix "ca_keys=" partial key matching) $ git merge integrity/next Auto-merging security/integrity/evm/evm_main.c Merge made by the 'recursive' strategy. Documentation/ABI/testing/ima_policy | 3 +++ crypto/asymmetric_keys/asymmetric_keys.h | 3 +++ crypto/asymmetric_keys/asymmetric_type.c | 20 ++++++++++++++------ crypto/asymmetric_keys/x509_public_key.c | 27 +++++++++++++++++++++++---- security/integrity/evm/evm_main.c | 11 +++++++++++ security/integrity/ima/ima_policy.c | 16 +++++++--------- 6 files changed, 61 insertions(+), 19 deletions(-) Merging selinux/next (6a878464e21a signals: don't abuse __flush_signals() in selinux_bprm_committed_creds()) $ git merge selinux/next Auto-merging security/selinux/hooks.c Auto-merging kernel/signal.c Auto-merging include/linux/sched.h Merge made by the 'recursive' strategy. include/linux/sched.h | 1 - kernel/signal.c | 13 ++++--------- security/selinux/hooks.c | 11 +++++++---- 3 files changed, 11 insertions(+), 14 deletions(-) Merging lblnet/next (b2776bf7149b Linux 3.18) $ git merge lblnet/next Already up-to-date. Merging watchdog/master (fe92a2e35727 watchdog: octeon: use fixed length string for register names) $ git merge watchdog/master Merge made by the 'recursive' strategy. Merging iommu/next (60dcc6f0bcf4 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/exynos' and 'core' into next) $ git merge iommu/next Merge made by the 'recursive' strategy. drivers/iommu/exynos-iommu.c | 1 + drivers/iommu/iova.c | 4 ++++ drivers/iommu/rockchip-iommu.c | 23 +++++++++++++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) Merging dwmw2-iommu/master (4ed6a540fab8 iommu/vt-d: Fix passthrough mode with translation-disabled devices) $ git merge dwmw2-iommu/master Merge made by the 'recursive' strategy. drivers/iommu/intel-iommu.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) Merging vfio/next (5a0ff17741c1 vfio-pci: Fix use after free) $ git merge vfio/next Already up-to-date. Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next (eac6d7a9431f Documentation: tracing: fix grammar) $ git merge jc_docs/docs-next Auto-merging Documentation/kasan.txt Merge made by the 'recursive' strategy. Documentation/CodingStyle | 2 +- Documentation/blackfin/gptimers-example.c | 14 ++++++++++--- Documentation/cputopology.txt | 34 +++++++++++++++++++++++-------- Documentation/filesystems/proc.txt | 3 ++- Documentation/kasan.txt | 2 +- Documentation/magic-number.txt | 2 -- Documentation/trace/ftrace.txt | 4 ++-- Documentation/usb/usb-serial.txt | 12 ++++++----- Documentation/zh_CN/magic-number.txt | 2 -- firmware/README.AddingFirmware | 14 +++++++++++-- 10 files changed, 61 insertions(+), 28 deletions(-) Merging trivial/for-next (0e4f93e5017d goldfish: goldfish_tty_probe() is not using 'i' any more) $ git merge trivial/for-next Already up-to-date. Merging audit/next (39a8804455fb Linux 4.0) $ git merge audit/next Already up-to-date. Merging devicetree/devicetree/next (a2166ca5f320 Merge remote-tracking branch 'robh/for-next' into devicetree/next) $ git merge devicetree/devicetree/next Already up-to-date. Merging dt-rh/for-next (4760597116e3 scripts/dtc: Update to upstream version 9d3649bd3be245c9) $ git merge dt-rh/for-next Merge made by the 'recursive' strategy. arch/arm/boot/compressed/libfdt_env.h | 4 + arch/powerpc/boot/libfdt_env.h | 4 + arch/powerpc/boot/of.h | 2 + include/linux/libfdt_env.h | 4 + scripts/dtc/checks.c | 31 +- scripts/dtc/data.c | 12 +- scripts/dtc/dtc-lexer.l | 65 +- scripts/dtc/dtc-lexer.lex.c_shipped | 516 +++++----- scripts/dtc/dtc-parser.tab.c_shipped | 1773 ++++++++++++++++----------------- scripts/dtc/dtc-parser.tab.h_shipped | 114 +-- scripts/dtc/dtc-parser.y | 147 +-- scripts/dtc/dtc.c | 14 +- scripts/dtc/dtc.h | 18 +- scripts/dtc/flattree.c | 4 +- scripts/dtc/fstree.c | 17 +- scripts/dtc/libfdt/Makefile.libfdt | 3 +- scripts/dtc/libfdt/fdt.c | 30 +- scripts/dtc/libfdt/fdt.h | 93 +- scripts/dtc/libfdt/fdt_empty_tree.c | 1 + scripts/dtc/libfdt/fdt_ro.c | 29 +- scripts/dtc/libfdt/fdt_rw.c | 10 +- scripts/dtc/libfdt/fdt_sw.c | 36 +- scripts/dtc/libfdt/fdt_wip.c | 2 +- scripts/dtc/libfdt/libfdt.h | 148 ++- scripts/dtc/libfdt/libfdt_env.h | 104 +- scripts/dtc/libfdt/libfdt_internal.h | 6 +- scripts/dtc/livetree.c | 4 +- scripts/dtc/srcpos.c | 49 +- scripts/dtc/srcpos.h | 15 +- scripts/dtc/treesource.c | 15 +- scripts/dtc/update-dtc-source.sh | 9 + scripts/dtc/util.c | 18 +- scripts/dtc/util.h | 4 +- scripts/dtc/version_gen.h | 2 +- 34 files changed, 1768 insertions(+), 1535 deletions(-) Merging mailbox/mailbox-for-next (030bbdbf4c83 Linux 4.1-rc3) $ git merge mailbox/mailbox-for-next Already up-to-date. Merging spi/for-next (76217c85ac82 Merge remote-tracking branches 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next) $ git merge spi/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/spi/spi-ath79.txt | 24 ++ .../devicetree/bindings/spi/spi_pl022.txt | 2 +- .../include/asm/mach-ath79/ath79_spi_platform.h | 4 - drivers/spi/Kconfig | 11 +- drivers/spi/Makefile | 1 + drivers/spi/spi-ath79.c | 34 +- drivers/spi/spi-bcm2835.c | 390 ++++++++++++++++++--- drivers/spi/spi-fsl-dspi.c | 2 +- drivers/spi/spi-imx.c | 2 +- drivers/spi/spi-omap2-mcspi.c | 254 +++++++------- drivers/spi/spi-rb4xx.c | 210 +++++++++++ drivers/spi/spi-rspi.c | 15 +- drivers/spi/spi-s3c64xx.c | 2 +- drivers/spi/spi-sh-msiof.c | 2 +- drivers/spi/spi-sirf.c | 65 ++-- drivers/spi/spi.c | 11 +- drivers/spi/spidev.c | 33 +- 17 files changed, 805 insertions(+), 257 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/spi-ath79.txt create mode 100644 drivers/spi/spi-rb4xx.c $ git reset --hard HEAD^ HEAD is now at a62c102c9377 Merge remote-tracking branch 'dt-rh/for-next' Merging next-20150511 version of spi $ git merge -m next-20150511/spi 8ae58225eb5fd93a0e59a955c46b395a652516da Merge made by the 'recursive' strategy. .../devicetree/bindings/spi/spi-ath79.txt | 24 ++ .../include/asm/mach-ath79/ath79_spi_platform.h | 4 - drivers/spi/Kconfig | 11 +- drivers/spi/Makefile | 1 + drivers/spi/spi-ath79.c | 34 ++- drivers/spi/spi-bcm2835.c | 87 ++++--- drivers/spi/spi-fsl-dspi.c | 2 +- drivers/spi/spi-imx.c | 2 +- drivers/spi/spi-omap2-mcspi.c | 254 ++++++++++----------- drivers/spi/spi-rb4xx.c | 210 +++++++++++++++++ drivers/spi/spi-rspi.c | 2 +- drivers/spi/spi-s3c64xx.c | 2 +- drivers/spi/spi-sh-msiof.c | 2 +- drivers/spi/spi-sirf.c | 65 ++++-- drivers/spi/spidev.c | 30 +-- 15 files changed, 491 insertions(+), 239 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/spi-ath79.txt create mode 100644 drivers/spi/spi-rb4xx.c Merging tip/auto-latest (9f897631aba5 Merge branch 'x86/urgent') $ git merge tip/auto-latest Auto-merging net/core/pktgen.c Auto-merging kernel/signal.c Auto-merging kernel/sched/loadavg.c Auto-merging kernel/sched/core.c Auto-merging init/Kconfig Auto-merging include/linux/sched.h Removing include/linux/platform_data/irq-renesas-irqc.h Auto-merging drivers/power/reset/ltc2952-poweroff.c Auto-merging drivers/pci/quirks.c Auto-merging arch/x86/include/asm/pci.h Auto-merging arch/x86/Kconfig Auto-merging Makefile Merge made by the 'recursive' strategy. Documentation/x86/boot.txt | 2 +- Makefile | 5 +- arch/ia64/include/asm/irq_remapping.h | 2 - arch/ia64/kernel/msi_ia64.c | 30 +- arch/x86/Kconfig | 16 +- arch/x86/Kconfig.debug | 11 + arch/x86/Makefile | 5 +- arch/x86/ia32/ia32entry.S | 52 +- arch/x86/include/asm/alternative-asm.h | 18 + arch/x86/include/asm/amd_nb.h | 11 + arch/x86/include/asm/atomic.h | 30 +- arch/x86/include/asm/atomic64_64.h | 8 +- arch/x86/include/asm/dma-mapping.h | 46 +- arch/x86/include/asm/entry_arch.h | 3 + arch/x86/include/asm/hardirq.h | 3 + arch/x86/include/asm/hpet.h | 16 +- arch/x86/include/asm/hw_irq.h | 135 +- arch/x86/include/asm/io.h | 1 + arch/x86/include/asm/io_apic.h | 114 +- arch/x86/include/asm/irq_remapping.h | 69 +- arch/x86/include/asm/irq_vectors.h | 50 +- arch/x86/include/asm/irqdomain.h | 63 + arch/x86/include/asm/mce.h | 18 +- arch/x86/include/asm/microcode.h | 8 +- arch/x86/include/asm/microcode_amd.h | 4 +- arch/x86/include/asm/microcode_intel.h | 8 +- arch/x86/include/asm/msi.h | 7 + arch/x86/include/asm/paravirt.h | 29 +- arch/x86/include/asm/paravirt_types.h | 17 +- arch/x86/include/asm/pci.h | 5 - arch/x86/include/asm/qspinlock.h | 57 + arch/x86/include/asm/qspinlock_paravirt.h | 6 + arch/x86/include/asm/special_insns.h | 38 + arch/x86/include/asm/spinlock.h | 5 + arch/x86/include/asm/spinlock_types.h | 4 + arch/x86/include/asm/thread_info.h | 8 +- arch/x86/include/asm/trace/irq_vectors.h | 6 + arch/x86/include/asm/traps.h | 3 +- arch/x86/include/asm/uaccess_32.h | 4 + arch/x86/include/asm/x86_init.h | 21 - arch/x86/kernel/acpi/boot.c | 71 +- arch/x86/kernel/acpi/wakeup_64.S | 6 +- arch/x86/kernel/alternative.c | 9 + arch/x86/kernel/amd_nb.c | 4 +- arch/x86/kernel/apb_timer.c | 4 - arch/x86/kernel/aperture_64.c | 8 +- arch/x86/kernel/apic/htirq.c | 173 ++- arch/x86/kernel/apic/io_apic.c | 1303 +++++++++---------- arch/x86/kernel/apic/msi.c | 416 +++--- arch/x86/kernel/apic/vector.c | 437 ++++--- arch/x86/kernel/apic/x2apic_phys.c | 2 + arch/x86/kernel/asm-offsets.c | 21 + arch/x86/kernel/asm-offsets_32.c | 18 - arch/x86/kernel/asm-offsets_64.c | 21 - arch/x86/kernel/cpu/amd.c | 12 +- arch/x86/kernel/cpu/common.c | 4 - arch/x86/kernel/cpu/mcheck/mce.c | 10 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 141 +- arch/x86/kernel/cpu/microcode/amd_early.c | 19 +- arch/x86/kernel/cpu/microcode/core.c | 76 +- arch/x86/kernel/cpu/microcode/core_early.c | 23 +- arch/x86/kernel/cpu/microcode/intel.c | 75 +- arch/x86/kernel/cpu/microcode/intel_early.c | 30 +- arch/x86/kernel/cpu/microcode/intel_lib.c | 8 +- arch/x86/kernel/cpu/mtrr/generic.c | 2 +- arch/x86/kernel/cpu/perf_event_intel.c | 7 +- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 6 +- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 8 +- arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 + arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 20 + arch/x86/kernel/devicetree.c | 41 +- arch/x86/kernel/entry_64.S | 72 +- arch/x86/kernel/hpet.c | 57 +- arch/x86/kernel/i8259.c | 8 +- arch/x86/kernel/irq.c | 12 + arch/x86/kernel/irq_32.c | 6 - arch/x86/kernel/irq_64.c | 6 - arch/x86/kernel/irqinit.c | 8 +- arch/x86/kernel/kvm.c | 43 + arch/x86/kernel/mpparse.c | 7 +- arch/x86/kernel/paravirt-spinlocks.c | 24 +- arch/x86/kernel/paravirt.c | 4 +- arch/x86/kernel/paravirt_patch_32.c | 22 +- arch/x86/kernel/paravirt_patch_64.c | 23 +- arch/x86/kernel/pci-dma.c | 45 + arch/x86/kernel/process_32.c | 5 +- arch/x86/kernel/process_64.c | 3 - arch/x86/kernel/setup.c | 3 +- arch/x86/kernel/smpboot.c | 63 +- arch/x86/kernel/traps.c | 16 +- arch/x86/kernel/x86_init.c | 9 - arch/x86/lguest/boot.c | 4 +- arch/x86/mm/ioremap.c | 43 +- arch/x86/mm/pageattr.c | 18 +- arch/x86/pci/intel_mid_pci.c | 6 +- arch/x86/platform/Makefile | 1 + arch/x86/platform/atom/Makefile | 1 + arch/x86/platform/atom/punit_atom_debug.c | 183 +++ .../platform/intel-mid/device_libs/platform_wdt.c | 5 +- arch/x86/platform/intel-mid/intel-mid.c | 18 +- arch/x86/platform/intel-mid/sfi.c | 30 +- arch/x86/platform/sfi/sfi.c | 7 +- arch/x86/platform/uv/uv_irq.c | 298 ++--- arch/x86/power/hibernate_asm_64.S | 8 +- arch/x86/vdso/Makefile | 2 +- arch/x86/xen/enlighten.c | 3 +- arch/x86/xen/spinlock.c | 64 +- arch/x86/xen/xen-asm_64.S | 22 +- arch/x86/xen/xen-ops.h | 2 + drivers/clocksource/asm9260_timer.c | 2 +- drivers/clocksource/timer-integrator-ap.c | 2 +- drivers/clocksource/timer-sun5i.c | 2 +- drivers/iommu/amd_iommu.c | 477 ++++--- drivers/iommu/amd_iommu_init.c | 4 + drivers/iommu/amd_iommu_proto.h | 9 + drivers/iommu/amd_iommu_types.h | 5 + drivers/iommu/dmar.c | 19 +- drivers/iommu/intel_irq_remapping.c | 573 ++++----- drivers/iommu/irq_remapping.c | 242 +--- drivers/iommu/irq_remapping.h | 36 +- drivers/irqchip/exynos-combiner.c | 2 +- drivers/irqchip/irq-armada-370-xp.c | 2 +- drivers/irqchip/irq-bcm2835.c | 2 +- drivers/irqchip/irq-keystone.c | 2 +- drivers/irqchip/irq-mips-gic.c | 2 +- drivers/irqchip/irq-mtk-sysirq.c | 2 +- drivers/irqchip/irq-mxs.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +- drivers/irqchip/irq-renesas-irqc.c | 19 +- drivers/irqchip/irq-s3c24xx.c | 4 +- drivers/irqchip/irq-sun4i.c | 2 +- drivers/irqchip/irq-versatile-fpga.c | 2 +- drivers/irqchip/irq-vf610-mscm-ir.c | 5 +- drivers/irqchip/irq-vic.c | 2 +- drivers/irqchip/irq-vt8500.c | 2 +- drivers/lguest/interrupts_and_traps.c | 10 +- drivers/pci/htirq.c | 48 +- drivers/pci/quirks.c | 7 - drivers/power/reset/ltc2952-poweroff.c | 1 - include/asm-generic/io.h | 8 + include/asm-generic/qspinlock.h | 139 ++ include/asm-generic/qspinlock_types.h | 79 ++ include/linux/alarmtimer.h | 4 +- include/linux/clocksource.h | 1 - include/linux/compiler.h | 2 +- include/linux/context_tracking.h | 10 - include/linux/context_tracking_state.h | 1 + include/linux/dmar.h | 3 +- include/linux/hrtimer.h | 118 +- include/linux/htirq.h | 22 +- include/linux/init_task.h | 5 +- include/linux/intel-iommu.h | 4 + include/linux/interrupt.h | 9 +- include/linux/osq_lock.h | 5 + include/linux/perf_event.h | 24 + include/linux/platform_data/irq-renesas-irqc.h | 27 - include/linux/rcupdate.h | 6 +- include/linux/rcutree.h | 2 +- include/linux/sched.h | 113 +- include/linux/sched/rt.h | 7 +- include/linux/tick.h | 7 + include/linux/timekeeper_internal.h | 2 + include/linux/timer.h | 7 - include/linux/timerqueue.h | 8 +- include/linux/wait.h | 17 +- init/Kconfig | 2 +- ipc/mqueue.c | 54 +- kernel/Kconfig.locks | 7 + kernel/context_tracking.c | 67 +- kernel/events/core.c | 137 +- kernel/fork.c | 5 +- kernel/futex.c | 38 +- kernel/irq/irqdesc.c | 4 +- kernel/irq/msi.c | 2 +- kernel/locking/Makefile | 1 + kernel/locking/mcs_spinlock.h | 1 + kernel/locking/qspinlock.c | 473 +++++++ kernel/locking/qspinlock_paravirt.h | 325 +++++ kernel/locking/rtmutex.c | 17 +- kernel/locking/rwsem-xadd.c | 44 + kernel/rcu/tree_plugin.h | 14 +- kernel/sched/Makefile | 2 +- kernel/sched/auto_group.c | 6 +- kernel/sched/auto_group.h | 2 +- kernel/sched/core.c | 160 ++- kernel/sched/cputime.c | 2 +- kernel/sched/deadline.c | 14 +- kernel/sched/debug.c | 2 - kernel/sched/fair.c | 271 +++- kernel/sched/{proc.c => loadavg.c} | 236 +--- kernel/sched/rt.c | 16 +- kernel/sched/sched.h | 14 +- kernel/sched/stats.h | 15 +- kernel/sched/wait.c | 4 +- kernel/signal.c | 6 +- kernel/time/alarmtimer.c | 17 +- kernel/time/hrtimer.c | 545 +++----- kernel/time/posix-cpu-timers.c | 87 +- kernel/time/posix-timers.c | 17 +- kernel/time/tick-broadcast-hrtimer.c | 18 +- kernel/time/tick-broadcast.c | 81 +- kernel/time/tick-common.c | 10 + kernel/time/tick-internal.h | 2 + kernel/time/tick-sched.c | 297 ++--- kernel/time/tick-sched.h | 2 +- kernel/time/timekeeping.c | 55 +- kernel/time/timekeeping.h | 11 +- kernel/time/timer.c | 81 +- kernel/time/timer_list.c | 43 +- lib/timerqueue.c | 10 +- net/core/pktgen.c | 2 - net/sched/sch_api.c | 5 +- sound/core/hrtimer.c | 9 +- sound/drivers/pcsp/pcsp.c | 15 +- tools/Makefile | 20 +- tools/arch/alpha/include/asm/barrier.h | 8 + tools/arch/arm/include/asm/barrier.h | 12 + tools/arch/arm64/include/asm/barrier.h | 16 + tools/arch/ia64/include/asm/barrier.h | 48 + tools/arch/mips/include/asm/barrier.h | 20 + tools/arch/powerpc/include/asm/barrier.h | 29 + tools/arch/s390/include/asm/barrier.h | 30 + tools/arch/sh/include/asm/barrier.h | 32 + tools/arch/sparc/include/asm/barrier.h | 8 + tools/arch/sparc/include/asm/barrier_32.h | 6 + tools/arch/sparc/include/asm/barrier_64.h | 42 + tools/arch/tile/include/asm/barrier.h | 15 + tools/arch/x86/include/asm/atomic.h | 65 + tools/arch/x86/include/asm/barrier.h | 28 + tools/arch/x86/include/asm/rmwcc.h | 41 + tools/arch/xtensa/include/asm/barrier.h | 18 + tools/include/asm-generic/atomic-gcc.h | 63 + tools/include/asm-generic/barrier.h | 44 + tools/include/asm/atomic.h | 10 + tools/include/asm/barrier.h | 27 + tools/include/linux/atomic.h | 6 + tools/include/linux/compiler.h | 4 + tools/include/linux/types.h | 4 + tools/lib/traceevent/event-parse.c | 6 +- tools/lib/traceevent/event-parse.h | 1 + .../callchain-overhead-calculation.txt | 108 ++ tools/perf/Documentation/perf-bench.txt | 3 + tools/perf/Documentation/perf-inject.txt | 27 + tools/perf/Documentation/perf-kmem.txt | 11 +- tools/perf/Documentation/perf-probe.txt | 17 +- tools/perf/Documentation/perf-record.txt | 9 + tools/perf/Documentation/perf-report.txt | 32 + tools/perf/Documentation/perf-script.txt | 37 +- tools/perf/Documentation/perf-top.txt | 3 +- tools/perf/Documentation/perf-trace.txt | 2 +- tools/perf/MANIFEST | 19 + tools/perf/Makefile | 2 +- tools/perf/Makefile.perf | 2 + tools/perf/arch/powerpc/util/Build | 1 + tools/perf/arch/powerpc/util/sym-handling.c | 82 ++ tools/perf/bench/Build | 1 + tools/perf/bench/bench.h | 2 + tools/perf/bench/futex-wake-parallel.c | 294 +++++ tools/perf/bench/futex-wake.c | 7 +- tools/perf/bench/numa.c | 32 +- tools/perf/builtin-annotate.c | 10 +- tools/perf/builtin-bench.c | 1 + tools/perf/builtin-buildid-list.c | 9 + tools/perf/builtin-diff.c | 9 +- tools/perf/builtin-inject.c | 175 ++- tools/perf/builtin-kmem.c | 988 ++++++++++++-- tools/perf/builtin-kvm.c | 6 +- tools/perf/builtin-lock.c | 8 +- tools/perf/builtin-mem.c | 5 +- tools/perf/builtin-probe.c | 193 ++- tools/perf/builtin-record.c | 274 +++- tools/perf/builtin-report.c | 20 +- tools/perf/builtin-sched.c | 82 +- tools/perf/builtin-script.c | 94 +- tools/perf/builtin-stat.c | 146 ++- tools/perf/builtin-timechart.c | 5 +- tools/perf/builtin-top.c | 2 +- tools/perf/builtin-trace.c | 43 +- tools/perf/config/Makefile | 9 + tools/perf/perf-sys.h | 73 +- tools/perf/perf.h | 5 + tools/perf/tests/code-reading.c | 24 +- tools/perf/tests/dwarf-unwind.c | 1 + tools/perf/tests/evsel-roundtrip-name.c | 4 +- tools/perf/tests/hists_common.c | 1 + tools/perf/tests/hists_cumulate.c | 6 +- tools/perf/tests/hists_filter.c | 8 +- tools/perf/tests/hists_link.c | 12 +- tools/perf/tests/hists_output.c | 6 +- tools/perf/tests/keep-tracking.c | 4 +- tools/perf/tests/make | 18 +- tools/perf/tests/mmap-thread-lookup.c | 2 + tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/perf-time-to-tsc.c | 2 +- tools/perf/tests/pmu.c | 3 +- tools/perf/tests/switch-tracking.c | 8 +- tools/perf/tests/thread-mg-share.c | 12 +- tools/perf/ui/browsers/hists.c | 633 +++++---- tools/perf/util/Build | 3 +- tools/perf/util/auxtrace.c | 1352 ++++++++++++++++++++ tools/perf/util/auxtrace.h | 643 ++++++++++ tools/perf/util/build-id.c | 5 +- tools/perf/util/callchain.h | 4 + tools/perf/util/data-convert-bt.c | 410 +++++- tools/perf/util/db-export.c | 14 +- tools/perf/util/dso.c | 2 + tools/perf/util/dso.h | 3 + tools/perf/util/dwarf-aux.c | 16 + tools/perf/util/dwarf-aux.h | 3 + tools/perf/util/event.c | 57 + tools/perf/util/event.h | 72 ++ tools/perf/util/evlist.c | 73 +- tools/perf/util/evlist.h | 6 + tools/perf/util/evsel.c | 1 + tools/perf/util/header.c | 37 + tools/perf/util/header.h | 1 + tools/perf/util/hist.c | 2 +- tools/perf/util/machine.c | 110 +- tools/perf/util/machine.h | 9 +- tools/perf/util/map.c | 5 + tools/perf/util/map.h | 3 +- tools/perf/util/parse-events.c | 194 ++- tools/perf/util/parse-events.h | 36 +- tools/perf/util/parse-events.l | 41 +- tools/perf/util/parse-events.y | 48 +- tools/perf/util/parse-options.h | 4 + tools/perf/util/pmu.c | 57 +- tools/perf/util/pmu.h | 6 +- tools/perf/util/probe-event.c | 334 ++--- tools/perf/util/probe-event.h | 22 +- tools/perf/util/probe-finder.c | 73 +- tools/perf/util/probe-finder.h | 10 +- tools/perf/util/pstack.c | 7 + tools/perf/util/pstack.h | 1 + tools/perf/util/record.c | 15 +- tools/perf/util/session.c | 184 ++- tools/perf/util/session.h | 6 + tools/perf/util/sort.h | 38 +- tools/perf/util/strfilter.c | 107 ++ tools/perf/util/strfilter.h | 35 + tools/perf/util/symbol-elf.c | 13 +- tools/perf/util/symbol.c | 25 +- tools/perf/util/symbol.h | 12 +- tools/perf/util/thread.c | 14 +- tools/perf/util/thread.h | 3 +- tools/perf/util/tool.h | 12 +- tools/perf/util/util.h | 4 + tools/testing/selftests/x86/Makefile | 20 +- tools/testing/selftests/x86/run_x86_tests.sh | 2 + tools/testing/selftests/x86/sysret_ss_attrs.c | 112 ++ tools/testing/selftests/x86/thunks.S | 67 + 351 files changed, 13324 insertions(+), 5638 deletions(-) create mode 100644 arch/x86/include/asm/irqdomain.h create mode 100644 arch/x86/include/asm/msi.h create mode 100644 arch/x86/include/asm/qspinlock.h create mode 100644 arch/x86/include/asm/qspinlock_paravirt.h create mode 100644 arch/x86/platform/atom/Makefile create mode 100644 arch/x86/platform/atom/punit_atom_debug.c create mode 100644 include/asm-generic/qspinlock.h create mode 100644 include/asm-generic/qspinlock_types.h delete mode 100644 include/linux/platform_data/irq-renesas-irqc.h create mode 100644 kernel/locking/qspinlock.c create mode 100644 kernel/locking/qspinlock_paravirt.h rename kernel/sched/{proc.c => loadavg.c} (62%) create mode 100644 tools/arch/alpha/include/asm/barrier.h create mode 100644 tools/arch/arm/include/asm/barrier.h create mode 100644 tools/arch/arm64/include/asm/barrier.h create mode 100644 tools/arch/ia64/include/asm/barrier.h create mode 100644 tools/arch/mips/include/asm/barrier.h create mode 100644 tools/arch/powerpc/include/asm/barrier.h create mode 100644 tools/arch/s390/include/asm/barrier.h create mode 100644 tools/arch/sh/include/asm/barrier.h create mode 100644 tools/arch/sparc/include/asm/barrier.h create mode 100644 tools/arch/sparc/include/asm/barrier_32.h create mode 100644 tools/arch/sparc/include/asm/barrier_64.h create mode 100644 tools/arch/tile/include/asm/barrier.h create mode 100644 tools/arch/x86/include/asm/atomic.h create mode 100644 tools/arch/x86/include/asm/barrier.h create mode 100644 tools/arch/x86/include/asm/rmwcc.h create mode 100644 tools/arch/xtensa/include/asm/barrier.h create mode 100644 tools/include/asm-generic/atomic-gcc.h create mode 100644 tools/include/asm-generic/barrier.h create mode 100644 tools/include/asm/atomic.h create mode 100644 tools/include/asm/barrier.h create mode 100644 tools/include/linux/atomic.h create mode 100644 tools/perf/Documentation/callchain-overhead-calculation.txt create mode 100644 tools/perf/arch/powerpc/util/sym-handling.c create mode 100644 tools/perf/bench/futex-wake-parallel.c create mode 100644 tools/perf/util/auxtrace.c create mode 100644 tools/perf/util/auxtrace.h create mode 100644 tools/testing/selftests/x86/sysret_ss_attrs.c create mode 100644 tools/testing/selftests/x86/thunks.S Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer) $ git merge clockevents/clockevents/next Resolved 'arch/arm/mach-rockchip/Kconfig' using previous resolution. Resolved 'drivers/clocksource/Kconfig' using previous resolution. Resolved 'drivers/clocksource/asm9260_timer.c' using previous resolution. Resolved 'drivers/clocksource/rockchip_timer.c' using previous resolution. Auto-merging drivers/clocksource/rockchip_timer.c CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c Auto-merging drivers/clocksource/asm9260_timer.c CONFLICT (add/add): Merge conflict in drivers/clocksource/asm9260_timer.c Auto-merging drivers/clocksource/Kconfig CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig Auto-merging arch/arm/mach-rockchip/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9f2edab7f375] Merge remote-tracking branch 'clockevents/clockevents/next' $ git diff -M --stat --summary HEAD^.. Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) $ git merge edac/linux_next Already up-to-date. Merging edac-amd/for-next (30c7469ba6f5 MAINTAINERS: Change Johannes Thumshirn's email address) $ git merge edac-amd/for-next Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 10 +++++----- drivers/edac/Kconfig | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next) $ git merge irqchip/irqchip/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) $ git merge tiny/tiny/next Already up-to-date. Merging ftrace/for-next (c4b00d27e405 Merge branch 'for-next/ftrace/core' into trace/for-next) $ git merge ftrace/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging rcu/rcu/next (ac002d807597 rcu: Change function declaration to bool) $ git merge rcu/rcu/next Resolved 'include/linux/rcupdate.h' using previous resolution. Resolved 'include/linux/rcutree.h' using previous resolution. Resolved 'kernel/rcu/tree.c' using previous resolution. Resolved 'kernel/rcu/tree_plugin.h' using previous resolution. Auto-merging lib/Kconfig.debug Auto-merging kernel/rcu/tree_plugin.h CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h Auto-merging kernel/rcu/tree.c CONFLICT (content): Merge conflict in kernel/rcu/tree.c Auto-merging init/Kconfig Auto-merging include/linux/rcutree.h CONFLICT (content): Merge conflict in include/linux/rcutree.h Auto-merging include/linux/rcupdate.h CONFLICT (content): Merge conflict in include/linux/rcupdate.h Auto-merging include/linux/compiler.h Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging arch/arm/kernel/smp.c Auto-merging Documentation/kernel-parameters.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 9d07d7dac52b] Merge remote-tracking branch 'rcu/rcu/next' $ git diff -M --stat --summary HEAD^.. Documentation/RCU/arrayRCU.txt | 20 +- Documentation/RCU/lockdep.txt | 10 - Documentation/RCU/rcu_dereference.txt | 38 +- Documentation/RCU/whatisRCU.txt | 6 +- Documentation/kernel-parameters.txt | 27 +- Documentation/memory-barriers.txt | 62 +-- arch/arm/kernel/smp.c | 6 +- arch/arm64/kernel/smp.c | 6 +- arch/powerpc/include/asm/barrier.h | 1 + arch/x86/kernel/cpu/mcheck/mce.c | 15 +- drivers/md/bitmap.c | 2 +- include/linux/compiler.h | 16 + include/linux/rculist.h | 15 +- include/linux/rcupdate.h | 70 +--- include/linux/rcutiny.h | 16 + include/linux/rcutree.h | 7 +- include/linux/spinlock.h | 2 +- init/Kconfig | 72 ++-- kernel/cpu.c | 4 +- kernel/events/ring_buffer.c | 2 +- kernel/locking/locktorture.c | 14 +- kernel/rcu/rcutorture.c | 103 +++-- kernel/rcu/srcu.c | 10 +- kernel/rcu/tiny.c | 33 -- kernel/rcu/tiny_plugin.h | 12 +- kernel/rcu/tree.c | 460 +++++++++++---------- kernel/rcu/tree.h | 66 +-- kernel/rcu/tree_plugin.h | 220 +++++----- kernel/rcu/tree_trace.c | 6 +- kernel/rcu/update.c | 30 +- kernel/torture.c | 26 +- lib/Kconfig.debug | 66 ++- net/netfilter/core.c | 2 +- .../testing/selftests/rcutorture/bin/configinit.sh | 2 +- .../selftests/rcutorture/bin/kvm-recheck.sh | 4 + .../selftests/rcutorture/configs/rcu/CFcommon | 2 + .../selftests/rcutorture/configs/rcu/SRCU-N | 1 + .../selftests/rcutorture/configs/rcu/SRCU-P | 1 + .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 2 +- .../selftests/rcutorture/configs/rcu/TASKS01 | 5 +- .../selftests/rcutorture/configs/rcu/TASKS02 | 1 - .../selftests/rcutorture/configs/rcu/TASKS03 | 2 +- .../selftests/rcutorture/configs/rcu/TINY02 | 2 +- .../selftests/rcutorture/configs/rcu/TINY02.boot | 1 + .../selftests/rcutorture/configs/rcu/TREE01 | 1 + .../selftests/rcutorture/configs/rcu/TREE02 | 2 +- .../selftests/rcutorture/configs/rcu/TREE02-T | 1 - .../selftests/rcutorture/configs/rcu/TREE03 | 8 +- .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + .../selftests/rcutorture/configs/rcu/TREE04 | 8 +- .../selftests/rcutorture/configs/rcu/TREE05 | 4 +- .../selftests/rcutorture/configs/rcu/TREE06 | 4 +- .../selftests/rcutorture/configs/rcu/TREE06.boot | 1 + .../selftests/rcutorture/configs/rcu/TREE07 | 4 +- .../selftests/rcutorture/configs/rcu/TREE08 | 6 +- .../selftests/rcutorture/configs/rcu/TREE08-T | 1 - .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 + .../selftests/rcutorture/configs/rcu/TREE08.boot | 1 + .../selftests/rcutorture/configs/rcu/TREE09 | 1 + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 36 +- 60 files changed, 845 insertions(+), 703 deletions(-) create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE03.boot create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot Merging kvm/linux-next (cba3d2765e9f Merge tag 'kvm-s390-next-20150508' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) $ git merge kvm/linux-next Merge made by the 'recursive' strategy. Documentation/virtual/kvm/api.txt | 3 +- arch/arm/kvm/arm.c | 4 +- arch/mips/kvm/mips.c | 4 +- arch/powerpc/kvm/booke.c | 6 +- arch/powerpc/kvm/powerpc.c | 2 +- arch/s390/include/asm/kvm_host.h | 4 +- arch/s390/kernel/entry.S | 2 +- arch/s390/kvm/intercept.c | 16 --- arch/s390/kvm/interrupt.c | 87 ++++++++------- arch/s390/kvm/kvm-s390.c | 61 +++++++---- arch/s390/kvm/kvm-s390.h | 25 ++++- arch/s390/kvm/priv.c | 8 +- arch/x86/include/asm/kvm_host.h | 17 +-- arch/x86/include/asm/pvclock.h | 1 - arch/x86/include/uapi/asm/kvm.h | 3 + arch/x86/kernel/kvmclock.c | 3 + arch/x86/kvm/emulate.c | 2 +- arch/x86/kvm/ioapic.c | 9 +- arch/x86/kvm/irq_comm.c | 14 ++- arch/x86/kvm/lapic.c | 26 +++-- arch/x86/kvm/lapic.h | 8 +- arch/x86/kvm/mmu.c | 2 +- arch/x86/kvm/mmu.h | 2 + arch/x86/kvm/paging_tmpl.h | 7 ++ arch/x86/kvm/svm.c | 32 +++--- arch/x86/kvm/vmx.c | 221 ++++++++++++++++++++++++++++++++------ arch/x86/kvm/x86.c | 67 ++++++++++-- arch/x86/kvm/x86.h | 2 + include/linux/kvm_host.h | 28 +++-- include/uapi/linux/kvm.h | 1 + virt/kvm/kvm_main.c | 12 +-- 31 files changed, 477 insertions(+), 202 deletions(-) Merging kvm-arm/next (2fa462f82621 Merge tag 'kvm-arm-for-4.1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master) $ git merge kvm-arm/next Already up-to-date. Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) $ git merge kvm-ppc/kvm-ppc-next Already up-to-date. Merging kvms390/next (06b36753a646 KVM: s390: drop handling of interception code 12) $ git merge kvms390/next Already up-to-date. Merging xen-tip/linux-next (0b97b03d88b4 xen/pci: Try harder to get PXM information for Xen) $ git merge xen-tip/linux-next Already up-to-date. Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next (30186c6fdc9a workqueue: function name in the comment differs from the real function name) $ git merge workqueues/for-next Merge made by the 'recursive' strategy. Documentation/workqueue.txt | 2 +- include/linux/workqueue.h | 1 + kernel/workqueue.c | 353 ++++++++++++++++++++++++++++++++------------ 3 files changed, 261 insertions(+), 95 deletions(-) Merging drivers-x86/for-next (fe88e379e89b Documentation/ABI: Add file describing the sysfs entries for toshiba_haps) $ git merge drivers-x86/for-next Merge made by the 'recursive' strategy. .../ABI/testing/sysfs-driver-toshiba_haps | 20 ++ drivers/platform/x86/Kconfig | 2 +- drivers/platform/x86/toshiba_acpi.c | 246 +++++---------------- drivers/platform/x86/toshiba_bluetooth.c | 174 +++++++++++---- drivers/platform/x86/toshiba_haps.c | 32 ++- 5 files changed, 225 insertions(+), 249 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-toshiba_haps Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address) $ git merge chrome-platform/for-next Already up-to-date. Merging regmap/for-next (637733e01bd4 Merge remote-tracking branches 'regmap/topic/defaults' and 'regmap/topic/irq' into regmap-next) $ git merge regmap/for-next Merge made by the 'recursive' strategy. drivers/base/regmap/internal.h | 3 +++ drivers/base/regmap/regcache.c | 45 ++++++++++++++++++++++++++-------------- drivers/base/regmap/regmap-irq.c | 2 +- 3 files changed, 34 insertions(+), 16 deletions(-) Merging hsi/for-next (265ef3ee9575 HSI: cmt_speech: fix error return code) $ git merge hsi/for-next Already up-to-date. Merging leds/for-next (a221e5c87ae2 Documentation: leds: Add description of v4l2-flash sub-device) $ git merge leds/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/leds/leds-aat1290.txt | 41 + .../devicetree/bindings/leds/leds-bcm6328.txt | 309 +++++++ .../devicetree/bindings/leds/leds-tlc591xx.txt | 40 + Documentation/leds/leds-class-flash.txt | 47 + drivers/leds/Kconfig | 34 + drivers/leds/Makefile | 4 + drivers/leds/leds-aat1290.c | 451 ++++++++++ drivers/leds/leds-bcm6328.c | 413 +++++++++ drivers/leds/leds-gpio.c | 11 +- drivers/leds/leds-max77693.c | 980 +++++++++++++++++++++ drivers/leds/leds-tlc591xx.c | 300 +++++++ drivers/leds/leds.h | 24 - include/linux/leds.h | 25 + 13 files changed, 2651 insertions(+), 28 deletions(-) create mode 100644 Documentation/devicetree/bindings/leds/leds-aat1290.txt create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.txt create mode 100644 Documentation/devicetree/bindings/leds/leds-tlc591xx.txt create mode 100644 drivers/leds/leds-aat1290.c create mode 100644 drivers/leds/leds-bcm6328.c create mode 100644 drivers/leds/leds-max77693.c create mode 100644 drivers/leds/leds-tlc591xx.c Merging ipmi/for-next (c32e9840e96a ipmi: Add a comment in how messages are delivered from the lower layer) $ git merge ipmi/for-next Merge made by the 'recursive' strategy. drivers/char/ipmi/ipmi_msghandler.c | 4 ++++ 1 file changed, 4 insertions(+) Merging driver-core/driver-core-next (030bbdbf4c83 Linux 4.1-rc3) $ git merge driver-core/driver-core-next Already up-to-date. Merging tty/tty-next (c1c325d703d3 tty: serial: 8250_mtk: Add support for bus clock) $ git merge tty/tty-next Auto-merging include/linux/tty.h Auto-merging drivers/tty/serial/amba-pl011.c Auto-merging drivers/tty/n_tty.c Auto-merging drivers/tty/n_gsm.c Merge made by the 'recursive' strategy. .../devicetree/bindings/serial/mtk-uart.txt | 12 ++- .../devicetree/bindings/serial/sirf-uart.txt | 15 +-- arch/alpha/include/asm/serial.h | 2 +- arch/arm/common/edma.c | 3 + arch/blackfin/include/asm/bfin_serial.h | 8 +- arch/m68k/include/asm/serial.h | 2 +- arch/mn10300/include/asm/serial.h | 4 +- arch/x86/include/asm/serial.h | 2 +- drivers/dma/edma.c | 7 +- drivers/input/serio/serport.c | 5 +- drivers/tty/amiserial.c | 8 +- drivers/tty/cyclades.c | 8 +- drivers/tty/n_gsm.c | 3 +- drivers/tty/n_tty.c | 7 +- drivers/tty/serial/8250/8250_core.c | 13 --- drivers/tty/serial/8250/8250_mtk.c | 104 ++++++++++-------- drivers/tty/serial/8250/8250_omap.c | 65 +++++++++--- drivers/tty/serial/Kconfig | 2 +- drivers/tty/serial/altera_jtaguart.c | 2 +- drivers/tty/serial/altera_uart.c | 2 +- drivers/tty/serial/amba-pl011.c | 116 +++++---------------- drivers/tty/serial/atmel_serial.c | 13 +-- drivers/tty/serial/bfin_uart.c | 24 ++--- drivers/tty/serial/crisv10.c | 94 ++--------------- drivers/tty/serial/ifx6x60.c | 19 ++-- drivers/tty/serial/imx.c | 16 ++- drivers/tty/serial/kgdb_nmi.c | 6 +- drivers/tty/serial/mcf.c | 2 +- drivers/tty/serial/meson_uart.c | 2 +- drivers/tty/serial/mpc52xx_uart.c | 2 +- drivers/tty/serial/serial_core.c | 4 +- drivers/tty/serial/sh-sci.h | 1 - drivers/tty/serial/sirfsoc_uart.c | 27 +---- drivers/tty/serial/sirfsoc_uart.h | 4 - drivers/tty/tty_io.c | 34 +++--- drivers/tty/tty_ioctl.c | 4 +- drivers/tty/tty_ldisc.c | 8 +- include/linux/serial_core.h | 2 +- include/linux/tty.h | 2 +- 39 files changed, 240 insertions(+), 414 deletions(-) $ git am -3 ../patches/0001-serial-amba-pl011-fix-mismerge.patch Applying: serial/amba-pl011: fix mismerge $ git reset HEAD^ Unstaged changes after reset: M drivers/tty/serial/amba-pl011.c $ git add -A . $ git commit -v -a --amend [master 97ebece9ae39] Merge remote-tracking branch 'tty/tty-next' Date: Tue May 12 14:09:25 2015 +1000 Merging usb/usb-next (0efd937e27d5 USB: ehci-tegra: fix inefficient copy of unaligned buffers) $ git merge usb/usb-next Merge made by the 'recursive' strategy. drivers/usb/core/hub.c | 37 +++++++++++++++++++++---------------- drivers/usb/host/Makefile | 4 +++- drivers/usb/host/ehci-tegra.c | 12 +++++++++--- drivers/usb/musb/musb_host.c | 9 +++++++-- drivers/usb/storage/scsiglue.c | 18 +++++++----------- 5 files changed, 47 insertions(+), 33 deletions(-) Merging usb-gadget/next (b787f68c36d4 Linux 4.1-rc1) $ git merge usb-gadget/next Already up-to-date. Merging usb-serial/usb-next (b787f68c36d4 Linux 4.1-rc1) $ git merge usb-serial/usb-next Already up-to-date. Merging staging/staging-next (35bb871663dd staging: comedi: ni_stc.h: final cleanup) $ git merge staging/staging-next Auto-merging tools/Makefile Auto-merging drivers/staging/vt6655/device_main.c Removing drivers/staging/unisys/visorutil/visorkmodutils.c Removing drivers/staging/unisys/visorutil/memregion_direct.c Removing drivers/staging/unisys/visorutil/memregion.h Removing drivers/staging/unisys/visorutil/charqueue.h Removing drivers/staging/unisys/visorutil/charqueue.c Removing drivers/staging/unisys/visorutil/Makefile Removing drivers/staging/unisys/visorutil/Kconfig Removing drivers/staging/unisys/visorchipset/visorchipset_umode.h Removing drivers/staging/unisys/visorchipset/parser.h Removing drivers/staging/unisys/visorchipset/parser.c Removing drivers/staging/unisys/visorchipset/globals.h Removing drivers/staging/unisys/visorchipset/file.h Removing drivers/staging/unisys/visorchipset/file.c Removing drivers/staging/unisys/visorchipset/Makefile Removing drivers/staging/unisys/visorchipset/Kconfig Removing drivers/staging/unisys/visorchannel/visorchannel.h Auto-merging drivers/staging/unisys/visorbus/visorchipset.c Auto-merging drivers/staging/unisys/visorbus/visorchannel.c Auto-merging drivers/staging/unisys/visorbus/visorbus_private.h Auto-merging drivers/staging/unisys/visorbus/periodic_work.c Removing drivers/staging/unisys/virtpci/virtpci.h Removing drivers/staging/unisys/virtpci/virtpci.c Removing drivers/staging/unisys/virtpci/Makefile Removing drivers/staging/unisys/virtpci/Kconfig Removing drivers/staging/unisys/virthba/virthba.h Removing drivers/staging/unisys/virthba/virthba.c Removing drivers/staging/unisys/virthba/Makefile Removing drivers/staging/unisys/virthba/Kconfig Removing drivers/staging/unisys/uislib/uisutils.c Removing drivers/staging/unisys/uislib/uisthread.c Removing drivers/staging/unisys/uislib/uisqueue.c Removing drivers/staging/unisys/uislib/uislib.c Removing drivers/staging/unisys/uislib/Makefile Removing drivers/staging/unisys/uislib/Kconfig Removing drivers/staging/unisys/include/timskmod.h Removing drivers/staging/unisys/include/procobjecttree.h Auto-merging drivers/staging/sm750fb/sm750.c Removing drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h CONFLICT (modify/delete): drivers/staging/media/dt3155v4l/dt3155v4l.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/dt3155v4l/dt3155v4l.c left in tree. Auto-merging drivers/staging/media/bcm2048/radio-bcm2048.c Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/staging/media/dt3155v4l/dt3155v4l.c drivers/staging/media/dt3155v4l/dt3155v4l.c: needs merge rm 'drivers/staging/media/dt3155v4l/dt3155v4l.c' $ git commit -v -a [master 03597072c94b] Merge remote-tracking branch 'staging/staging-next' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-bus-iio | 11 + .../devicetree/bindings/iio/st-sensors.txt | 1 + .../bindings/iio/temperature/mlx90614.txt | 24 + .../devicetree/bindings/vendor-prefixes.txt | 1 + drivers/iio/accel/kxcjk-1013.c | 42 +- drivers/iio/accel/mma9551_core.c | 8 +- drivers/iio/accel/mma9551_core.h | 2 +- drivers/iio/accel/mma9553.c | 148 +- drivers/iio/adc/ti_am335x_adc.c | 29 +- drivers/iio/common/st_sensors/st_sensors_core.c | 23 +- drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +- drivers/iio/industrialio-core.c | 1 + drivers/iio/light/Kconfig | 3 +- drivers/iio/light/ltr501.c | 1233 +++++++++- drivers/iio/light/tsl2563.c | 36 +- drivers/iio/light/tsl4531.c | 10 +- drivers/iio/magnetometer/st_magn.h | 1 + drivers/iio/magnetometer/st_magn_core.c | 116 + drivers/iio/magnetometer/st_magn_i2c.c | 5 + drivers/iio/proximity/sx9500.c | 457 +++- drivers/iio/temperature/mlx90614.c | 355 ++- drivers/iio/temperature/tmp006.c | 6 +- drivers/staging/Makefile | 2 +- drivers/staging/android/ion/ion_chunk_heap.c | 2 +- drivers/staging/android/ion/ion_priv.h | 6 +- drivers/staging/android/ion/ion_test.c | 20 +- drivers/staging/android/ion/tegra/tegra_ion.c | 1 + drivers/staging/android/uapi/ion.h | 2 +- drivers/staging/comedi/comedi_fops.c | 43 +- drivers/staging/comedi/comedi_internal.h | 1 + drivers/staging/comedi/comedidev.h | 18 +- drivers/staging/comedi/drivers.c | 2 +- .../staging/comedi/drivers/amplc_dio200_common.c | 6 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +- drivers/staging/comedi/drivers/comedi_bond.c | 3 +- drivers/staging/comedi/drivers/daqboard2000.c | 58 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 7 - drivers/staging/comedi/drivers/mite.c | 110 +- drivers/staging/comedi/drivers/mite.h | 88 +- drivers/staging/comedi/drivers/ni_mio_common.c | 2409 +++++++++----------- drivers/staging/comedi/drivers/ni_pcimio.c | 17 +- drivers/staging/comedi/drivers/ni_stc.h | 2237 ++++++++---------- drivers/staging/comedi/drivers/serial2002.c | 2 +- drivers/staging/dgnc/TODO | 6 +- drivers/staging/dgnc/dgnc_cls.c | 4 +- drivers/staging/dgnc/dgnc_neo.c | 4 +- drivers/staging/dgnc/dgnc_tty.c | 106 +- drivers/staging/emxx_udc/emxx_udc.c | 39 +- drivers/staging/fbtft/Kconfig | 2 +- drivers/staging/fbtft/fb_st7735r.c | 8 +- drivers/staging/fbtft/fb_tls8204.c | 1 + drivers/staging/fbtft/fbtft-bus.c | 8 +- drivers/staging/fbtft/fbtft-core.c | 7 +- drivers/staging/fbtft/internal.h | 2 +- drivers/staging/fsl-mc/bus/mc-bus.c | 1 - drivers/staging/fwserial/dma_fifo.c | 2 +- drivers/staging/fwserial/fwserial.h | 2 +- drivers/staging/i2o/iop.c | 59 +- drivers/staging/iio/Documentation/device.txt | 2 +- drivers/staging/iio/adc/ad7606_par.c | 2 +- drivers/staging/iio/iio_simple_dummy.h | 2 +- drivers/staging/iio/iio_simple_dummy_events.c | 2 + drivers/staging/iio/light/isl29018.c | 297 +-- drivers/staging/lustre/TODO | 2 +- drivers/staging/lustre/lustre/fid/fid_request.c | 10 +- drivers/staging/lustre/lustre/fld/fld_cache.c | 16 +- drivers/staging/lustre/lustre/fld/fld_request.c | 8 +- drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 10 +- drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 7 +- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 11 +- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 14 +- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 10 +- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 12 +- .../lustre/lustre/libcfs/linux/linux-tracefile.c | 9 +- drivers/staging/lustre/lustre/llite/dcache.c | 6 +- drivers/staging/lustre/lustre/llite/dir.c | 42 +- drivers/staging/lustre/lustre/llite/file.c | 53 +- drivers/staging/lustre/lustre/llite/llite_close.c | 6 +- .../staging/lustre/lustre/llite/llite_internal.h | 4 - drivers/staging/lustre/lustre/llite/llite_lib.c | 45 +- drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 4 +- drivers/staging/lustre/lustre/llite/lloop.c | 8 +- drivers/staging/lustre/lustre/llite/namei.c | 2 +- drivers/staging/lustre/lustre/llite/rw26.c | 20 - drivers/staging/lustre/lustre/llite/statahead.c | 21 +- drivers/staging/lustre/lustre/llite/xattr_cache.c | 6 +- drivers/staging/lustre/lustre/lmv/lmv_intent.c | 4 +- drivers/staging/lustre/lustre/lmv/lmv_obd.c | 30 +- drivers/staging/lustre/lustre/lov/lov_dev.c | 19 +- drivers/staging/lustre/lustre/lov/lov_io.c | 5 +- drivers/staging/lustre/lustre/lov/lov_obd.c | 22 +- drivers/staging/lustre/lustre/lov/lov_pool.c | 18 +- drivers/staging/lustre/lustre/lov/lov_request.c | 35 +- drivers/staging/lustre/lustre/lov/lovsub_dev.c | 4 +- drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 6 +- drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 +- drivers/staging/lustre/lustre/mdc/mdc_request.c | 31 +- drivers/staging/lustre/lustre/mgc/mgc_request.c | 20 +- drivers/staging/lustre/lustre/obdclass/acl.c | 29 +- drivers/staging/lustre/lustre/obdclass/capa.c | 4 +- drivers/staging/lustre/lustre/obdclass/cl_io.c | 13 +- drivers/staging/lustre/lustre/obdclass/cl_page.c | 2 +- drivers/staging/lustre/lustre/obdclass/class_obd.c | 4 +- drivers/staging/lustre/lustre/obdclass/genops.c | 45 +- drivers/staging/lustre/lustre/obdclass/llog.c | 25 +- drivers/staging/lustre/lustre/obdclass/llog_obd.c | 4 +- .../lustre/lustre/obdclass/lprocfs_status.c | 14 +- drivers/staging/lustre/lustre/obdclass/lu_object.c | 6 +- .../lustre/lustre/obdclass/lustre_handles.c | 2 +- .../staging/lustre/lustre/obdclass/lustre_peer.c | 6 +- .../staging/lustre/lustre/obdclass/obd_config.c | 64 +- drivers/staging/lustre/lustre/obdclass/obd_mount.c | 107 +- .../staging/lustre/lustre/obdecho/echo_client.c | 44 +- drivers/staging/lustre/lustre/osc/osc_dev.c | 4 +- drivers/staging/lustre/lustre/osc/osc_request.c | 34 +- drivers/staging/lustre/lustre/ptlrpc/client.c | 18 +- drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +- .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 44 +- drivers/staging/lustre/lustre/ptlrpc/nrs.c | 30 +- drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/pinger.c | 6 +- drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 14 +- drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 17 +- drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 16 +- drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 11 +- drivers/staging/lustre/lustre/ptlrpc/service.c | 96 +- drivers/staging/media/bcm2048/radio-bcm2048.c | 4 +- drivers/staging/octeon-usb/octeon-hcd.c | 16 +- drivers/staging/octeon-usb/octeon-hcd.h | 2 +- drivers/staging/octeon/ethernet-defines.h | 62 +- drivers/staging/octeon/ethernet-mdio.c | 48 +- drivers/staging/octeon/ethernet-mdio.h | 24 +- drivers/staging/octeon/ethernet-mem.c | 30 +- drivers/staging/octeon/ethernet-mem.h | 23 +- drivers/staging/octeon/ethernet-rgmii.c | 306 +-- drivers/staging/octeon/ethernet-rx.c | 38 +- drivers/staging/octeon/ethernet-rx.h | 24 +- drivers/staging/octeon/ethernet-sgmii.c | 112 +- drivers/staging/octeon/ethernet-spi.c | 237 +- drivers/staging/octeon/ethernet-tx.c | 28 +- drivers/staging/octeon/ethernet-tx.h | 23 +- drivers/staging/octeon/ethernet-util.h | 23 +- drivers/staging/octeon/ethernet-xaui.c | 114 +- drivers/staging/octeon/ethernet.c | 115 +- drivers/staging/octeon/octeon-ethernet.h | 35 +- drivers/staging/panel/panel.c | 14 - drivers/staging/rtl8188eu/core/rtw_ap.c | 2 + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 10 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 2 + drivers/staging/rtl8188eu/include/ieee80211.h | 29 +- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 4 +- drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +- drivers/staging/rtl8188eu/include/wifi.h | 77 - drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 8 +- drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 2 +- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 77 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 1496 ++++++------ drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h | 908 -------- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 9 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 20 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 825 ++----- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 9 + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 39 - drivers/staging/rtl8192e/rtllib_debug.h | 3 +- drivers/staging/rtl8192e/rtllib_rx.c | 23 +- drivers/staging/rtl8192e/rtllib_softmac.c | 3 +- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 188 +- .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 10 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 26 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 76 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 32 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 14 +- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 48 +- drivers/staging/rtl8192u/r8192U_core.c | 26 +- drivers/staging/rtl8192u/r8192U_dm.c | 2 +- drivers/staging/rtl8712/ieee80211.h | 29 - drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 2 +- drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 2 +- drivers/staging/rtl8723au/hal/odm.c | 4 +- drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 2 +- drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 2 +- drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 4 +- drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 2 +- drivers/staging/rtl8723au/hal/usb_halinit.c | 2 +- drivers/staging/rtl8723au/include/odm_debug.h | 2 +- drivers/staging/rtl8723au/include/rtl8723a_hal.h | 2 +- drivers/staging/rtl8723au/include/rtw_cmd.h | 2 +- drivers/staging/rtl8723au/include/rtw_mlme.h | 10 +- drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 2 +- drivers/staging/rtl8723au/include/sta_info.h | 2 +- drivers/staging/rts5208/rtsx.h | 25 +- drivers/staging/sm750fb/TODO | 2 +- drivers/staging/sm750fb/ddk750_chip.c | 4 +- drivers/staging/sm750fb/ddk750_help.h | 2 +- drivers/staging/sm750fb/ddk750_mode.c | 2 +- drivers/staging/sm750fb/ddk750_reg.h | 4 +- drivers/staging/sm750fb/ddk750_sii164.c | 4 +- drivers/staging/sm750fb/readme | 8 +- drivers/staging/sm750fb/sm750.c | 12 +- drivers/staging/sm750fb/sm750_accel.c | 4 +- drivers/staging/sm750fb/sm750_hw.h | 2 +- drivers/staging/sm7xxfb/sm7xxfb.c | 228 +- drivers/staging/unisys/Kconfig | 9 +- drivers/staging/unisys/Makefile | 7 +- .../include/channels/controlvmchannel.h | 272 +-- .../common-spar/include/channels/iochannel.h | 381 +--- .../common-spar/include/channels/vbuschannel.h | 2 +- drivers/staging/unisys/include/guestlinuxdebug.h | 2 +- drivers/staging/unisys/include/periodic_work.h | 10 +- drivers/staging/unisys/include/procobjecttree.h | 47 - drivers/staging/unisys/include/sparstop.h | 1 - drivers/staging/unisys/include/timskmod.h | 153 -- drivers/staging/unisys/include/uisutils.h | 5 - drivers/staging/unisys/include/visorbus.h | 201 ++ drivers/staging/unisys/uislib/Kconfig | 10 - drivers/staging/unisys/uislib/Makefile | 12 - drivers/staging/unisys/uislib/uislib.c | 1372 ----------- drivers/staging/unisys/uislib/uisqueue.c | 322 --- drivers/staging/unisys/uislib/uisthread.c | 69 - drivers/staging/unisys/uislib/uisutils.c | 137 -- drivers/staging/unisys/virthba/Kconfig | 13 - drivers/staging/unisys/virthba/Makefile | 12 - drivers/staging/unisys/virthba/virthba.c | 1572 ------------- drivers/staging/unisys/virthba/virthba.h | 27 - drivers/staging/unisys/virtpci/Kconfig | 10 - drivers/staging/unisys/virtpci/Makefile | 10 - drivers/staging/unisys/virtpci/virtpci.c | 1394 ----------- drivers/staging/unisys/virtpci/virtpci.h | 103 - drivers/staging/unisys/visorbus/Kconfig | 9 + drivers/staging/unisys/visorbus/Makefile | 15 + .../unisys/{visorutil => visorbus}/periodic_work.c | 57 +- drivers/staging/unisys/visorbus/visorbus_main.c | 2137 +++++++++++++++++ .../visorchipset.h => visorbus/visorbus_private.h} | 127 +- .../visorchannel.c} | 429 ++-- .../visorchipset.c} | 1101 +++++---- drivers/staging/unisys/visorchannel/globals.h | 2 - drivers/staging/unisys/visorchannel/visorchannel.h | 76 - drivers/staging/unisys/visorchipset/Kconfig | 11 - drivers/staging/unisys/visorchipset/Makefile | 15 - drivers/staging/unisys/visorchipset/file.c | 160 -- drivers/staging/unisys/visorchipset/file.h | 27 - drivers/staging/unisys/visorchipset/globals.h | 42 - drivers/staging/unisys/visorchipset/parser.c | 430 ---- drivers/staging/unisys/visorchipset/parser.h | 46 - .../unisys/visorchipset/visorchipset_umode.h | 35 - drivers/staging/unisys/visorutil/Kconfig | 9 - drivers/staging/unisys/visorutil/Makefile | 9 - drivers/staging/unisys/visorutil/charqueue.c | 127 -- drivers/staging/unisys/visorutil/charqueue.h | 37 - drivers/staging/unisys/visorutil/memregion.h | 43 - .../staging/unisys/visorutil/memregion_direct.c | 207 -- drivers/staging/unisys/visorutil/visorkmodutils.c | 71 - drivers/staging/vt6655/device_main.c | 21 +- drivers/staging/vt6655/mac.c | 49 +- drivers/staging/vt6655/rxtx.c | 2 +- include/linux/iio/iio.h | 1 + tools/Makefile | 7 +- 263 files changed, 10457 insertions(+), 15932 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/temperature/mlx90614.txt delete mode 100644 drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h delete mode 100644 drivers/staging/unisys/include/procobjecttree.h delete mode 100644 drivers/staging/unisys/include/timskmod.h create mode 100644 drivers/staging/unisys/include/visorbus.h delete mode 100644 drivers/staging/unisys/uislib/Kconfig delete mode 100644 drivers/staging/unisys/uislib/Makefile delete mode 100644 drivers/staging/unisys/uislib/uislib.c delete mode 100644 drivers/staging/unisys/uislib/uisqueue.c delete mode 100644 drivers/staging/unisys/uislib/uisthread.c delete mode 100644 drivers/staging/unisys/uislib/uisutils.c delete mode 100644 drivers/staging/unisys/virthba/Kconfig delete mode 100644 drivers/staging/unisys/virthba/Makefile delete mode 100644 drivers/staging/unisys/virthba/virthba.c delete mode 100644 drivers/staging/unisys/virthba/virthba.h delete mode 100644 drivers/staging/unisys/virtpci/Kconfig delete mode 100644 drivers/staging/unisys/virtpci/Makefile delete mode 100644 drivers/staging/unisys/virtpci/virtpci.c delete mode 100644 drivers/staging/unisys/virtpci/virtpci.h create mode 100644 drivers/staging/unisys/visorbus/Kconfig create mode 100644 drivers/staging/unisys/visorbus/Makefile rename drivers/staging/unisys/{visorutil => visorbus}/periodic_work.c (84%) create mode 100644 drivers/staging/unisys/visorbus/visorbus_main.c rename drivers/staging/unisys/{visorchipset/visorchipset.h => visorbus/visorbus_private.h} (54%) rename drivers/staging/unisys/{visorchannel/visorchannel_funcs.c => visorbus/visorchannel.c} (61%) rename drivers/staging/unisys/{visorchipset/visorchipset_main.c => visorbus/visorchipset.c} (75%) delete mode 100644 drivers/staging/unisys/visorchannel/visorchannel.h delete mode 100644 drivers/staging/unisys/visorchipset/Kconfig delete mode 100644 drivers/staging/unisys/visorchipset/Makefile delete mode 100644 drivers/staging/unisys/visorchipset/file.c delete mode 100644 drivers/staging/unisys/visorchipset/file.h delete mode 100644 drivers/staging/unisys/visorchipset/globals.h delete mode 100644 drivers/staging/unisys/visorchipset/parser.c delete mode 100644 drivers/staging/unisys/visorchipset/parser.h delete mode 100644 drivers/staging/unisys/visorchipset/visorchipset_umode.h delete mode 100644 drivers/staging/unisys/visorutil/Kconfig delete mode 100644 drivers/staging/unisys/visorutil/Makefile delete mode 100644 drivers/staging/unisys/visorutil/charqueue.c delete mode 100644 drivers/staging/unisys/visorutil/charqueue.h delete mode 100644 drivers/staging/unisys/visorutil/memregion.h delete mode 100644 drivers/staging/unisys/visorutil/memregion_direct.c delete mode 100644 drivers/staging/unisys/visorutil/visorkmodutils.c Merging char-misc/char-misc-next (5ebe6afaf005 Linux 4.1-rc2) $ git merge char-misc/char-misc-next Already up-to-date. Merging extcon/extcon-next (1ebabdaaf64a extcon: Remove the optional name of extcon device) $ git merge extcon/extcon-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/mfd/arizona.txt | 6 + drivers/extcon/Kconfig | 25 +- drivers/extcon/Makefile | 1 + drivers/extcon/extcon-adc-jack.c | 13 - drivers/extcon/extcon-arizona.c | 50 ++- drivers/extcon/extcon-axp288.c | 385 ++++++++++++++++++++++ drivers/extcon/extcon-gpio.c | 1 - drivers/extcon/extcon-max14577.c | 21 +- drivers/extcon/extcon-max77693.c | 67 ++-- drivers/extcon/extcon-max77843.c | 43 +-- drivers/extcon/extcon-max8997.c | 11 +- drivers/extcon/extcon-palmas.c | 1 - drivers/extcon/extcon-rt8973a.c | 23 +- drivers/extcon/extcon-sm5502.c | 1 - drivers/extcon/extcon-usb-gpio.c | 1 + drivers/extcon/extcon.c | 27 +- include/dt-bindings/mfd/arizona.h | 4 + include/linux/extcon.h | 11 +- include/linux/mfd/arizona/pdata.h | 3 + include/linux/mfd/axp20x.h | 5 + 20 files changed, 530 insertions(+), 169 deletions(-) create mode 100644 drivers/extcon/extcon-axp288.c Merging kdbus/kdbus (9fb9cd0f4434 kdbus: avoid the use of struct timespec) $ git merge kdbus/kdbus Resolved 'Documentation/Makefile' using previous resolution. Auto-merging tools/testing/selftests/Makefile Auto-merging init/Kconfig Auto-merging include/uapi/linux/magic.h Auto-merging include/uapi/linux/Kbuild Auto-merging Makefile Auto-merging MAINTAINERS Auto-merging Documentation/ioctl/ioctl-number.txt Auto-merging Documentation/Makefile CONFLICT (content): Merge conflict in Documentation/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 1bf7bdf43d52] Merge remote-tracking branch 'kdbus/kdbus' $ git diff -M --stat --summary HEAD^.. Documentation/Makefile | 2 +- Documentation/ioctl/ioctl-number.txt | 1 + Documentation/kdbus/.gitignore | 2 + Documentation/kdbus/Makefile | 40 + Documentation/kdbus/kdbus.bus.xml | 359 ++++ Documentation/kdbus/kdbus.connection.xml | 1250 ++++++++++++ Documentation/kdbus/kdbus.endpoint.xml | 429 ++++ Documentation/kdbus/kdbus.fs.xml | 124 ++ Documentation/kdbus/kdbus.item.xml | 839 ++++++++ Documentation/kdbus/kdbus.match.xml | 555 ++++++ Documentation/kdbus/kdbus.message.xml | 1276 ++++++++++++ Documentation/kdbus/kdbus.name.xml | 711 +++++++ Documentation/kdbus/kdbus.policy.xml | 406 ++++ Documentation/kdbus/kdbus.pool.xml | 326 +++ Documentation/kdbus/kdbus.xml | 1012 ++++++++++ Documentation/kdbus/stylesheet.xsl | 16 + MAINTAINERS | 13 + Makefile | 1 + include/uapi/linux/Kbuild | 1 + include/uapi/linux/kdbus.h | 979 +++++++++ include/uapi/linux/magic.h | 2 + init/Kconfig | 13 + ipc/Makefile | 2 +- ipc/kdbus/Makefile | 22 + ipc/kdbus/bus.c | 560 ++++++ ipc/kdbus/bus.h | 101 + ipc/kdbus/connection.c | 2214 +++++++++++++++++++++ ipc/kdbus/connection.h | 257 +++ ipc/kdbus/domain.c | 296 +++ ipc/kdbus/domain.h | 77 + ipc/kdbus/endpoint.c | 275 +++ ipc/kdbus/endpoint.h | 67 + ipc/kdbus/fs.c | 510 +++++ ipc/kdbus/fs.h | 28 + ipc/kdbus/handle.c | 617 ++++++ ipc/kdbus/handle.h | 85 + ipc/kdbus/item.c | 339 ++++ ipc/kdbus/item.h | 64 + ipc/kdbus/limits.h | 64 + ipc/kdbus/main.c | 125 ++ ipc/kdbus/match.c | 559 ++++++ ipc/kdbus/match.h | 35 + ipc/kdbus/message.c | 616 ++++++ ipc/kdbus/message.h | 133 ++ ipc/kdbus/metadata.c | 1159 +++++++++++ ipc/kdbus/metadata.h | 57 + ipc/kdbus/names.c | 772 +++++++ ipc/kdbus/names.h | 74 + ipc/kdbus/node.c | 910 +++++++++ ipc/kdbus/node.h | 84 + ipc/kdbus/notify.c | 248 +++ ipc/kdbus/notify.h | 30 + ipc/kdbus/policy.c | 489 +++++ ipc/kdbus/policy.h | 51 + ipc/kdbus/pool.c | 728 +++++++ ipc/kdbus/pool.h | 46 + ipc/kdbus/queue.c | 678 +++++++ ipc/kdbus/queue.h | 92 + ipc/kdbus/reply.c | 257 +++ ipc/kdbus/reply.h | 68 + ipc/kdbus/util.c | 201 ++ ipc/kdbus/util.h | 74 + samples/Kconfig | 7 + samples/Makefile | 3 +- samples/kdbus/.gitignore | 1 + samples/kdbus/Makefile | 9 + samples/kdbus/kdbus-api.h | 114 ++ samples/kdbus/kdbus-workers.c | 1326 ++++++++++++ tools/testing/selftests/Makefile | 1 + tools/testing/selftests/kdbus/.gitignore | 1 + tools/testing/selftests/kdbus/Makefile | 48 + tools/testing/selftests/kdbus/kdbus-enum.c | 94 + tools/testing/selftests/kdbus/kdbus-enum.h | 14 + tools/testing/selftests/kdbus/kdbus-test.c | 923 +++++++++ tools/testing/selftests/kdbus/kdbus-test.h | 85 + tools/testing/selftests/kdbus/kdbus-util.c | 1615 +++++++++++++++ tools/testing/selftests/kdbus/kdbus-util.h | 222 +++ tools/testing/selftests/kdbus/test-activator.c | 318 +++ tools/testing/selftests/kdbus/test-attach-flags.c | 750 +++++++ tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++ tools/testing/selftests/kdbus/test-bus.c | 175 ++ tools/testing/selftests/kdbus/test-chat.c | 122 ++ tools/testing/selftests/kdbus/test-connection.c | 616 ++++++ tools/testing/selftests/kdbus/test-daemon.c | 65 + tools/testing/selftests/kdbus/test-endpoint.c | 341 ++++ tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++ tools/testing/selftests/kdbus/test-free.c | 64 + tools/testing/selftests/kdbus/test-match.c | 441 ++++ tools/testing/selftests/kdbus/test-message.c | 731 +++++++ tools/testing/selftests/kdbus/test-metadata-ns.c | 506 +++++ tools/testing/selftests/kdbus/test-monitor.c | 176 ++ tools/testing/selftests/kdbus/test-names.c | 194 ++ tools/testing/selftests/kdbus/test-policy-ns.c | 632 ++++++ tools/testing/selftests/kdbus/test-policy-priv.c | 1269 ++++++++++++ tools/testing/selftests/kdbus/test-policy.c | 80 + tools/testing/selftests/kdbus/test-sync.c | 369 ++++ tools/testing/selftests/kdbus/test-timeout.c | 99 + 97 files changed, 34069 insertions(+), 3 deletions(-) create mode 100644 Documentation/kdbus/.gitignore create mode 100644 Documentation/kdbus/Makefile create mode 100644 Documentation/kdbus/kdbus.bus.xml create mode 100644 Documentation/kdbus/kdbus.connection.xml create mode 100644 Documentation/kdbus/kdbus.endpoint.xml create mode 100644 Documentation/kdbus/kdbus.fs.xml create mode 100644 Documentation/kdbus/kdbus.item.xml create mode 100644 Documentation/kdbus/kdbus.match.xml create mode 100644 Documentation/kdbus/kdbus.message.xml create mode 100644 Documentation/kdbus/kdbus.name.xml create mode 100644 Documentation/kdbus/kdbus.policy.xml create mode 100644 Documentation/kdbus/kdbus.pool.xml create mode 100644 Documentation/kdbus/kdbus.xml create mode 100644 Documentation/kdbus/stylesheet.xsl create mode 100644 include/uapi/linux/kdbus.h create mode 100644 ipc/kdbus/Makefile create mode 100644 ipc/kdbus/bus.c create mode 100644 ipc/kdbus/bus.h create mode 100644 ipc/kdbus/connection.c create mode 100644 ipc/kdbus/connection.h create mode 100644 ipc/kdbus/domain.c create mode 100644 ipc/kdbus/domain.h create mode 100644 ipc/kdbus/endpoint.c create mode 100644 ipc/kdbus/endpoint.h create mode 100644 ipc/kdbus/fs.c create mode 100644 ipc/kdbus/fs.h create mode 100644 ipc/kdbus/handle.c create mode 100644 ipc/kdbus/handle.h create mode 100644 ipc/kdbus/item.c create mode 100644 ipc/kdbus/item.h create mode 100644 ipc/kdbus/limits.h create mode 100644 ipc/kdbus/main.c create mode 100644 ipc/kdbus/match.c create mode 100644 ipc/kdbus/match.h create mode 100644 ipc/kdbus/message.c create mode 100644 ipc/kdbus/message.h create mode 100644 ipc/kdbus/metadata.c create mode 100644 ipc/kdbus/metadata.h create mode 100644 ipc/kdbus/names.c create mode 100644 ipc/kdbus/names.h create mode 100644 ipc/kdbus/node.c create mode 100644 ipc/kdbus/node.h create mode 100644 ipc/kdbus/notify.c create mode 100644 ipc/kdbus/notify.h create mode 100644 ipc/kdbus/policy.c create mode 100644 ipc/kdbus/policy.h create mode 100644 ipc/kdbus/pool.c create mode 100644 ipc/kdbus/pool.h create mode 100644 ipc/kdbus/queue.c create mode 100644 ipc/kdbus/queue.h create mode 100644 ipc/kdbus/reply.c create mode 100644 ipc/kdbus/reply.h create mode 100644 ipc/kdbus/util.c create mode 100644 ipc/kdbus/util.h create mode 100644 samples/kdbus/.gitignore create mode 100644 samples/kdbus/Makefile create mode 100644 samples/kdbus/kdbus-api.h create mode 100644 samples/kdbus/kdbus-workers.c create mode 100644 tools/testing/selftests/kdbus/.gitignore create mode 100644 tools/testing/selftests/kdbus/Makefile create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h create mode 100644 tools/testing/selftests/kdbus/test-activator.c create mode 100644 tools/testing/selftests/kdbus/test-attach-flags.c create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c create mode 100644 tools/testing/selftests/kdbus/test-bus.c create mode 100644 tools/testing/selftests/kdbus/test-chat.c create mode 100644 tools/testing/selftests/kdbus/test-connection.c create mode 100644 tools/testing/selftests/kdbus/test-daemon.c create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c create mode 100644 tools/testing/selftests/kdbus/test-fd.c create mode 100644 tools/testing/selftests/kdbus/test-free.c create mode 100644 tools/testing/selftests/kdbus/test-match.c create mode 100644 tools/testing/selftests/kdbus/test-message.c create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c create mode 100644 tools/testing/selftests/kdbus/test-monitor.c create mode 100644 tools/testing/selftests/kdbus/test-names.c create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c create mode 100644 tools/testing/selftests/kdbus/test-policy.c create mode 100644 tools/testing/selftests/kdbus/test-sync.c create mode 100644 tools/testing/selftests/kdbus/test-timeout.c Merging cgroup/for-next (d0f702e648dc cgroup: fix some comment typos) $ git merge cgroup/for-next Merge made by the 'recursive' strategy. kernel/cgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Merging scsi/for-next (8b2564ec7410 lpfc: Fix breakage on big endian kernels) $ git merge scsi/for-next Merge made by the 'recursive' strategy. drivers/scsi/lpfc/lpfc_scsi.c | 41 +++++++++++++++++++++-------------------- drivers/scsi/storvsc_drv.c | 3 +-- 2 files changed, 22 insertions(+), 22 deletions(-) Merging target-updates/for-next (b1c8c41c1b80 target: Convert se_tpg->acl_node_lock to ->acl_node_mutex) $ git merge target-updates/for-next Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c Merge made by the 'recursive' strategy. Documentation/target/tcm_mod_builder.py | 277 +--------------- Documentation/target/tcm_mod_builder.txt | 4 +- Documentation/target/tcmu-design.txt | 2 +- drivers/infiniband/ulp/isert/ib_isert.c | 6 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 181 ++--------- drivers/infiniband/ulp/srpt/ib_srpt.h | 23 +- drivers/scsi/qla2xxx/qla_target.c | 52 ++- drivers/scsi/qla2xxx/qla_target.h | 1 - drivers/scsi/qla2xxx/tcm_qla2xxx.c | 232 +------------ drivers/scsi/qla2xxx/tcm_qla2xxx.h | 6 +- drivers/target/iscsi/iscsi_target.c | 38 +-- drivers/target/iscsi/iscsi_target_configfs.c | 136 ++------ drivers/target/iscsi/iscsi_target_erl0.c | 53 --- drivers/target/iscsi/iscsi_target_erl0.h | 1 - drivers/target/iscsi/iscsi_target_login.c | 58 +--- drivers/target/iscsi/iscsi_target_login.h | 1 - drivers/target/iscsi/iscsi_target_parameters.c | 275 +--------------- drivers/target/iscsi/iscsi_target_parameters.h | 11 +- drivers/target/iscsi/iscsi_target_tpg.c | 6 +- drivers/target/iscsi/iscsi_target_util.c | 53 +-- drivers/target/iscsi/iscsi_target_util.h | 1 - drivers/target/loopback/tcm_loop.c | 177 +--------- drivers/target/loopback/tcm_loop.h | 9 - drivers/target/sbp/sbp_target.c | 189 +---------- drivers/target/sbp/sbp_target.h | 9 - drivers/target/target_core_alua.c | 1 - drivers/target/target_core_configfs.c | 103 ++---- drivers/target/target_core_device.c | 430 +++++++++++-------------- drivers/target/target_core_fabric_configfs.c | 168 +++++----- drivers/target/target_core_fabric_lib.c | 283 ++++++++-------- drivers/target/target_core_file.c | 136 ++------ drivers/target/target_core_file.h | 6 - drivers/target/target_core_hba.c | 1 - drivers/target/target_core_internal.h | 26 +- drivers/target/target_core_pr.c | 300 +++++++++-------- drivers/target/target_core_pscsi.c | 17 +- drivers/target/target_core_rd.c | 20 +- drivers/target/target_core_sbc.c | 230 ++++++------- drivers/target/target_core_spc.c | 51 +-- drivers/target/target_core_stat.c | 181 ++++++----- drivers/target/target_core_tmr.c | 24 +- drivers/target/target_core_tpg.c | 426 ++++++++---------------- drivers/target/target_core_transport.c | 157 ++++----- drivers/target/target_core_ua.c | 52 ++- drivers/target/target_core_user.c | 221 ++++++++----- drivers/target/target_core_xcopy.c | 23 +- drivers/target/tcm_fc/tcm_fc.h | 3 +- drivers/target/tcm_fc/tfc_cmd.c | 11 +- drivers/target/tcm_fc/tfc_conf.c | 109 ++----- drivers/target/tcm_fc/tfc_io.c | 1 - drivers/target/tcm_fc/tfc_sess.c | 1 - drivers/usb/gadget/legacy/tcm_usb_gadget.c | 191 +---------- drivers/usb/gadget/legacy/tcm_usb_gadget.h | 11 - drivers/vhost/scsi.c | 225 +------------ drivers/xen/xen-scsiback.c | 187 ++--------- include/linux/crc-t10dif.h | 1 + include/target/iscsi/iscsi_target_core.h | 12 +- include/target/target_core_backend.h | 8 +- include/target/target_core_base.h | 54 ++-- include/target/target_core_configfs.h | 59 ++-- include/target/target_core_fabric.h | 64 +--- lib/crc-t10dif.c | 12 +- 62 files changed, 1597 insertions(+), 4009 deletions(-) $ git reset --hard HEAD^ HEAD is now at 4391d4e007d8 Merge remote-tracking branch 'scsi/for-next' Merging next-20150511 version of target-updates $ git merge -m next-20150511/target-updates b2e965f1fc28ba4c15e409be7a4daea6450b7d2f Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c Merge made by the 'recursive' strategy. Documentation/target/tcm_mod_builder.py | 277 +----------------------- Documentation/target/tcm_mod_builder.txt | 4 +- Documentation/target/tcmu-design.txt | 2 +- drivers/infiniband/ulp/isert/ib_isert.c | 6 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 181 +++------------- drivers/infiniband/ulp/srpt/ib_srpt.h | 23 +- drivers/scsi/qla2xxx/qla_target.c | 52 ++--- drivers/scsi/qla2xxx/qla_target.h | 1 - drivers/scsi/qla2xxx/tcm_qla2xxx.c | 232 ++------------------ drivers/scsi/qla2xxx/tcm_qla2xxx.h | 6 +- drivers/target/iscsi/iscsi_target.c | 38 ++-- drivers/target/iscsi/iscsi_target_configfs.c | 136 +++--------- drivers/target/iscsi/iscsi_target_erl0.c | 53 ----- drivers/target/iscsi/iscsi_target_erl0.h | 1 - drivers/target/iscsi/iscsi_target_login.c | 58 +---- drivers/target/iscsi/iscsi_target_login.h | 1 - drivers/target/iscsi/iscsi_target_parameters.c | 275 +----------------------- drivers/target/iscsi/iscsi_target_parameters.h | 11 +- drivers/target/iscsi/iscsi_target_tpg.c | 4 +- drivers/target/iscsi/iscsi_target_util.c | 53 +---- drivers/target/iscsi/iscsi_target_util.h | 1 - drivers/target/loopback/tcm_loop.c | 177 +--------------- drivers/target/loopback/tcm_loop.h | 9 - drivers/target/sbp/sbp_target.c | 173 +-------------- drivers/target/sbp/sbp_target.h | 9 - drivers/target/target_core_alua.c | 1 - drivers/target/target_core_configfs.c | 97 +++------ drivers/target/target_core_device.c | 32 +-- drivers/target/target_core_fabric_configfs.c | 102 ++++----- drivers/target/target_core_fabric_lib.c | 283 ++++++++++++------------- drivers/target/target_core_file.c | 136 +++--------- drivers/target/target_core_file.h | 6 - drivers/target/target_core_hba.c | 1 - drivers/target/target_core_internal.h | 17 +- drivers/target/target_core_pr.c | 90 +++----- drivers/target/target_core_rd.c | 20 +- drivers/target/target_core_sbc.c | 230 +++++++++----------- drivers/target/target_core_spc.c | 24 +-- drivers/target/target_core_stat.c | 1 - drivers/target/target_core_tmr.c | 24 +-- drivers/target/target_core_tpg.c | 206 +++++++----------- drivers/target/target_core_transport.c | 139 ++++++------ drivers/target/target_core_ua.c | 1 - drivers/target/target_core_user.c | 221 +++++++++++-------- drivers/target/target_core_xcopy.c | 23 +- drivers/target/tcm_fc/tcm_fc.h | 3 +- drivers/target/tcm_fc/tfc_cmd.c | 11 +- drivers/target/tcm_fc/tfc_conf.c | 105 ++------- drivers/target/tcm_fc/tfc_io.c | 1 - drivers/target/tcm_fc/tfc_sess.c | 1 - drivers/usb/gadget/legacy/tcm_usb_gadget.c | 191 ++--------------- drivers/usb/gadget/legacy/tcm_usb_gadget.h | 11 - drivers/vhost/scsi.c | 225 +------------------- drivers/xen/xen-scsiback.c | 160 +------------- include/linux/crc-t10dif.h | 1 + include/target/iscsi/iscsi_target_core.h | 12 +- include/target/target_core_backend.h | 8 +- include/target/target_core_base.h | 26 +-- include/target/target_core_configfs.h | 59 ++---- include/target/target_core_fabric.h | 63 +----- lib/crc-t10dif.c | 12 +- 61 files changed, 973 insertions(+), 3353 deletions(-) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) $ git merge target-merge/for-next-merge Already up-to-date. Merging pinctrl/for-next (5e2742959a1c Merge branch 'devel' into for-next) $ git merge pinctrl/for-next Merge made by the 'recursive' strategy. .../bindings/pinctrl/img,pistachio-pinctrl.txt | 217 ++++ .../bindings/pinctrl/nxp,lpc1850-scu.txt | 57 + .../bindings/pinctrl/xlnx,zynq-pinctrl.txt | 7 +- Documentation/pinctrl.txt | 11 + drivers/gpio/gpio-bcm-kona.c | 2 +- drivers/gpio/gpio-em.c | 2 +- drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-mpc8xxx.c | 2 +- drivers/gpio/gpio-sa1100.c | 2 +- drivers/gpio/gpio-sodaville.c | 2 +- drivers/pinctrl/Kconfig | 9 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/freescale/Kconfig | 7 + drivers/pinctrl/freescale/Makefile | 1 + drivers/pinctrl/freescale/pinctrl-imx.c | 55 +- drivers/pinctrl/freescale/pinctrl-imx7d.c | 385 +++++++ drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 62 +- drivers/pinctrl/pinctrl-adi2.c | 1 + drivers/pinctrl/pinctrl-at91.c | 16 + drivers/pinctrl/pinctrl-lpc18xx.c | 1144 ++++++++++++++++++++ drivers/pinctrl/pinctrl-single.c | 2 +- drivers/pinctrl/pinctrl-zynq.c | 70 +- drivers/pinctrl/pinmux.c | 13 + include/linux/pinctrl/consumer.h | 2 +- include/linux/pinctrl/pinmux.h | 4 + 26 files changed, 2019 insertions(+), 58 deletions(-) create mode 100644 Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/nxp,lpc1850-scu.txt create mode 100644 drivers/pinctrl/freescale/pinctrl-imx7d.c create mode 100644 drivers/pinctrl/pinctrl-lpc18xx.c Merging vhost/linux-next (f4aaa799cf9a tun, macvtap: higher order allocations for skbs) $ git merge vhost/linux-next Auto-merging include/linux/pci.h Auto-merging drivers/pci/msi.c Auto-merging drivers/net/tun.c Auto-merging drivers/net/macvtap.c Merge made by the 'recursive' strategy. drivers/net/macvtap.c | 2 +- drivers/net/tun.c | 2 +- drivers/pci/msi.c | 4 ++-- drivers/pci/pci-driver.c | 2 -- include/linux/pci.h | 4 ---- 5 files changed, 4 insertions(+), 10 deletions(-) Merging remoteproc/for-next (172e6ab1caff remoteproc: fix various checkpatch warnings) $ git merge remoteproc/for-next Merge made by the 'recursive' strategy. drivers/remoteproc/da8xx_remoteproc.c | 3 +-- drivers/remoteproc/remoteproc_core.c | 27 +++++++++------------------ drivers/remoteproc/remoteproc_internal.h | 2 +- drivers/remoteproc/ste_modem_rproc.c | 4 ++-- 4 files changed, 13 insertions(+), 23 deletions(-) Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) $ git merge rpmsg/for-next Already up-to-date. Merging gpio/for-next (10fc7f870b72 Merge branch 'devel' into for-next) $ git merge gpio/for-next Auto-merging drivers/gpio/gpio-bcm-kona.c Merge made by the 'recursive' strategy. .../devicetree/bindings/gpio/gpio-xlp.txt | 47 +++ .../devicetree/bindings/gpio/nxp,lpc1850-gpio.txt | 39 ++ drivers/gpio/Kconfig | 21 +- drivers/gpio/Makefile | 2 + drivers/gpio/gpio-bcm-kona.c | 26 +- drivers/gpio/gpio-lpc18xx.c | 180 +++++++++ drivers/gpio/gpio-max732x.c | 21 +- drivers/gpio/gpio-omap.c | 24 ++ drivers/gpio/gpio-xlp.c | 425 +++++++++++++++++++++ include/linux/platform_data/gpio-omap.h | 12 +- 10 files changed, 777 insertions(+), 20 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xlp.txt create mode 100644 Documentation/devicetree/bindings/gpio/nxp,lpc1850-gpio.txt create mode 100644 drivers/gpio/gpio-lpc18xx.c create mode 100644 drivers/gpio/gpio-xlp.c Merging dma-mapping/dma-mapping-next (5ebe6afaf005 Linux 4.1-rc2) $ git merge dma-mapping/dma-mapping-next Already up-to-date. Merging pwm/for-next (efb0de55b6a2 pwm: Add support to remove registered consumer lookup tables) $ git merge pwm/for-next Merge made by the 'recursive' strategy. drivers/pwm/core.c | 17 +++++++++++++++++ include/linux/pwm.h | 5 +++++ 2 files changed, 22 insertions(+) Merging dma-buf/for-next (5ebe6afaf005 Linux 4.1-rc2) $ git merge dma-buf/for-next Already up-to-date. Merging userns/for-next (7e96c1b0e0f4 mnt: Fix fs_fully_visible to verify the root directory is visible) $ git merge userns/for-next Already up-to-date. Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) $ git merge ktest/for-next Already up-to-date. Merging clk/clk-next (81573560150d Merge branch 'clk-fixes' into clk-next) $ git merge clk/clk-next Auto-merging include/linux/clk-provider.h Auto-merging drivers/clk/clk.c Auto-merging drivers/clk/Makefile Merge made by the 'recursive' strategy. .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 23 + .../bindings/arm/mediatek/mediatek,infracfg.txt | 30 + .../bindings/arm/mediatek/mediatek,pericfg.txt | 30 + .../bindings/arm/mediatek/mediatek,topckgen.txt | 23 + .../devicetree/bindings/clock/emev2-clock.txt | 2 +- .../devicetree/bindings/clock/silabs,si5351.txt | 4 +- drivers/clk/Makefile | 1 + drivers/clk/at91/pmc.c | 2 +- drivers/clk/clk-cdce706.c | 4 +- drivers/clk/clk-composite.c | 2 +- drivers/clk/clk-ls1x.c | 6 +- drivers/clk/clk-mux.c | 6 +- drivers/clk/clk-si5351.c | 63 +- drivers/clk/clk.c | 1933 ++++++++++---------- drivers/clk/mediatek/Makefile | 4 + drivers/clk/mediatek/clk-gate.c | 137 ++ drivers/clk/mediatek/clk-gate.h | 49 + drivers/clk/mediatek/clk-mt8135.c | 644 +++++++ drivers/clk/mediatek/clk-mt8173.c | 830 +++++++++ drivers/clk/mediatek/clk-mtk.c | 220 +++ drivers/clk/mediatek/clk-mtk.h | 169 ++ drivers/clk/mediatek/clk-pll.c | 332 ++++ drivers/clk/mediatek/reset.c | 97 + drivers/clk/qcom/gcc-msm8916.c | 4 +- drivers/clk/rockchip/clk-rk3188.c | 2 +- drivers/clk/rockchip/clk-rk3288.c | 2 +- drivers/clk/samsung/Makefile | 2 +- drivers/clk/samsung/clk-exynos5260.c | 74 +- drivers/clk/samsung/clk-exynos5420.c | 11 +- drivers/clk/samsung/clk-exynos5433.c | 12 +- drivers/clk/samsung/clk-s3c2410-dclk.c | 6 +- drivers/clk/sirf/clk-common.c | 12 +- drivers/clk/ux500/u8500_clk.c | 7 +- drivers/clk/ux500/u8500_of_clk.c | 4 +- include/dt-bindings/clock/mt8135-clk.h | 194 ++ include/dt-bindings/clock/mt8173-clk.h | 235 +++ .../dt-bindings/reset-controller/mt8135-resets.h | 64 + .../dt-bindings/reset-controller/mt8173-resets.h | 63 + include/linux/clk-provider.h | 10 +- include/linux/platform_data/si5351.h | 4 - 40 files changed, 4224 insertions(+), 1093 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,apmixedsys.txt create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,topckgen.txt create mode 100644 drivers/clk/mediatek/Makefile create mode 100644 drivers/clk/mediatek/clk-gate.c create mode 100644 drivers/clk/mediatek/clk-gate.h create mode 100644 drivers/clk/mediatek/clk-mt8135.c create mode 100644 drivers/clk/mediatek/clk-mt8173.c create mode 100644 drivers/clk/mediatek/clk-mtk.c create mode 100644 drivers/clk/mediatek/clk-mtk.h create mode 100644 drivers/clk/mediatek/clk-pll.c create mode 100644 drivers/clk/mediatek/reset.c create mode 100644 include/dt-bindings/clock/mt8135-clk.h create mode 100644 include/dt-bindings/clock/mt8173-clk.h create mode 100644 include/dt-bindings/reset-controller/mt8135-resets.h create mode 100644 include/dt-bindings/reset-controller/mt8173-resets.h Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) $ git merge random/dev Already up-to-date. Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) $ git merge aio/master Already up-to-date. Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) $ git merge llvmlinux/for-next Merge made by the 'recursive' strategy. Merging kselftest/next (5c6c3e612ef5 selftests/exec: do not install subdir as it is already created) $ git merge kselftest/next Merge made by the 'recursive' strategy. tools/testing/selftests/exec/Makefile | 2 +- tools/testing/selftests/ftrace/Makefile | 1 + tools/testing/selftests/lib.mk | 3 + tools/testing/selftests/mount/Makefile | 7 +- tools/testing/selftests/timers/.gitignore | 18 +++ tools/testing/selftests/vm/Makefile | 7 +- tools/testing/selftests/vm/compaction_test.c | 225 +++++++++++++++++++++++++++ tools/testing/selftests/vm/run_vmtests | 12 ++ 8 files changed, 272 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/timers/.gitignore create mode 100644 tools/testing/selftests/vm/compaction_test.c Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) $ git merge y2038/y2038 Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution. Auto-merging kernel/cpuset.c Auto-merging fs/coredump.c Auto-merging drivers/staging/media/lirc/lirc_serial.c Auto-merging drivers/staging/media/lirc/lirc_sasem.c Auto-merging drivers/staging/media/lirc/lirc_parallel.c CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c Auto-merging drivers/staging/gdm72xx/gdm_sdio.c Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ed006b717eb3] Merge remote-tracking branch 'y2038/y2038' $ git diff -M --stat --summary HEAD^.. drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +- drivers/staging/ft1000/ft1000.h | 4 +- drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- drivers/staging/gdm72xx/gdm_sdio.h | 4 +- drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- fs/coredump.c | 8 ++-- kernel/cpuset.c | 12 ++++-- 11 files changed, 68 insertions(+), 90 deletions(-) Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) $ git merge luto-misc/next Already up-to-date. Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5) $ git merge access_once/linux-next Already up-to-date. Merging livepatching/for-next (4098cabe3262 Merge branch 'for-4.2/upstream' into for-next) $ git merge livepatching/for-next Auto-merging arch/x86/kernel/setup.c Merge made by the 'recursive' strategy. arch/x86/include/asm/livepatch.h | 1 + arch/x86/include/asm/setup.h | 7 +++++++ arch/x86/kernel/machine_kexec_64.c | 3 ++- arch/x86/kernel/setup.c | 2 +- kernel/livepatch/core.c | 7 ++++--- 5 files changed, 15 insertions(+), 5 deletions(-) Merging coresight/next (48582dcacc6b coresight: fix typo in of_coresight.c) $ git merge coresight/next Merge made by the 'recursive' strategy. .../devicetree/bindings/arm/coresight.txt | 13 ++- drivers/hwtracing/coresight/coresight-etb10.c | 79 +++++++++------ drivers/hwtracing/coresight/coresight-etm.h | 4 +- drivers/hwtracing/coresight/coresight-etm3x.c | 112 ++++++++++----------- drivers/hwtracing/coresight/coresight-funnel.c | 61 +++++++---- drivers/hwtracing/coresight/coresight-replicator.c | 71 ++++++++++++- drivers/hwtracing/coresight/coresight-tmc.c | 31 ++---- drivers/hwtracing/coresight/coresight-tpiu.c | 60 ++++++++--- drivers/hwtracing/coresight/of_coresight.c | 2 +- 9 files changed, 281 insertions(+), 152 deletions(-) Merging rtc/rtc-next (529a4c385f04 rtc: mc13xxx: fix obfuscated and wrong format string) $ git merge rtc/rtc-next Auto-merging drivers/rtc/Makefile Auto-merging drivers/rtc/Kconfig Auto-merging drivers/mfd/mt6397-core.c Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 7 + drivers/mfd/mt6397-core.c | 18 ++ drivers/rtc/Kconfig | 11 + drivers/rtc/Makefile | 1 + drivers/rtc/interface.c | 4 +- drivers/rtc/rtc-ab8500.c | 2 +- drivers/rtc/rtc-at32ap700x.c | 2 +- drivers/rtc/rtc-efi.c | 4 +- drivers/rtc/rtc-hid-sensor-time.c | 2 +- drivers/rtc/rtc-imxdi.c | 438 +++++++++++++++++++++++++++++++++----- drivers/rtc/rtc-mc13xxx.c | 2 +- drivers/rtc/rtc-mt6397.c | 394 ++++++++++++++++++++++++++++++++++ drivers/rtc/rtc-mxc.c | 2 +- drivers/rtc/rtc-s3c.c | 14 +- include/linux/rtc.h | 11 +- 15 files changed, 825 insertions(+), 87 deletions(-) create mode 100644 drivers/rtc/rtc-mt6397.c Merging akpm-current/current (a3980f9598c6 lib/scatterlist: mark input buffer parameters as 'const') $ git merge --no-ff akpm-current/current Recorded preimage for 'arch/x86/kernel/cpu/mtrr/generic.c' Resolved 'Documentation/devicetree/bindings/rtc/abracon,abx80x.txt' using previous resolution. Resolved 'arch/x86/kernel/machine_kexec_64.c' using previous resolution. Resolved 'drivers/block/zram/zram_drv.c' using previous resolution. Auto-merging mm/shmem.c Auto-merging mm/memory-failure.c Auto-merging lib/Makefile Auto-merging lib/Kconfig Auto-merging include/linux/scatterlist.h Auto-merging include/linux/rtc.h Removing include/linux/compiler-gcc5.h Removing include/linux/compiler-gcc4.h Removing include/linux/compiler-gcc3.h Auto-merging fs/ocfs2/dlm/dlmmaster.c Auto-merging fs/cifs/file.c Auto-merging drivers/rtc/interface.c Auto-merging drivers/block/zram/zram_drv.c CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c Auto-merging arch/xtensa/include/asm/dma-mapping.h Auto-merging arch/x86/kernel/machine_kexec_64.c CONFLICT (content): Merge conflict in arch/x86/kernel/machine_kexec_64.c Auto-merging arch/x86/kernel/cpu/mtrr/generic.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mtrr/generic.c Auto-merging arch/x86/Kconfig Auto-merging MAINTAINERS Auto-merging Documentation/devicetree/bindings/rtc/abracon,abx80x.txt CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/rtc/abracon,abx80x.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/x86/kernel/cpu/mtrr/generic.c'. [master 8881892dc3d9] Merge branch 'akpm-current/current' $ git diff -M --stat --summary HEAD^.. Documentation/ABI/testing/sysfs-class-zram | 24 + Documentation/blockdev/zram.txt | 29 +- Documentation/filesystems/vfat.txt | 10 + Documentation/lockup-watchdogs.txt | 18 + Documentation/printk-formats.txt | 8 + Documentation/sysctl/kernel.txt | 21 + MAINTAINERS | 23 +- arch/alpha/include/asm/mm-arch-hooks.h | 15 + arch/alpha/include/uapi/asm/mman.h | 1 + arch/arc/include/asm/dma-mapping.h | 12 +- arch/arc/include/asm/mm-arch-hooks.h | 15 + arch/arm/include/asm/hugetlb.h | 4 - arch/arm/include/asm/mm-arch-hooks.h | 15 + arch/arm/include/asm/pgtable-3level.h | 1 + arch/arm/mm/hugetlbpage.c | 5 - arch/arm64/include/asm/hugetlb.h | 4 - arch/arm64/include/asm/mm-arch-hooks.h | 15 + arch/arm64/include/asm/pgtable.h | 2 + arch/arm64/mm/hugetlbpage.c | 7 - arch/avr32/include/asm/dma-mapping.h | 19 +- arch/avr32/include/asm/mm-arch-hooks.h | 15 + arch/blackfin/include/asm/mm-arch-hooks.h | 15 + arch/c6x/include/asm/mm-arch-hooks.h | 15 + arch/cris/include/asm/mm-arch-hooks.h | 15 + arch/frv/include/asm/mm-arch-hooks.h | 15 + arch/frv/include/asm/sections.h | 6 - arch/frv/mb93090-mb00/pci-dma-nommu.c | 10 +- arch/frv/mb93090-mb00/pci-dma.c | 7 +- arch/hexagon/include/asm/mm-arch-hooks.h | 15 + arch/ia64/include/asm/hugetlb.h | 4 - arch/ia64/include/asm/mm-arch-hooks.h | 15 + arch/ia64/mm/hugetlbpage.c | 5 - arch/ia64/mm/numa.c | 19 +- arch/m32r/include/asm/mm-arch-hooks.h | 15 + arch/m68k/include/asm/mm-arch-hooks.h | 15 + arch/metag/include/asm/hugetlb.h | 4 - arch/metag/include/asm/mm-arch-hooks.h | 15 + arch/metag/mm/hugetlbpage.c | 5 - arch/microblaze/include/asm/mm-arch-hooks.h | 15 + arch/mips/include/asm/hugetlb.h | 4 - arch/mips/include/asm/mm-arch-hooks.h | 15 + arch/mips/include/uapi/asm/mman.h | 1 + arch/mips/mm/dma-default.c | 30 +- arch/mips/mm/hugetlbpage.c | 5 - arch/mn10300/include/asm/mm-arch-hooks.h | 15 + arch/nios2/include/asm/mm-arch-hooks.h | 15 + arch/openrisc/include/asm/mm-arch-hooks.h | 15 + arch/parisc/include/asm/mm-arch-hooks.h | 15 + arch/parisc/include/uapi/asm/mman.h | 1 + arch/parisc/kernel/pci-dma.c | 27 +- arch/powerpc/include/asm/hugetlb.h | 5 - arch/powerpc/include/asm/mm-arch-hooks.h | 28 + arch/powerpc/include/asm/mmu_context.h | 23 +- arch/powerpc/include/asm/pgtable-ppc64.h | 2 + arch/powerpc/kernel/vio.c | 10 +- arch/powerpc/mm/hugetlbpage.c | 5 - arch/s390/include/asm/hugetlb.h | 1 - arch/s390/include/asm/mm-arch-hooks.h | 15 + arch/s390/mm/hugetlbpage.c | 5 - arch/score/include/asm/mm-arch-hooks.h | 15 + arch/sh/include/asm/hugetlb.h | 3 - arch/sh/include/asm/mm-arch-hooks.h | 15 + arch/sh/mm/hugetlbpage.c | 5 - arch/sparc/include/asm/hugetlb.h | 4 - arch/sparc/include/asm/mm-arch-hooks.h | 15 + arch/sparc/include/asm/pgtable_64.h | 9 + arch/sparc/kernel/ldc.c | 8 +- arch/sparc/mm/hugetlbpage.c | 5 - arch/tile/include/asm/hugetlb.h | 4 - arch/tile/include/asm/mm-arch-hooks.h | 15 + arch/tile/mm/hugetlbpage.c | 5 - arch/um/include/asm/mm-arch-hooks.h | 15 + arch/unicore32/include/asm/mm-arch-hooks.h | 15 + arch/x86/Kconfig | 3 +- arch/x86/include/asm/hugetlb.h | 3 - arch/x86/include/asm/mm-arch-hooks.h | 15 + arch/x86/include/asm/mtrr.h | 7 +- arch/x86/include/asm/pgtable.h | 5 + arch/x86/include/uapi/asm/mtrr.h | 12 +- arch/x86/kernel/cpu/mtrr/generic.c | 192 +++-- arch/x86/kernel/machine_kexec_64.c | 1 + arch/x86/mm/pat.c | 4 +- arch/x86/mm/pgtable.c | 53 +- arch/xtensa/include/asm/dma-mapping.h | 19 +- arch/xtensa/include/asm/mm-arch-hooks.h | 15 + arch/xtensa/include/uapi/asm/mman.h | 1 + block/genhd.c | 2 +- drivers/base/node.c | 6 +- drivers/block/zram/Kconfig | 10 +- drivers/block/zram/zram_drv.c | 1020 +++++++++++++++------------ drivers/block/zram/zram_drv.h | 10 +- drivers/memstick/host/jmb38x_ms.c | 12 +- drivers/memstick/host/r592.c | 10 +- drivers/rtc/class.c | 24 + drivers/rtc/interface.c | 13 +- drivers/rtc/rtc-ds1307.c | 12 +- drivers/rtc/rtc-omap.c | 14 +- fs/adfs/super.c | 2 +- fs/affs/amigaffs.c | 2 +- fs/affs/inode.c | 2 +- fs/befs/btree.c | 6 +- fs/cifs/file.c | 8 +- fs/configfs/item.c | 3 +- fs/efs/super.c | 2 +- fs/ext4/fsync.c | 5 +- fs/fat/cache.c | 79 ++- fs/fat/dir.c | 2 +- fs/fat/fat.h | 6 +- fs/fat/file.c | 61 ++ fs/fat/inode.c | 75 +- fs/hugetlbfs/inode.c | 1 - fs/jbd2/journal.c | 11 +- fs/jbd2/transaction.c | 20 +- fs/kernfs/dir.c | 9 +- fs/minix/inode.c | 2 +- fs/mpage.c | 23 +- fs/ocfs2/alloc.c | 282 +++++--- fs/ocfs2/aops.c | 37 +- fs/ocfs2/buffer_head_io.c | 6 + fs/ocfs2/cluster/heartbeat.c | 49 +- fs/ocfs2/cluster/masklog.c | 34 + fs/ocfs2/cluster/masklog.h | 42 +- fs/ocfs2/dir.c | 90 ++- fs/ocfs2/dlm/dlmcommon.h | 1 - fs/ocfs2/dlm/dlmmaster.c | 22 +- fs/ocfs2/dlm/dlmthread.c | 10 + fs/ocfs2/extent_map.c | 22 +- fs/ocfs2/inode.c | 40 +- fs/ocfs2/journal.c | 49 +- fs/ocfs2/localalloc.c | 3 +- fs/ocfs2/move_extents.c | 8 +- fs/ocfs2/namei.c | 46 +- fs/ocfs2/namei.h | 4 +- fs/ocfs2/ocfs2.h | 2 + fs/ocfs2/quota_local.c | 3 +- fs/ocfs2/refcounttree.c | 81 +-- fs/ocfs2/suballoc.c | 90 +-- fs/ocfs2/super.c | 67 +- fs/ocfs2/super.h | 8 +- fs/ocfs2/xattr.c | 51 +- fs/posix_acl.c | 46 +- fs/proc/array.c | 8 + fs/reiserfs/super.c | 3 +- include/linux/bootmem.h | 8 +- include/linux/compiler-gcc.h | 207 ++++-- include/linux/compiler-gcc3.h | 23 - include/linux/compiler-gcc4.h | 91 --- include/linux/compiler-gcc5.h | 67 -- include/linux/configfs.h | 1 - include/linux/crc64_ecma.h | 56 ++ include/linux/gfp.h | 2 + include/linux/huge_mm.h | 4 + include/linux/kexec.h | 2 + include/linux/memblock.h | 18 + include/linux/memcontrol.h | 4 + include/linux/mm-arch-hooks.h | 25 + include/linux/mm.h | 48 +- include/linux/mmzone.h | 23 +- include/linux/nmi.h | 3 + include/linux/page-flags.h | 237 ++++--- include/linux/pagemap.h | 25 +- include/linux/poison.h | 4 + include/linux/rmap.h | 9 +- include/linux/rtc.h | 4 + include/linux/scatterlist.h | 4 +- include/linux/slab.h | 36 +- include/linux/smpboot.h | 5 + include/linux/string.h | 1 + include/linux/swap.h | 1 + include/linux/vm_event_item.h | 1 + include/uapi/asm-generic/mman-common.h | 1 + ipc/msg.c | 3 +- kernel/exit.c | 2 +- kernel/smpboot.c | 60 +- kernel/sysctl.c | 7 + kernel/watchdog.c | 66 +- lib/Kconfig | 7 + lib/Makefile | 1 + lib/bitmap.c | 32 +- lib/crc64_ecma.c | 341 +++++++++ lib/scatterlist.c | 12 +- lib/sort.c | 21 +- lib/test-hexdump.c | 6 +- lib/vsprintf.c | 20 +- mm/Kconfig | 18 + mm/bootmem.c | 13 +- mm/compaction.c | 25 +- mm/filemap.c | 15 +- mm/huge_memory.c | 41 +- mm/hugetlb.c | 5 + mm/internal.h | 33 +- mm/kasan/kasan.h | 1 - mm/kmemleak.c | 3 +- mm/ksm.c | 2 +- mm/madvise.c | 176 +++++ mm/memblock.c | 34 +- mm/memory-failure.c | 17 +- mm/memory.c | 2 +- mm/memory_hotplug.c | 11 +- mm/migrate.c | 2 +- mm/mm_init.c | 9 +- mm/mprotect.c | 11 + mm/mremap.c | 17 +- mm/nobootmem.c | 7 +- mm/page_alloc.c | 423 +++++++++-- mm/page_isolation.c | 10 +- mm/rmap.c | 46 +- mm/shmem.c | 4 +- mm/slab.c | 14 + mm/slab.h | 10 + mm/slab_common.c | 121 +++- mm/slob.c | 13 + mm/slub.c | 69 ++ mm/swap.c | 44 ++ mm/swap_state.c | 4 +- mm/util.c | 40 +- mm/vmscan.c | 126 +++- mm/vmstat.c | 1 + mm/zsmalloc.c | 4 - mm/zswap.c | 4 +- scripts/get_maintainer.pl | 32 + 221 files changed, 4603 insertions(+), 2021 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-zram create mode 100644 arch/alpha/include/asm/mm-arch-hooks.h create mode 100644 arch/arc/include/asm/mm-arch-hooks.h create mode 100644 arch/arm/include/asm/mm-arch-hooks.h create mode 100644 arch/arm64/include/asm/mm-arch-hooks.h create mode 100644 arch/avr32/include/asm/mm-arch-hooks.h create mode 100644 arch/blackfin/include/asm/mm-arch-hooks.h create mode 100644 arch/c6x/include/asm/mm-arch-hooks.h create mode 100644 arch/cris/include/asm/mm-arch-hooks.h create mode 100644 arch/frv/include/asm/mm-arch-hooks.h create mode 100644 arch/hexagon/include/asm/mm-arch-hooks.h create mode 100644 arch/ia64/include/asm/mm-arch-hooks.h create mode 100644 arch/m32r/include/asm/mm-arch-hooks.h create mode 100644 arch/m68k/include/asm/mm-arch-hooks.h create mode 100644 arch/metag/include/asm/mm-arch-hooks.h create mode 100644 arch/microblaze/include/asm/mm-arch-hooks.h create mode 100644 arch/mips/include/asm/mm-arch-hooks.h create mode 100644 arch/mn10300/include/asm/mm-arch-hooks.h create mode 100644 arch/nios2/include/asm/mm-arch-hooks.h create mode 100644 arch/openrisc/include/asm/mm-arch-hooks.h create mode 100644 arch/parisc/include/asm/mm-arch-hooks.h create mode 100644 arch/powerpc/include/asm/mm-arch-hooks.h create mode 100644 arch/s390/include/asm/mm-arch-hooks.h create mode 100644 arch/score/include/asm/mm-arch-hooks.h create mode 100644 arch/sh/include/asm/mm-arch-hooks.h create mode 100644 arch/sparc/include/asm/mm-arch-hooks.h create mode 100644 arch/tile/include/asm/mm-arch-hooks.h create mode 100644 arch/um/include/asm/mm-arch-hooks.h create mode 100644 arch/unicore32/include/asm/mm-arch-hooks.h create mode 100644 arch/x86/include/asm/mm-arch-hooks.h create mode 100644 arch/xtensa/include/asm/mm-arch-hooks.h delete mode 100644 include/linux/compiler-gcc3.h delete mode 100644 include/linux/compiler-gcc4.h delete mode 100644 include/linux/compiler-gcc5.h create mode 100644 include/linux/crc64_ecma.h create mode 100644 include/linux/mm-arch-hooks.h create mode 100644 lib/crc64_ecma.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: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR Applying: printk: improve the description of /dev/kmsg line format Applying: drivers/w1/w1_int.c: call put_device if device_register fails $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + 6cbe4b8ee1e8...07f0773a3422 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (07f0773a3422 drivers/w1/w1_int.c: call put_device if device_register fails) $ git merge --no-ff akpm/master Merge made by the 'recursive' strategy. arch/unicore32/kernel/fpu-ucf64.c | 4 ++-- drivers/w1/w1_int.c | 3 +-- kernel/printk/printk.c | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-)