--- /dev/null
+$ date
+Friday 2 May 10:16:27 EST 2014
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 8aa9e85adac6 ARC: !PREEMPT: Ensure Return to kernel mode is IRQ safe
+Merging origin/master (b5f3c61d0616 Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
+$ git merge origin/master
+Updating 8aa9e85adac6..b5f3c61d0616
+Fast-forward
+ arch/hexagon/include/asm/barrier.h | 37 -----------------------
+ arch/parisc/include/uapi/asm/Kbuild | 3 +-
+ arch/parisc/include/uapi/asm/resource.h | 7 -----
+ arch/x86/kernel/cpu/perf_event_intel_rapl.c | 3 +-
+ drivers/hwmon/coretemp.c | 4 +--
+ drivers/pinctrl/pinctrl-as3722.c | 17 +++++++----
+ drivers/pinctrl/pinctrl-single.c | 13 ++++++++
+ drivers/pinctrl/pinctrl-tb10x.c | 3 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 3 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 2 +-
+ fs/aio.c | 42 +++++++++++++++++++++-----
+ include/asm-generic/word-at-a-time.h | 2 +-
+ include/trace/events/module.h | 2 +-
+ kernel/module.c | 3 --
+ tools/lib/api/fs/debugfs.c | 4 +--
+ tools/lib/traceevent/event-parse.c | 1 +
+ tools/lib/traceevent/event-parse.h | 4 +--
+ tools/perf/Makefile.perf | 2 +-
+ tools/perf/arch/x86/tests/dwarf-unwind.c | 3 +-
+ tools/perf/arch/x86/tests/regs_load.S | 8 ++++-
+ tools/perf/config/Makefile | 46 ++++++++++++++++++++++-------
+ tools/perf/tests/make | 2 ++
+ tools/perf/util/machine.c | 16 +++++++---
+ 23 files changed, 133 insertions(+), 94 deletions(-)
+ delete mode 100644 arch/hexagon/include/asm/barrier.h
+ delete mode 100644 arch/parisc/include/uapi/asm/resource.h
+Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (a798c10faf62 Linux 3.15-rc2)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (d93003e8e4e1 ARM: 8042/1: iwmmxt: allow to build iWMMXt on Marvell PJ4B)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3.14-rc1)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (a798c10faf62 Linux 3.15-rc2)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-merge/merge (e4565362c7ad powerpc/4xx: Fix section mismatch in ppc4xx_pci.c)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (a798c10faf62 Linux 3.15-rc2)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (22041fb05b66 hyperv: Properly handle checksum offload)
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/net/arc_emac.txt | 12 +-
+ Documentation/networking/scaling.txt | 2 +-
+ MAINTAINERS | 1 -
+ crypto/crypto_user.c | 2 +-
+ drivers/connector/cn_proc.c | 2 +-
+ drivers/isdn/hisax/icc.c | 2 +-
+ drivers/net/bonding/bond_sysfs.c | 2 +-
+ drivers/net/can/c_can/Kconfig | 7 +
+ drivers/net/can/c_can/c_can.c | 660 ++++++++++-----------
+ drivers/net/can/c_can/c_can.h | 23 +-
+ drivers/net/can/c_can/c_can_pci.c | 9 +-
+ drivers/net/can/c_can/c_can_platform.c | 2 +-
+ drivers/net/can/dev.c | 2 +-
+ drivers/net/can/sja1000/sja1000_isa.c | 16 +-
+ drivers/net/can/slcan.c | 6 +-
+ drivers/net/ethernet/altera/altera_msgdma.c | 8 +-
+ drivers/net/ethernet/altera/altera_msgdma.h | 3 +-
+ drivers/net/ethernet/altera/altera_sgdma.c | 179 +++---
+ drivers/net/ethernet/altera/altera_sgdma.h | 3 +-
+ drivers/net/ethernet/altera/altera_tse.h | 6 +-
+ drivers/net/ethernet/altera/altera_tse_ethtool.c | 8 +-
+ drivers/net/ethernet/altera/altera_tse_main.c | 77 ++-
+ drivers/net/ethernet/arc/emac.h | 2 +
+ drivers/net/ethernet/arc/emac_main.c | 82 ++-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 58 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 4 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +-
+ drivers/net/ethernet/cadence/Kconfig | 4 +-
+ drivers/net/ethernet/chelsio/Kconfig | 13 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +
+ drivers/net/ethernet/freescale/gianfar.c | 223 +++----
+ drivers/net/ethernet/freescale/gianfar_ethtool.c | 3 +
+ drivers/net/ethernet/intel/e1000e/netdev.c | 6 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 14 +-
+ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 22 +-
+ drivers/net/ethernet/intel/igb/e1000_i210.c | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.c | 13 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 4 +-
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 21 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 6 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 40 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 9 +
+ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 9 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 2 +
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c | 22 +
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.c | 11 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.h | 42 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c | 13 -
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 31 +
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c | 14 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h | 4 +
+ drivers/net/ethernet/smsc/smc91x.c | 25 +-
+ drivers/net/hyperv/netvsc_drv.c | 4 +
+ drivers/net/macvlan.c | 3 -
+ drivers/net/macvtap.c | 9 +
+ drivers/net/phy/micrel.c | 6 +-
+ drivers/net/slip/slip.c | 6 +-
+ drivers/net/team/team.c | 2 +
+ drivers/net/usb/qmi_wwan.c | 28 +
+ drivers/net/virtio_net.c | 2 +-
+ drivers/net/vxlan.c | 38 +-
+ drivers/scsi/scsi_netlink.c | 2 +-
+ include/linux/netlink.h | 7 +
+ include/linux/sock_diag.h | 2 +-
+ include/net/sock.h | 5 +
+ kernel/audit.c | 4 +-
+ net/bridge/br_netlink.c | 15 +
+ net/can/gw.c | 4 +-
+ net/core/filter.c | 16 +-
+ net/core/rtnetlink.c | 53 +-
+ net/core/sock.c | 49 ++
+ net/core/sock_diag.c | 4 +-
+ net/dcb/dcbnl.c | 2 +-
+ net/decnet/dn_dev.c | 4 +-
+ net/decnet/dn_fib.c | 4 +-
+ net/decnet/netfilter/dn_rtmsg.c | 2 +-
+ net/ipv4/tcp_cubic.c | 2 +-
+ net/ipv4/tcp_output.c | 14 +-
+ net/ipv6/ip6_fib.c | 3 +-
+ net/ipv6/ip6mr.c | 2 +-
+ net/ipv6/netfilter/ip6t_rpfilter.c | 1 +
+ net/ipv6/route.c | 2 +
+ net/netfilter/nfnetlink.c | 3 +-
+ net/netlink/af_netlink.c | 75 ++-
+ net/netlink/genetlink.c | 2 +-
+ net/packet/diag.c | 7 +-
+ net/phonet/pn_netlink.c | 8 +-
+ net/sched/act_api.c | 2 +-
+ net/sched/cls_api.c | 2 +-
+ net/sched/sch_api.c | 6 +-
+ net/sctp/protocol.c | 7 +-
+ net/sctp/sm_sideeffect.c | 7 +-
+ net/tipc/netlink.c | 2 +-
+ net/xfrm/xfrm_user.c | 2 +-
+ tools/net/bpf_dbg.c | 2 +-
+ 101 files changed, 1277 insertions(+), 895 deletions(-)
+Merging ipsec/master (a32452366b72 vti4: Don't count header length twice.)
+$ git merge ipsec/master
+Resolved 'net/ipv4/ip_vti.c' using previous resolution.
+Auto-merging net/ipv6/xfrm6_output.c
+Auto-merging net/ipv4/xfrm4_output.c
+Auto-merging net/ipv4/ip_vti.c
+CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 506528b7ca6b] Merge remote-tracking branch 'ipsec/master'
+$ git diff -M --stat --summary HEAD^..
+ net/ipv4/ip_vti.c | 1 -
+ net/ipv4/xfrm4_output.c | 32 ++++++++++++++++++--------------
+ net/ipv6/xfrm6_output.c | 22 +++++++++++++---------
+ 3 files changed, 31 insertions(+), 24 deletions(-)
+Merging sound-current/for-linus (91943954e353 ALSA: hda - add headset mic detect quirk for a Dell laptop)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/patch_realtek.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging pci-current/for-linus (f5d3352b2751 PCI: tegra: Use new OF interrupt mapping when possible)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (3234f5b06fc3 rtl8192cu: Fix unbalanced irq enable in error path of rtl92cu_hw_init())
+$ git merge wireless/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 -
+ drivers/bluetooth/ath3k.c | 2 ++
+ drivers/bluetooth/btusb.c | 5 ++---
+ drivers/net/wireless/ath/ath9k/ahb.c | 4 ----
+ drivers/net/wireless/ath/ath9k/ani.c | 6 ++++++
+ drivers/net/wireless/ath/ath9k/ath9k.h | 1 -
+ drivers/net/wireless/ath/ath9k/debug_sta.c | 5 ++---
+ drivers/net/wireless/ath/ath9k/init.c | 3 +++
+ drivers/net/wireless/ath/ath9k/pci.c | 5 -----
+ drivers/net/wireless/ath/ath9k/recv.c | 9 ++++++---
+ drivers/net/wireless/ath/ath9k/xmit.c | 14 +-------------
+ drivers/net/wireless/brcm80211/brcmfmac/chip.c | 5 +++--
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 22 ++++++++++++----------
+ drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 6 ++++++
+ net/bluetooth/hci_conn.c | 9 ++++++---
+ net/bluetooth/hci_event.c | 6 ++++++
+ 18 files changed, 57 insertions(+), 50 deletions(-)
+Merging driver-core.current/driver-core-linus (d1db0eea8524 Linux 3.15-rc3)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (d1db0eea8524 Linux 3.15-rc3)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (4dd7aa0f3c8a Merge tag 'fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/gadget/at91_udc.c | 10 ----------
+ drivers/usb/phy/phy-fsm-usb.c | 9 +++++----
+ 2 files changed, 5 insertions(+), 14 deletions(-)
+Merging usb-gadget-fixes/fixes (886c7c426d46 usb: gadget: at91-udc: fix irq and iomem resource retrieval)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging staging.current/staging-linus (86281966c739 Merge tag 'iio-fixes-for-3.15b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/iio/adc/Kconfig | 4 ++--
+ drivers/iio/adc/exynos_adc.c | 6 +++---
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 7 +++++--
+ drivers/staging/iio/resolver/ad2s1200.c | 3 ++-
+ 4 files changed, 12 insertions(+), 8 deletions(-)
+Merging char-misc.current/char-misc-linus (d1db0eea8524 Linux 3.15-rc3)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (c16134976fb2 Input: tca8418 - fix loading this driver as a module from a device tree)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/keyboard/atkbd.c | 29 ++++++++++++++++++++++++++++-
+ drivers/input/keyboard/tca8418_keypad.c | 7 +++++++
+ drivers/input/misc/bma150.c | 4 +++-
+ drivers/input/mouse/synaptics.c | 8 ++++++++
+ 4 files changed, 46 insertions(+), 2 deletions(-)
+Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (27c5fb7a8424 crypto: caam - add allocation failure handling in SPRINTFCAT macro)
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ drivers/crypto/caam/error.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies)
+$ git merge ide/master
+Merge made by the 'recursive' strategy.
+ drivers/ide/Kconfig | 5 ++++-
+ drivers/ide/ide-probe.c | 8 +++++---
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (58b116bce136 drivercore: deferral race condition fix)
+$ git merge devicetree-current/devicetree/merge
+Merge made by the 'recursive' strategy.
+ drivers/base/dd.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works)
+$ git merge mfd-fixes/master
+Already up-to-date.
+Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (b6842feb63a2 drm/i915: Allow user modes to exceed DVI 165MHz limit)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (134aeaed08c4 ARC: Fixed spelling errors within comments)
+$ git merge arc/for-next
+Auto-merging arch/arc/kernel/entry.S
+Merge made by the 'recursive' strategy.
+ arch/arc/include/asm/irq.h | 2 --
+ arch/arc/include/asm/processor.h | 29 ++++-------------------------
+ arch/arc/kernel/entry.S | 12 ++++++------
+ arch/arc/kernel/irq.c | 18 ------------------
+ arch/arc/kernel/process.c | 23 +++++++++++++++++++++++
+ arch/arc/mm/cache_arc700.c | 4 ++++
+ arch/arc/plat-arcfpga/Makefile | 2 +-
+ arch/arc/plat-arcfpga/platform.c | 4 ++--
+ arch/arc/plat-arcfpga/smp.c | 18 ++++++++++++++++++
+ 9 files changed, 58 insertions(+), 54 deletions(-)
+Merging arm/for-next (c34eb07ff897 Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/arm/memory.txt | 9 +---
+ arch/arm/Kconfig | 5 ++
+ arch/arm/include/asm/fixmap.h | 21 ++------
+ arch/arm/include/asm/highmem.h | 1 +
+ arch/arm/include/asm/memory.h | 2 -
+ arch/arm/kernel/Makefile | 1 +
+ arch/arm/kernel/entry-armv.S | 11 ++--
+ arch/arm/kernel/ftrace.c | 13 +++++
+ arch/arm/kernel/hibernate.c | 107 +++++++++++++++++++++++++++++++++++++
+ arch/arm/kernel/iwmmxt.S | 16 ++++--
+ arch/arm/kernel/topology.c | 8 +--
+ arch/arm/mach-ep93xx/crunch-bits.S | 14 +++--
+ arch/arm/mm/highmem.c | 33 ++++++++----
+ arch/arm/mm/mmu.c | 4 ++
+ arch/arm/mm/proc-v7-3level.S | 18 +++++--
+ arch/arm/mm/proc-v7.S | 28 ++++++++--
+ arch/arm/vfp/entry.S | 3 +-
+ include/linux/suspend.h | 2 +
+ 18 files changed, 235 insertions(+), 61 deletions(-)
+ create mode 100644 arch/arm/kernel/hibernate.c
+Merging arm-kvm-cpuresume/arm-kvm-cpuresume (91a3f6af430d arm: kernel: sleep: restore HYP mode configuration in cpu_resume)
+$ git merge arm-kvm-cpuresume/arm-kvm-cpuresume
+Auto-merging arch/arm/include/asm/assembler.h
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/assembler.h | 2 +-
+ arch/arm/kernel/sleep.S | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+Merging arm-perf/for-next/perf (c9eaa447e77e Linux 3.15-rc1)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (1fc52762e33c Merge tag 'vexpress/fixes-for-3.15' of git://git.linaro.org/people/pawel.moll/linux into fixes)
+$ git merge arm-soc/for-next
+Already up-to-date.
+Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging berlin/berlin/for-next (ca8965fd2af1 Merge branch 'berlin/dt' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/arm/Marvell/README | 5 +
+ .../devicetree/bindings/arm/marvell,berlin.txt | 1 +
+ arch/arm/boot/dts/Makefile | 3 +-
+ arch/arm/boot/dts/berlin2.dtsi | 163 ++++++++-
+ arch/arm/boot/dts/berlin2cd.dtsi | 150 +++++++-
+ arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 39 +++
+ arch/arm/boot/dts/berlin2q.dtsi | 376 +++++++++++++++++++++
+ arch/arm/mach-berlin/Kconfig | 6 +
+ 8 files changed, 708 insertions(+), 35 deletions(-)
+ create mode 100644 arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+ create mode 100644 arch/arm/boot/dts/berlin2q.dtsi
+Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
+$ git merge cortex-m/for-next
+Already up-to-date.
+Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Merge made by the 'recursive' strategy.
+Merging imx-mxs/for-next (72e0a509056f Merge branch 'imx/dt' into for-next)
+$ git merge imx-mxs/for-next
+Removing arch/arm/mach-imx/mach-mx51_babbage.c
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/imx25-clock.txt | 3 +
+ .../devicetree/bindings/clock/imx27-clock.txt | 7 +-
+ .../devicetree/bindings/clock/imx6q-clock.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/Kconfig.debug | 9 +
+ arch/arm/boot/dts/Makefile | 4 +
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 13 +
+ arch/arm/boot/dts/imx25-pdk.dts | 217 ++++++++++-
+ arch/arm/boot/dts/imx25.dtsi | 39 +-
+ arch/arm/boot/dts/imx27-pdk.dts | 170 +++++++-
+ arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 112 +++++-
+ arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 53 ++-
+ arch/arm/boot/dts/imx27.dtsi | 30 +-
+ arch/arm/boot/dts/imx28-duckbill.dts | 12 +-
+ arch/arm/boot/dts/imx28.dtsi | 1 +
+ arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 15 +
+ .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 22 ++
+ arch/arm/boot/dts/imx35-pdk.dts | 67 ++++
+ arch/arm/boot/dts/imx35.dtsi | 25 +-
+ arch/arm/boot/dts/imx50.dtsi | 1 +
+ arch/arm/boot/dts/imx51-babbage.dts | 335 ++++++++++------
+ arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 108 ++++++
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 377 ++++++++++++++++++
+ arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 11 +
+ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 58 +++
+ arch/arm/boot/dts/imx51.dtsi | 3 +
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 17 +
+ arch/arm/boot/dts/imx53.dtsi | 3 +-
+ arch/arm/boot/dts/imx6dl-phytec-pbab01.dts | 19 +
+ arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi | 22 ++
+ arch/arm/boot/dts/imx6q-gk802.dts | 5 +
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 5 +
+ arch/arm/boot/dts/imx6q-phytec-pbab01.dts | 31 +-
+ arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 307 +--------------
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 5 +
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 5 +
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 +
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 +
+ arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 102 +++++
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 356 +++++++++++++++++
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 39 ++
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 19 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 8 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 1 +
+ arch/arm/boot/dts/vf610-colibri.dts | 123 ++++++
+ arch/arm/boot/dts/vf610-twr.dts | 36 ++
+ arch/arm/boot/dts/vf610.dtsi | 24 ++
+ arch/arm/configs/imx_v4_v5_defconfig | 8 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 12 +-
+ arch/arm/configs/mxs_defconfig | 6 +-
+ arch/arm/include/debug/vf.S | 15 +-
+ arch/arm/mach-imx/Kconfig | 15 -
+ arch/arm/mach-imx/Makefile | 1 -
+ arch/arm/mach-imx/clk-gate2.c | 47 ++-
+ arch/arm/mach-imx/clk-imx25.c | 24 +-
+ arch/arm/mach-imx/clk-imx27.c | 27 +-
+ arch/arm/mach-imx/clk-imx31.c | 2 -
+ arch/arm/mach-imx/clk-imx51-imx53.c | 20 +-
+ arch/arm/mach-imx/clk-imx6q.c | 21 +-
+ arch/arm/mach-imx/clk-imx6sl.c | 6 +-
+ arch/arm/mach-imx/clk.h | 13 +-
+ arch/arm/mach-imx/common.h | 2 +
+ arch/arm/mach-imx/devices/platform-mx2-emma.c | 2 +-
+ arch/arm/mach-imx/mach-mx21ads.c | 173 +++++----
+ arch/arm/mach-imx/mach-mx51_babbage.c | 428 ---------------------
+ arch/arm/mach-imx/time.c | 15 +
+ 66 files changed, 2528 insertions(+), 1140 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx35-pdk.dts
+ create mode 100644 arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts
+ create mode 100644 arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+ create mode 100644 arch/arm/boot/dts/vf610-colibri.dts
+ delete mode 100644 arch/arm/mach-imx/mach-mx51_babbage.c
+Merging ixp4xx/next (19f949f52599 Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+Merging keystone/next (47fc77cc704e Merge branch 'for_3.15/fixes' into next)
+$ git merge keystone/next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
+$ git merge msm/for-next
+Already up-to-date.
+Merging mvebu/for-next (9322fc41d2fc Merge branch 'mvebu/dt' into for-next)
+$ git merge mvebu/for-next
+Removing arch/arm/mach-orion5x/mss2-setup.c
+Removing arch/arm/mach-orion5x/edmini_v2-setup.c
+Removing arch/arm/mach-orion5x/d2net-setup.c
+Auto-merging arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/armada-370-xp-pmsu.txt | 19 +-
+ .../devicetree/bindings/arm/armada-cpu-reset.txt | 14 +
+ .../devicetree/bindings/arm/coherency-fabric.txt | 32 +-
+ Documentation/devicetree/bindings/arm/cpus.txt | 3 +
+ .../devicetree/bindings/clock/mvebu-core-clock.txt | 8 +
+ .../bindings/memory-controllers/mvebu-devbus.txt | 32 +-
+ arch/arm/boot/dts/Makefile | 5 +-
+ arch/arm/boot/dts/armada-370-db.dts | 2 +-
+ arch/arm/boot/dts/armada-370-mirabox.dts | 1 -
+ arch/arm/boot/dts/armada-370-netgear-rn102.dts | 1 -
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 1 -
+ arch/arm/boot/dts/armada-370-rd.dts | 1 -
+ arch/arm/boot/dts/armada-370-xp.dtsi | 7 +
+ arch/arm/boot/dts/armada-370.dtsi | 5 +
+ arch/arm/boot/dts/armada-375-db.dts | 6 +-
+ arch/arm/boot/dts/armada-375.dtsi | 31 ++
+ arch/arm/boot/dts/armada-380.dtsi | 2 +
+ arch/arm/boot/dts/armada-385-db.dts | 17 +-
+ arch/arm/boot/dts/armada-385-rd.dts | 1 -
+ arch/arm/boot/dts/armada-385.dtsi | 2 +
+ arch/arm/boot/dts/armada-38x.dtsi | 60 ++++
+ arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 -
+ arch/arm/boot/dts/armada-xp-db.dts | 6 +-
+ arch/arm/boot/dts/armada-xp-gp.dts | 14 +-
+ arch/arm/boot/dts/armada-xp-matrix.dts | 4 -
+ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 1 -
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 +-
+ arch/arm/boot/dts/armada-xp.dtsi | 8 +-
+ arch/arm/boot/dts/kirkwood-nsa310.dts | 50 +--
+ arch/arm/boot/dts/kirkwood-nsa310a.dts | 54 +--
+ arch/arm/boot/dts/kirkwood-nsa320.dts | 214 ++++++++++++
+ ...310-common.dtsi => kirkwood-nsa3x0-common.dtsi} | 58 +++-
+ arch/arm/boot/dts/kirkwood-t5325.dts | 5 -
+ arch/arm/boot/dts/orion5x-lacie-d2-network.dts | 236 +++++++++++++
+ .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 141 ++++++--
+ .../boot/dts/orion5x-maxtor-shared-storage-2.dts | 178 ++++++++++
+ arch/arm/boot/dts/orion5x-mv88f5182.dtsi | 45 +++
+ arch/arm/boot/dts/orion5x-rd88f5182-nas.dts | 177 ++++++++++
+ arch/arm/boot/dts/orion5x.dtsi | 289 +++++++++-------
+ arch/arm/configs/mvebu_v5_defconfig | 1 +
+ arch/arm/configs/mvebu_v7_defconfig | 8 +
+ arch/arm/mach-dove/irq.c | 36 ++
+ arch/arm/mach-kirkwood/board-dt.c | 2 +-
+ arch/arm/mach-kirkwood/irq.c | 37 +++
+ arch/arm/mach-mvebu/Kconfig | 7 +
+ arch/arm/mach-mvebu/Makefile | 11 +-
+ arch/arm/mach-mvebu/armada-370-xp.h | 2 -
+ arch/arm/mach-mvebu/board-v7.c | 82 ++++-
+ arch/arm/mach-mvebu/coherency.c | 250 +++++++++++++-
+ arch/arm/mach-mvebu/coherency.h | 3 +-
+ arch/arm/mach-mvebu/coherency_ll.S | 122 +++++--
+ arch/arm/mach-mvebu/common.h | 3 +
+ arch/arm/mach-mvebu/cpu-reset.c | 103 ++++++
+ arch/arm/mach-mvebu/dove.c | 2 +-
+ arch/arm/mach-mvebu/headsmp-a9.S | 34 ++
+ arch/arm/mach-mvebu/headsmp.S | 15 +-
+ arch/arm/mach-mvebu/kirkwood.c | 2 +-
+ arch/arm/mach-mvebu/mvebu-soc-id.c | 30 ++
+ arch/arm/mach-mvebu/mvebu-soc-id.h | 3 +
+ arch/arm/mach-mvebu/platsmp-a9.c | 100 ++++++
+ arch/arm/mach-mvebu/platsmp.c | 23 +-
+ arch/arm/mach-mvebu/pmsu.c | 273 +++++++++++++--
+ arch/arm/mach-mvebu/system-controller.c | 15 +-
+ arch/arm/mach-orion5x/Kconfig | 37 +--
+ arch/arm/mach-orion5x/Makefile | 7 +-
+ arch/arm/mach-orion5x/board-d2net.c | 109 ++++++
+ arch/arm/mach-orion5x/board-dt.c | 18 +-
+ arch/arm/mach-orion5x/board-mss2.c | 90 +++++
+ arch/arm/mach-orion5x/board-rd88f5182.c | 116 +++++++
+ arch/arm/mach-orion5x/common.h | 15 +-
+ arch/arm/mach-orion5x/d2net-setup.c | 365 ---------------------
+ arch/arm/mach-orion5x/edmini_v2-setup.c | 169 ----------
+ arch/arm/mach-orion5x/irq.c | 28 ++
+ arch/arm/mach-orion5x/mss2-setup.c | 274 ----------------
+ arch/arm/plat-orion/gpio.c | 48 ---
+ arch/arm/plat-orion/include/plat/irq.h | 1 -
+ arch/arm/plat-orion/include/plat/orion-gpio.h | 1 -
+ arch/arm/plat-orion/irq.c | 77 -----
+ drivers/bus/mvebu-mbus.c | 33 +-
+ drivers/clk/mvebu/Kconfig | 4 +
+ drivers/clk/mvebu/Makefile | 1 +
+ drivers/clk/mvebu/orion.c | 210 ++++++++++++
+ drivers/cpuidle/Kconfig.arm | 5 +
+ drivers/cpuidle/Makefile | 1 +
+ drivers/cpuidle/cpuidle-armada-370-xp.c | 93 ++++++
+ drivers/irqchip/irq-armada-370-xp.c | 41 ++-
+ drivers/memory/mvebu-devbus.c | 234 +++++++++----
+ drivers/pci/host/pci-mvebu.c | 92 +++++-
+ include/linux/mbus.h | 2 +-
+ 92 files changed, 3489 insertions(+), 1485 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/armada-cpu-reset.txt
+ create mode 100644 arch/arm/boot/dts/kirkwood-nsa320.dts
+ rename arch/arm/boot/dts/{kirkwood-nsa310-common.dtsi => kirkwood-nsa3x0-common.dtsi} (59%)
+ create mode 100644 arch/arm/boot/dts/orion5x-lacie-d2-network.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-mv88f5182.dtsi
+ create mode 100644 arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
+ create mode 100644 arch/arm/mach-mvebu/cpu-reset.c
+ create mode 100644 arch/arm/mach-mvebu/headsmp-a9.S
+ create mode 100644 arch/arm/mach-mvebu/platsmp-a9.c
+ create mode 100644 arch/arm/mach-orion5x/board-d2net.c
+ create mode 100644 arch/arm/mach-orion5x/board-mss2.c
+ create mode 100644 arch/arm/mach-orion5x/board-rd88f5182.c
+ delete mode 100644 arch/arm/mach-orion5x/d2net-setup.c
+ delete mode 100644 arch/arm/mach-orion5x/edmini_v2-setup.c
+ delete mode 100644 arch/arm/mach-orion5x/mss2-setup.c
+ create mode 100644 drivers/clk/mvebu/orion.c
+ create mode 100644 drivers/cpuidle/cpuidle-armada-370-xp.c
+Merging renesas/next (1dcb57aa37dc Merge branch 'heads/dt-for-v3.16' into next)
+$ git merge renesas/next
+Removing arch/arm/mach-shmobile/include/mach/emev2.h
+Auto-merging arch/arm/mach-shmobile/clock-r8a7778.c
+Removing arch/arm/mach-shmobile/clock-emev2.c
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 4 +-
+ .../boot/dts/r8a7740-armadillo800eva-reference.dts | 27 ++-
+ arch/arm/boot/dts/r8a7740.dtsi | 8 +-
+ arch/arm/boot/dts/r8a7778-bockw-reference.dts | 14 ++
+ arch/arm/boot/dts/r8a7778.dtsi | 18 +-
+ arch/arm/boot/dts/r8a7779.dtsi | 18 +-
+ arch/arm/boot/dts/r8a7790-lager.dts | 63 +++++-
+ arch/arm/boot/dts/r8a7790.dtsi | 122 +++++++++--
+ arch/arm/boot/dts/r8a7791-henninger.dts | 80 +++++++
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 78 ++++++-
+ arch/arm/boot/dts/r8a7791.dtsi | 109 ++++++++--
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 15 +-
+ arch/arm/configs/shmobile_defconfig | 14 ++
+ arch/arm/mach-shmobile/Kconfig | 17 +-
+ arch/arm/mach-shmobile/Makefile | 3 +-
+ arch/arm/mach-shmobile/board-bockw.c | 63 ++++--
+ arch/arm/mach-shmobile/board-koelsch-reference.c | 86 ++++----
+ arch/arm/mach-shmobile/board-koelsch.c | 2 +-
+ arch/arm/mach-shmobile/board-lager-reference.c | 79 ++++---
+ arch/arm/mach-shmobile/board-lager.c | 29 ++-
+ arch/arm/mach-shmobile/clock-emev2.c | 231 ---------------------
+ arch/arm/mach-shmobile/clock-r8a7778.c | 22 +-
+ arch/arm/mach-shmobile/clock-r8a7790.c | 32 ++-
+ arch/arm/mach-shmobile/clock-r8a7791.c | 23 +-
+ arch/arm/mach-shmobile/clock.c | 28 +++
+ arch/arm/mach-shmobile/include/mach/clock.h | 16 ++
+ arch/arm/mach-shmobile/include/mach/common.h | 1 +
+ arch/arm/mach-shmobile/include/mach/emev2.h | 9 -
+ arch/arm/mach-shmobile/pm-rmobile.c | 38 +---
+ arch/arm/mach-shmobile/setup-emev2.c | 11 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c | 13 +-
+ arch/arm/mach-shmobile/setup-r8a7790.c | 12 +-
+ arch/arm/mach-shmobile/setup-r8a7791.c | 2 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 16 +-
+ arch/arm/mach-shmobile/setup-sh7372.c | 6 +-
+ arch/arm/mach-shmobile/smp-emev2.c | 1 -
+ arch/arm/mach-shmobile/smp-r8a7791.c | 15 +-
+ arch/arm/mach-shmobile/timer.c | 28 +++
+ include/dt-bindings/clock/r8a7790-clock.h | 7 +-
+ include/dt-bindings/clock/r8a7791-clock.h | 5 +-
+ 40 files changed, 793 insertions(+), 572 deletions(-)
+ create mode 100644 arch/arm/boot/dts/r8a7791-henninger.dts
+ delete mode 100644 arch/arm/mach-shmobile/clock-emev2.c
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/emev2.h
+Merging samsung/for-next (3c27f314c676 ARM: S3C24XX: convert s3c2412 to common clock framework)
+$ git merge samsung/for-next
+Removing arch/arm/mach-s3c24xx/common-s3c2443.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2443.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2416.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2412.c
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/samsung,s3c2412-clock.txt | 50 ++
+ .../bindings/clock/samsung,s3c2443-clock.txt | 56 ++
+ arch/arm/boot/dts/s3c2416-smdk2416.dts | 13 +
+ arch/arm/boot/dts/s3c2416.dtsi | 42 ++
+ arch/arm/mach-s3c24xx/Kconfig | 24 +-
+ arch/arm/mach-s3c24xx/Makefile | 7 +-
+ arch/arm/mach-s3c24xx/clock-s3c2412.c | 760 ---------------------
+ arch/arm/mach-s3c24xx/clock-s3c2416.c | 171 -----
+ arch/arm/mach-s3c24xx/clock-s3c2443.c | 212 ------
+ arch/arm/mach-s3c24xx/common-s3c2443.c | 675 ------------------
+ arch/arm/mach-s3c24xx/common.c | 27 +-
+ arch/arm/mach-s3c24xx/common.h | 10 +
+ arch/arm/mach-s3c24xx/mach-jive.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 38 +-
+ arch/arm/mach-s3c24xx/mach-smdk2413.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-vstms.c | 9 +-
+ arch/arm/mach-s3c24xx/pm.c | 13 +-
+ arch/arm/mach-s3c24xx/s3c2412.c | 43 --
+ drivers/clk/samsung/Makefile | 2 +
+ drivers/clk/samsung/clk-pll.c | 266 +++++++-
+ drivers/clk/samsung/clk-pll.h | 6 +
+ drivers/clk/samsung/clk-s3c2412.c | 269 ++++++++
+ drivers/clk/samsung/clk-s3c2443.c | 462 +++++++++++++
+ include/dt-bindings/clock/s3c2412.h | 73 ++
+ include/dt-bindings/clock/s3c2443.h | 92 +++
+ 27 files changed, 1428 insertions(+), 1928 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2412-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2443-clock.txt
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2412.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2416.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2443.c
+ delete mode 100644 arch/arm/mach-s3c24xx/common-s3c2443.c
+ create mode 100644 drivers/clk/samsung/clk-s3c2412.c
+ create mode 100644 drivers/clk/samsung/clk-s3c2443.c
+ create mode 100644 include/dt-bindings/clock/s3c2412.h
+ create mode 100644 include/dt-bindings/clock/s3c2443.h
+Merging tegra/for-next (fd8d5bf30738 Merge branch for-3.16/defconfig into for-next)
+$ git merge tegra/for-next
+Auto-merging arch/arm/boot/dts/tegra124.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/tegra114-dalmore.dts | 21 +-
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 1827 +++++++++++++++++++++++++++++
+ arch/arm/boot/dts/tegra124-venice2.dts | 41 +-
+ arch/arm/boot/dts/tegra124.dtsi | 12 +
+ arch/arm/boot/dts/tegra20-harmony.dts | 12 +
+ arch/arm/boot/dts/tegra30-beaver.dts | 12 +
+ arch/arm/configs/tegra_defconfig | 2 +
+ 8 files changed, 1920 insertions(+), 8 deletions(-)
+ create mode 100644 arch/arm/boot/dts/tegra124-jetson-tk1.dts
+Merging arm64/for-next/core (ebf81a938dad arm64: Fix DMA range invalidation for cache line unaligned buffers)
+$ git merge arm64/for-next/core
+Already up-to-date.
+Merging blackfin/for-linus (c4a2c58d2095 blackfin: cleanup board files)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (50be9eba831d m68k: Update defconfigs for v3.14-rc1)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (6c9665257d5a m68k: fix a compiler warning when building for DragonBall)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/kernel/setup_no.c | 13 ++++++-------
+ arch/m68k/platform/68000/m68EZ328.c | 3 ++-
+ arch/m68k/platform/68000/m68VZ328.c | 1 +
+ 3 files changed, 9 insertions(+), 8 deletions(-)
+Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (a66a626538af microblaze: Use asm-generic/io.h)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (458d4f8b5328 Merge branch '3.15-fixes' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/math-emu/sp_scalb.c
+Removing arch/mips/math-emu/sp_modf.c
+Removing arch/mips/math-emu/sp_logb.c
+Removing arch/mips/math-emu/sp_frexp.c
+Removing arch/mips/math-emu/kernel_linkage.c
+Removing arch/mips/math-emu/ieee754xcpt.c
+Removing arch/mips/math-emu/ieee754m.c
+Removing arch/mips/math-emu/dp_scalb.c
+Removing arch/mips/math-emu/dp_modf.c
+Removing arch/mips/math-emu/dp_logb.c
+Removing arch/mips/math-emu/dp_frexp.c
+Removing arch/mips/include/asm/rm9k-ocd.h
+Removing arch/mips/dec/prom/call_o32.S
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 3 +
+ arch/mips/Kbuild | 1 -
+ arch/mips/Kconfig | 17 +
+ arch/mips/Makefile | 1 +
+ arch/mips/dec/ecc-berr.c | 1 +
+ arch/mips/dec/kn02xa-berr.c | 1 +
+ arch/mips/dec/prom/Makefile | 1 -
+ arch/mips/dec/prom/call_o32.S | 89 --
+ arch/mips/fw/lib/call_o32.S | 57 +-
+ arch/mips/fw/sni/sniprom.c | 3 +-
+ arch/mips/include/asm/branch.h | 30 +
+ arch/mips/include/asm/cpu-features.h | 11 +
+ arch/mips/include/asm/dec/prom.h | 48 +-
+ arch/mips/include/asm/fpu.h | 7 +-
+ arch/mips/include/asm/fpu_emulator.h | 20 +-
+ .../include/asm/mach-ip22/cpu-feature-overrides.h | 4 +
+ arch/mips/include/asm/mipsregs.h | 8 +-
+ arch/mips/include/asm/rm9k-ocd.h | 56 -
+ arch/mips/include/uapi/asm/Kbuild | 1 +
+ arch/mips/include/uapi/asm/bitfield.h | 29 +
+ arch/mips/include/uapi/asm/inst.h | 414 +++----
+ arch/mips/kernel/branch.c | 198 ++-
+ arch/mips/kernel/proc.c | 9 +-
+ arch/mips/kernel/unaligned.c | 2 +-
+ arch/mips/lib/csum_partial.S | 9 +
+ arch/mips/lib/delay.c | 14 +-
+ arch/mips/lib/strncpy_user.S | 13 +-
+ arch/mips/loongson/Kconfig | 1 -
+ arch/mips/loongson/lemote-2f/clock.c | 5 +-
+ arch/mips/loongson1/Kconfig | 1 +
+ arch/mips/math-emu/Makefile | 18 +-
+ arch/mips/math-emu/cp1emu.c | 1305 +++++---------------
+ arch/mips/math-emu/dp_add.c | 71 +-
+ arch/mips/math-emu/dp_cmp.c | 24 +-
+ arch/mips/math-emu/dp_div.c | 94 +-
+ arch/mips/math-emu/dp_fint.c | 33 +-
+ arch/mips/math-emu/dp_flong.c | 28 +-
+ arch/mips/math-emu/dp_frexp.c | 52 -
+ arch/mips/math-emu/dp_fsp.c | 32 +-
+ arch/mips/math-emu/dp_logb.c | 53 -
+ arch/mips/math-emu/dp_modf.c | 79 --
+ arch/mips/math-emu/dp_mul.c | 143 ++-
+ arch/mips/math-emu/dp_scalb.c | 57 -
+ arch/mips/math-emu/dp_simple.c | 39 +-
+ arch/mips/math-emu/dp_sqrt.c | 46 +-
+ arch/mips/math-emu/dp_sub.c | 55 +-
+ arch/mips/math-emu/dp_tint.c | 69 +-
+ arch/mips/math-emu/dp_tlong.c | 68 +-
+ arch/mips/math-emu/dsemul.c | 35 +-
+ arch/mips/math-emu/ieee754.c | 146 +--
+ arch/mips/math-emu/ieee754.h | 322 ++---
+ arch/mips/math-emu/ieee754d.c | 39 +-
+ arch/mips/math-emu/ieee754dp.c | 122 +-
+ arch/mips/math-emu/ieee754dp.h | 70 +-
+ arch/mips/math-emu/ieee754int.h | 201 ++-
+ arch/mips/math-emu/ieee754m.c | 55 -
+ arch/mips/math-emu/ieee754sp.c | 126 +-
+ arch/mips/math-emu/ieee754sp.h | 79 +-
+ arch/mips/math-emu/ieee754xcpt.c | 47 -
+ arch/mips/math-emu/kernel_linkage.c | 45 -
+ arch/mips/math-emu/me-debugfs.c | 62 +
+ arch/mips/math-emu/me-micromips.c | 348 ++++++
+ arch/mips/math-emu/sp_add.c | 72 +-
+ arch/mips/math-emu/sp_cmp.c | 24 +-
+ arch/mips/math-emu/sp_div.c | 93 +-
+ arch/mips/math-emu/sp_fdp.c | 56 +-
+ arch/mips/math-emu/sp_fint.c | 30 +-
+ arch/mips/math-emu/sp_flong.c | 30 +-
+ arch/mips/math-emu/sp_frexp.c | 52 -
+ arch/mips/math-emu/sp_logb.c | 53 -
+ arch/mips/math-emu/sp_modf.c | 79 --
+ arch/mips/math-emu/sp_mul.c | 139 +--
+ arch/mips/math-emu/sp_scalb.c | 57 -
+ arch/mips/math-emu/sp_simple.c | 39 +-
+ arch/mips/math-emu/sp_sqrt.c | 35 +-
+ arch/mips/math-emu/sp_sub.c | 57 +-
+ arch/mips/math-emu/sp_tint.c | 67 +-
+ arch/mips/math-emu/sp_tlong.c | 69 +-
+ drivers/cpufreq/loongson2_cpufreq.c | 4 +-
+ 79 files changed, 2400 insertions(+), 3573 deletions(-)
+ delete mode 100644 arch/mips/dec/prom/call_o32.S
+ delete mode 100644 arch/mips/include/asm/rm9k-ocd.h
+ create mode 100644 arch/mips/include/uapi/asm/bitfield.h
+ delete mode 100644 arch/mips/math-emu/dp_frexp.c
+ delete mode 100644 arch/mips/math-emu/dp_logb.c
+ delete mode 100644 arch/mips/math-emu/dp_modf.c
+ delete mode 100644 arch/mips/math-emu/dp_scalb.c
+ delete mode 100644 arch/mips/math-emu/ieee754m.c
+ delete mode 100644 arch/mips/math-emu/ieee754xcpt.c
+ delete mode 100644 arch/mips/math-emu/kernel_linkage.c
+ create mode 100644 arch/mips/math-emu/me-debugfs.c
+ create mode 100644 arch/mips/math-emu/me-micromips.c
+ delete mode 100644 arch/mips/math-emu/sp_frexp.c
+ delete mode 100644 arch/mips/math-emu/sp_logb.c
+ delete mode 100644 arch/mips/math-emu/sp_modf.c
+ delete mode 100644 arch/mips/math-emu/sp_scalb.c
+Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (ba6728f596a6 Merge tag 'pinctrl-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (5a4e58bc693f powerpc/mm: use macro PGTABLE_EADDR_SIZE instead of digital)
+$ git merge powerpc/next
+Auto-merging arch/powerpc/platforms/44x/ppc476.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/powerpc/4xx/akebono.txt | 54 +++
+ .../devicetree/bindings/powerpc/4xx/hsta.txt | 19 +
+ arch/powerpc/Makefile | 5 +
+ arch/powerpc/boot/Makefile | 24 +-
+ arch/powerpc/boot/addnote.c | 128 ++++---
+ arch/powerpc/boot/crt0.S | 180 ++++++++-
+ arch/powerpc/boot/dcr.h | 4 +
+ arch/powerpc/boot/dts/akebono.dts | 415 +++++++++++++++++++++
+ arch/powerpc/boot/elf_util.c | 4 +
+ arch/powerpc/boot/of.c | 4 +-
+ arch/powerpc/boot/of.h | 19 +-
+ arch/powerpc/boot/ofconsole.c | 6 +-
+ arch/powerpc/boot/oflib.c | 92 +++--
+ arch/powerpc/boot/ppc_asm.h | 12 +
+ arch/powerpc/boot/pseries-head.S | 8 +
+ arch/powerpc/boot/stdio.c | 14 +
+ arch/powerpc/boot/swab.h | 29 ++
+ arch/powerpc/boot/treeboot-akebono.c | 163 ++++++++
+ arch/powerpc/boot/wrapper | 20 +-
+ arch/powerpc/boot/zImage.lds.S | 25 +-
+ arch/powerpc/configs/44x/akebono_defconfig | 148 ++++++++
+ arch/powerpc/include/asm/eeh.h | 47 ++-
+ arch/powerpc/include/asm/machdep.h | 5 +
+ arch/powerpc/include/asm/opal.h | 1 +
+ arch/powerpc/include/asm/ppc-pci.h | 1 +
+ arch/powerpc/include/asm/reg.h | 1 +
+ arch/powerpc/include/asm/string.h | 4 -
+ arch/powerpc/kernel/eeh.c | 211 +++++++----
+ arch/powerpc/kernel/eeh_driver.c | 118 +++++-
+ arch/powerpc/kernel/eeh_pe.c | 47 ++-
+ arch/powerpc/kernel/fadump.c | 5 +-
+ arch/powerpc/kernel/legacy_serial.c | 21 +-
+ arch/powerpc/kernel/pci-common.c | 108 +++---
+ arch/powerpc/kernel/pci_of_scan.c | 9 +
+ arch/powerpc/kernel/ppc_ksyms.c | 2 -
+ arch/powerpc/kernel/rtas_pci.c | 66 +++-
+ arch/powerpc/kernel/setup-common.c | 16 +-
+ arch/powerpc/kernel/tm.S | 40 +-
+ arch/powerpc/lib/Makefile | 2 -
+ arch/powerpc/lib/memcpy_64.S | 16 +
+ arch/powerpc/mm/hash_utils_64.c | 25 +-
+ arch/powerpc/mm/slb_low.S | 2 +-
+ arch/powerpc/platforms/44x/Kconfig | 42 +++
+ arch/powerpc/platforms/44x/Makefile | 3 +-
+ .../platforms/44x/{currituck.c => ppc476.c} | 120 ++++--
+ arch/powerpc/platforms/44x/ppc476_modules.lds | 15 +
+ arch/powerpc/platforms/Kconfig.cputype | 5 +
+ arch/powerpc/platforms/embedded6xx/Kconfig | 1 +
+ arch/powerpc/platforms/powernv/eeh-ioda.c | 349 ++++++++++-------
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 4 +
+ arch/powerpc/platforms/powernv/opal-flash.c | 47 ++-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 26 +-
+ arch/powerpc/platforms/powernv/pci.c | 202 +++++-----
+ arch/powerpc/platforms/powernv/pci.h | 11 +-
+ arch/powerpc/platforms/powernv/setup.c | 46 ++-
+ arch/powerpc/platforms/pseries/eeh_pseries.c | 43 ++-
+ arch/powerpc/platforms/pseries/setup.c | 4 +
+ arch/powerpc/sysdev/Kconfig | 6 +
+ arch/powerpc/sysdev/Makefile | 1 +
+ arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 215 +++++++++++
+ arch/powerpc/sysdev/ppc4xx_pci.c | 21 +-
+ drivers/pci/pci.c | 21 +-
+ 62 files changed, 2696 insertions(+), 606 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/powerpc/4xx/akebono.txt
+ create mode 100644 Documentation/devicetree/bindings/powerpc/4xx/hsta.txt
+ create mode 100644 arch/powerpc/boot/dts/akebono.dts
+ create mode 100644 arch/powerpc/boot/pseries-head.S
+ create mode 100644 arch/powerpc/boot/swab.h
+ create mode 100644 arch/powerpc/boot/treeboot-akebono.c
+ create mode 100644 arch/powerpc/configs/44x/akebono_defconfig
+ rename arch/powerpc/platforms/44x/{currituck.c => ppc476.c} (72%)
+ create mode 100644 arch/powerpc/platforms/44x/ppc476_modules.lds
+ create mode 100644 arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features (164739eff3f9 s390/pci: add some new arch specific pci attributes)
+$ git merge s390/features
+Auto-merging arch/s390/include/asm/ccwgroup.h
+Merge made by the 'recursive' strategy.
+ Documentation/s390/zfcpdump.txt | 73 ++----
+ arch/s390/Kconfig | 24 +-
+ arch/s390/include/asm/ccwgroup.h | 2 +
+ arch/s390/include/asm/futex.h | 4 +-
+ arch/s390/include/asm/lowcore.h | 13 +-
+ arch/s390/include/asm/mmu_context.h | 43 ++-
+ arch/s390/include/asm/pci.h | 12 +-
+ arch/s390/include/asm/pci_clp.h | 10 +-
+ arch/s390/include/asm/processor.h | 22 ++
+ arch/s390/include/asm/ptrace.h | 22 ++
+ arch/s390/include/asm/setup.h | 16 +-
+ arch/s390/include/asm/smp.h | 5 +-
+ arch/s390/include/asm/spinlock.h | 134 ++++++----
+ arch/s390/include/asm/spinlock_types.h | 23 +-
+ arch/s390/include/asm/switch_to.h | 1 -
+ arch/s390/include/asm/syscall.h | 2 +-
+ arch/s390/include/asm/thread_info.h | 34 +--
+ arch/s390/kernel/asm-offsets.c | 2 +
+ arch/s390/kernel/compat_signal.c | 2 +-
+ arch/s390/kernel/crash_dump.c | 83 +++---
+ arch/s390/kernel/early.c | 6 +
+ arch/s390/kernel/entry.S | 87 ++++---
+ arch/s390/kernel/entry64.S | 82 +++---
+ arch/s390/kernel/head31.S | 1 -
+ arch/s390/kernel/nmi.c | 8 +-
+ arch/s390/kernel/process.c | 6 +-
+ arch/s390/kernel/ptrace.c | 4 +-
+ arch/s390/kernel/setup.c | 459 ++++++++++++---------------------
+ arch/s390/kernel/signal.c | 12 +-
+ arch/s390/kernel/smp.c | 20 +-
+ arch/s390/kernel/topology.c | 4 +-
+ arch/s390/kvm/kvm-s390.c | 2 +-
+ arch/s390/lib/spinlock.c | 147 ++++++++---
+ arch/s390/lib/uaccess.c | 10 +-
+ arch/s390/mm/fault.c | 2 +-
+ arch/s390/mm/mem_detect.c | 130 +++-------
+ arch/s390/mm/page-states.c | 10 -
+ arch/s390/mm/pgtable.c | 10 +-
+ arch/s390/mm/vmem.c | 30 +--
+ arch/s390/pci/pci.c | 6 +-
+ arch/s390/pci/pci_clp.c | 10 +
+ arch/s390/pci/pci_event.c | 5 +-
+ arch/s390/pci/pci_sysfs.c | 135 +++++-----
+ drivers/s390/char/Makefile | 2 +-
+ drivers/s390/char/zcore.c | 44 +---
+ drivers/s390/cio/chsc.c | 22 +-
+ include/linux/memblock.h | 79 +++++-
+ mm/Kconfig | 3 +
+ mm/memblock.c | 205 ++++++++++-----
+ 49 files changed, 1060 insertions(+), 1008 deletions(-)
+Merging sparc-next/master (8cf749a8f506 Merge branch 'sparc32-sparse')
+$ git merge sparc-next/master
+Removing arch/sparc/mm/srmmu.h
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/auxio.h | 7 ++++++
+ arch/sparc/include/asm/auxio_64.h | 2 --
+ arch/sparc/include/asm/bug.h | 2 +-
+ arch/sparc/include/asm/cpudata.h | 10 ++++++++
+ arch/sparc/include/asm/cpudata_64.h | 5 ----
+ arch/sparc/include/asm/floppy_32.h | 11 ++-------
+ arch/sparc/include/asm/irq_32.h | 1 +
+ arch/sparc/include/asm/pgalloc_32.h | 2 ++
+ arch/sparc/include/asm/pgtable_32.h | 1 +
+ arch/sparc/include/asm/setup.h | 25 +++++++++++++++++++-
+ arch/sparc/include/asm/timer_32.h | 2 +-
+ arch/sparc/kernel/auxio_32.c | 3 +++
+ arch/sparc/kernel/cpu.c | 1 +
+ arch/sparc/kernel/devices.c | 11 ++++-----
+ arch/sparc/kernel/ioport.c | 6 ++---
+ arch/sparc/kernel/irq.h | 9 ++++++++
+ arch/sparc/kernel/irq_32.c | 1 +
+ arch/sparc/kernel/kernel.h | 44 ++++++++++++++++++++++++++++++++++++
+ arch/sparc/kernel/leon_kernel.c | 11 +++++----
+ arch/sparc/kernel/leon_pci_grpci1.c | 12 +++++-----
+ arch/sparc/kernel/leon_pci_grpci2.c | 18 +++++++--------
+ arch/sparc/kernel/leon_pmc.c | 8 +++----
+ arch/sparc/kernel/leon_smp.c | 13 +----------
+ arch/sparc/kernel/of_device_common.c | 4 +++-
+ arch/sparc/kernel/process_32.c | 4 ++++
+ arch/sparc/kernel/ptrace_32.c | 2 ++
+ arch/sparc/kernel/setup_32.c | 4 ++--
+ arch/sparc/kernel/signal_32.c | 11 +++++----
+ arch/sparc/kernel/smp_32.c | 12 +++-------
+ arch/sparc/kernel/sun4d_irq.c | 17 +++++++-------
+ arch/sparc/kernel/tadpole.c | 6 ++++-
+ arch/sparc/kernel/time_32.c | 2 +-
+ arch/sparc/kernel/traps_32.c | 2 +-
+ arch/sparc/kernel/unaligned_32.c | 4 ++++
+ arch/sparc/kernel/windows.c | 3 +++
+ arch/sparc/mm/fault_32.c | 9 +++-----
+ arch/sparc/mm/init_32.c | 7 +++---
+ arch/sparc/mm/iommu.c | 5 ++--
+ arch/sparc/mm/leon_mm.c | 4 ++--
+ arch/sparc/mm/mm_32.h | 24 ++++++++++++++++++++
+ arch/sparc/mm/srmmu.c | 13 ++++-------
+ arch/sparc/mm/srmmu.h | 4 ----
+ 42 files changed, 221 insertions(+), 121 deletions(-)
+ create mode 100644 arch/sparc/mm/mm_32.h
+ delete mode 100644 arch/sparc/mm/srmmu.h
+Merging tile/master (5eb0bdf84433 arch/tile: remove unused variable 'devcap')
+$ git merge tile/master
+Already up-to-date.
+Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
+$ git merge uml/next
+Resolved 'arch/um/include/asm/Kbuild' using previous resolution.
+Removing arch/x86/um/shared/sysdep/skas_ptrace.h
+Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
+Removing arch/um/sys-ia64/sysdep/skas_ptrace.h
+Removing arch/um/include/shared/skas_ptrace.h
+Removing arch/um/include/shared/skas/proc_mm.h
+Auto-merging arch/um/include/shared/os.h
+Auto-merging arch/um/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ba788cc618c2] Merge remote-tracking branch 'uml/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/um/include/shared/os.h | 2 -
+ arch/um/include/shared/skas/proc_mm.h | 44 ------
+ arch/um/include/shared/skas/skas.h | 3 -
+ arch/um/include/shared/skas_ptrace.h | 14 --
+ arch/um/kernel/ptrace.c | 32 ----
+ arch/um/kernel/reboot.c | 35 ++---
+ arch/um/kernel/skas/mmu.c | 68 +++------
+ arch/um/kernel/skas/process.c | 27 ----
+ arch/um/kernel/trap.c | 2 +-
+ arch/um/kernel/um_arch.c | 10 --
+ arch/um/os-Linux/process.c | 16 --
+ arch/um/os-Linux/skas/mem.c | 100 ++----------
+ arch/um/os-Linux/skas/process.c | 200 ++++++------------------
+ arch/um/os-Linux/start_up.c | 154 -------------------
+ arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 ---
+ arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 ---
+ arch/x86/um/ldt.c | 227 ++++++----------------------
+ arch/x86/um/shared/sysdep/faultinfo_32.h | 3 -
+ arch/x86/um/shared/sysdep/faultinfo_64.h | 3 -
+ arch/x86/um/shared/sysdep/skas_ptrace.h | 22 ---
+ 20 files changed, 148 insertions(+), 858 deletions(-)
+ delete mode 100644 arch/um/include/shared/skas/proc_mm.h
+ delete mode 100644 arch/um/include/shared/skas_ptrace.h
+ delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h
+ delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
+ delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h
+Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (cfe8255f0afc xtensa: xt2000: drop redundant sysmem initialization)
+$ git merge xtensa/for_next
+Auto-merging arch/xtensa/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 19 ++
+ arch/xtensa/boot/dts/kc705.dts | 11 +
+ arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi | 28 +++
+ arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 48 ++---
+ arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 32 +--
+ arch/xtensa/boot/dts/xtfpga.dtsi | 37 ++--
+ arch/xtensa/include/asm/bootparam.h | 13 +-
+ arch/xtensa/include/asm/fixmap.h | 58 ++++++
+ arch/xtensa/include/asm/highmem.h | 45 ++++-
+ arch/xtensa/include/asm/pgtable.h | 4 +
+ arch/xtensa/include/asm/sysmem.h | 38 ++++
+ arch/xtensa/include/asm/tlbflush.h | 11 +-
+ arch/xtensa/kernel/setup.c | 46 +----
+ arch/xtensa/kernel/smp.c | 15 ++
+ arch/xtensa/kernel/xtensa_ksyms.c | 7 +
+ arch/xtensa/mm/Makefile | 1 +
+ arch/xtensa/mm/cache.c | 7 +-
+ arch/xtensa/mm/highmem.c | 72 +++++++
+ arch/xtensa/mm/init.c | 299 +++++++++++++++++++++++-----
+ arch/xtensa/mm/mmu.c | 36 ++++
+ arch/xtensa/mm/tlb.c | 15 ++
+ arch/xtensa/platforms/xt2000/setup.c | 12 +-
+ scripts/sortextable.c | 5 +
+ 23 files changed, 694 insertions(+), 165 deletions(-)
+ create mode 100644 arch/xtensa/boot/dts/kc705.dts
+ create mode 100644 arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi
+ create mode 100644 arch/xtensa/include/asm/fixmap.h
+ create mode 100644 arch/xtensa/include/asm/sysmem.h
+ create mode 100644 arch/xtensa/mm/highmem.c
+Merging btrfs/next (00fdf13a2e9f Btrfs: fix a crash of clone with inline extents's split)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (a30be7cb2ccb ceph: skip invalid dentry during dcache readdir)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (a87c9ad95667 cifs: fix actimeo=0 corner case when cifs_i->time == jiffies)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/inode.c | 3 +++
+ 1 file changed, 3 insertions(+)
+Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (9e78d14a9f64 Use %pd in eCryptFS)
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/inode.c
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/file.c | 4 ++--
+ fs/ecryptfs/inode.c | 12 ++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+Merging ext3/for_next (01d8885785a6 reiserfs: fix race in readdir)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (26f9c9ac0a11 ext4: add fallocate mode blocking for debugging purposes)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/ext4.h | 26 ++---
+ fs/ext4/ext4_extents.h | 22 ++--
+ fs/ext4/extents.c | 240 +++++++++++++++++++++++---------------------
+ fs/ext4/extents_status.c | 2 +-
+ fs/ext4/file.c | 150 +++++++++++++--------------
+ fs/ext4/inode.c | 66 ++++++------
+ fs/ext4/move_extent.c | 38 +++----
+ fs/ext4/namei.c | 3 +-
+ fs/ext4/super.c | 3 +-
+ include/trace/events/ext4.h | 9 +-
+ 10 files changed, 288 insertions(+), 271 deletions(-)
+Merging f2fs/dev (26a7fca93f16 f2fs: deactivate inode page if the inode is evicted)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/acl.c | 2 +-
+ fs/f2fs/checkpoint.c | 69 ++++++++----------------
+ fs/f2fs/data.c | 44 ++++++++++------
+ fs/f2fs/dir.c | 8 +++
+ fs/f2fs/f2fs.h | 34 +++++++++---
+ fs/f2fs/file.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/f2fs/inline.c | 40 +++++++++++---
+ fs/f2fs/inode.c | 18 ++++---
+ fs/f2fs/node.c | 86 +++++++++++++++---------------
+ fs/f2fs/node.h | 15 ++++--
+ fs/f2fs/recovery.c | 26 ++++-----
+ fs/f2fs/segment.c | 114 +++++++++++++++++++++++++++-------------
+ fs/f2fs/super.c | 32 +++++++++--
+ fs/f2fs/xattr.c | 108 +++++++++++++++++++++-----------------
+ fs/f2fs/xattr.h | 8 +--
+ include/linux/f2fs_fs.h | 3 ++
+ 16 files changed, 506 insertions(+), 238 deletions(-)
+Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
+$ git merge fscache/fscache
+Merge made by the 'recursive' strategy.
+Merging fuse/for-next (1560c974dcd4 fuse: add renameat2 support)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ fs/fuse/control.c | 2 +-
+ fs/fuse/dir.c | 146 +++++++++++++++++++++++++++++++---------------
+ fs/fuse/file.c | 84 ++++++++++++++++----------
+ fs/fuse/fuse_i.h | 10 ++--
+ fs/fuse/inode.c | 16 +++--
+ include/uapi/linux/fuse.h | 22 ++++++-
+ 6 files changed, 192 insertions(+), 88 deletions(-)
+Merging gfs2/master (5a7c6690c275 GFS2: lops.c: replace 0 by NULL for pointers)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/lops.c | 2 +-
+ fs/gfs2/quota.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+Merging jfs/jfs-next (24e4a0f3de21 fs/jfs/jfs_inode.c: atomically set inode->i_flags)
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/jfs_inode.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
+$ git merge logfs/master
+Auto-merging fs/logfs/super.c
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ fs/logfs/super.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging nfs/linux-next (1f2edbe3fe21 NFS: Don't ignore suid/sgid bit changes after a successful write)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/getroot.c | 3 ++-
+ fs/nfs/inode.c | 26 +++++++++++++++++---------
+ fs/nfs/write.c | 35 +++++++++++++++++++++++++++++++++--
+ 3 files changed, 52 insertions(+), 12 deletions(-)
+Merging nfsd/nfsd-next (06f9cc12caa8 nfsd4: don't create unnecessary mask acl)
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (c9eaa447e77e Linux 3.15-rc1)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (d56030ac25d3 UBI: block: Remove __initdata from ubiblock_param_ops)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (b8b39d39f94c Merge branch 'xfs-free-inode-btree' into for-next)
+$ git merge xfs/for-next
+Auto-merging fs/xfs/xfs_file.c
+Merge made by the 'recursive' strategy.
+ fs/xfs/xfs_ag.h | 36 ++-
+ fs/xfs/xfs_alloc_btree.c | 1 -
+ fs/xfs/xfs_attr_remote.c | 3 +-
+ fs/xfs/xfs_bmap.c | 208 +++++++------
+ fs/xfs/xfs_bmap.h | 4 +-
+ fs/xfs/xfs_bmap_btree.c | 9 +-
+ fs/xfs/xfs_bmap_btree.h | 2 +-
+ fs/xfs/xfs_btree.c | 44 ++-
+ fs/xfs/xfs_btree.h | 5 +-
+ fs/xfs/xfs_buf.c | 17 +-
+ fs/xfs/xfs_buf.h | 4 +-
+ fs/xfs/xfs_buf_item.c | 3 +-
+ fs/xfs/xfs_da_btree.c | 8 +-
+ fs/xfs/xfs_da_btree.h | 6 +-
+ fs/xfs/xfs_da_format.h | 10 +-
+ fs/xfs/xfs_dir2.c | 26 +-
+ fs/xfs/xfs_dir2.h | 4 +-
+ fs/xfs/xfs_dir2_block.c | 9 +-
+ fs/xfs/xfs_dir2_data.c | 3 +-
+ fs/xfs/xfs_dir2_leaf.c | 2 +-
+ fs/xfs/xfs_dir2_node.c | 2 +-
+ fs/xfs/xfs_dir2_priv.h | 4 +-
+ fs/xfs/xfs_dir2_readdir.c | 14 +-
+ fs/xfs/xfs_dir2_sf.c | 21 +-
+ fs/xfs/xfs_dquot_buf.c | 5 +-
+ fs/xfs/xfs_file.c | 2 +-
+ fs/xfs/xfs_filestream.c | 684 ++++++++++---------------------------------
+ fs/xfs/xfs_filestream.h | 34 +--
+ fs/xfs/xfs_format.h | 14 +-
+ fs/xfs/xfs_fs.h | 1 +
+ fs/xfs/xfs_fsops.c | 36 ++-
+ fs/xfs/xfs_ialloc.c | 695 +++++++++++++++++++++++++++++++++++++-------
+ fs/xfs/xfs_ialloc_btree.c | 69 ++++-
+ fs/xfs/xfs_ialloc_btree.h | 3 +-
+ fs/xfs/xfs_icache.c | 12 +-
+ fs/xfs/xfs_icache.h | 6 +-
+ fs/xfs/xfs_inode.c | 67 ++---
+ fs/xfs/xfs_inode.h | 4 +-
+ fs/xfs/xfs_inode_fork.c | 3 +-
+ fs/xfs/xfs_inode_fork.h | 3 +-
+ fs/xfs/xfs_iomap.c | 2 +-
+ fs/xfs/xfs_itable.c | 6 +-
+ fs/xfs/xfs_log_recover.c | 11 +-
+ fs/xfs/xfs_mru_cache.c | 151 ++++------
+ fs/xfs/xfs_mru_cache.h | 31 +-
+ fs/xfs/xfs_qm.c | 3 +-
+ fs/xfs/xfs_qm_syscalls.c | 1 -
+ fs/xfs/xfs_quota_defs.h | 2 +-
+ fs/xfs/xfs_sb.h | 10 +-
+ fs/xfs/xfs_shared.h | 2 +-
+ fs/xfs/xfs_stats.c | 1 +
+ fs/xfs/xfs_stats.h | 18 +-
+ fs/xfs/xfs_super.c | 22 +-
+ fs/xfs/xfs_symlink.c | 2 +-
+ fs/xfs/xfs_symlink_remote.c | 1 -
+ fs/xfs/xfs_trace.c | 1 +
+ fs/xfs/xfs_trace.h | 58 ++++
+ fs/xfs/xfs_trans.c | 2 +-
+ fs/xfs/xfs_trans_ail.c | 5 +-
+ fs/xfs/xfs_trans_priv.h | 3 +-
+ fs/xfs/xfs_trans_resv.c | 53 +++-
+ fs/xfs/xfs_trans_space.h | 7 +-
+ fs/xfs/xfs_types.h | 2 +-
+ 63 files changed, 1368 insertions(+), 1109 deletions(-)
+Merging file-private-locks/linux-next (3df94d40d8fa locks: add some tracepoints in the lease handling code)
+$ git merge file-private-locks/linux-next
+Auto-merging fs/fuse/file.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ drivers/staging/lustre/lustre/llite/file.c | 17 ++----
+ fs/9p/vfs_file.c | 3 -
+ fs/afs/flock.c | 4 --
+ fs/ceph/locks.c | 10 +---
+ fs/fuse/file.c | 1 -
+ fs/locks.c | 13 ++++-
+ fs/nfs/file.c | 4 --
+ include/trace/events/filelock.h | 90 ++++++++++++++++++++++++++++++
+ 9 files changed, 111 insertions(+), 33 deletions(-)
+ create mode 100644 include/trace/events/filelock.h
+Merging vfs/for-next (673b65614f0c kill generic_file_splice_write())
+$ git merge vfs/for-next
+Resolved 'fs/f2fs/file.c' using previous resolution.
+Auto-merging include/linux/fs.h
+Auto-merging fs/xfs/xfs_trace.h
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/nfs/file.c
+Auto-merging fs/fuse/fuse_i.h
+Auto-merging fs/fuse/file.c
+Auto-merging fs/f2fs/file.c
+CONFLICT (content): Merge conflict in fs/f2fs/file.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ecryptfs/file.c
+Auto-merging fs/btrfs/file.c
+Auto-merging fs/aio.c
+Auto-merging fs/9p/vfs_file.c
+Auto-merging drivers/staging/lustre/lustre/llite/file.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master dd1206043ea5] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking | 3 +-
+ Documentation/filesystems/vfs.txt | 3 +-
+ drivers/char/raw.c | 8 +-
+ drivers/mtd/nand/nandsim.c | 4 +-
+ drivers/staging/lustre/lustre/include/lclient.h | 11 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 48 +-
+ drivers/staging/lustre/lustre/llite/file.c | 112 +---
+ .../staging/lustre/lustre/llite/llite_internal.h | 3 +-
+ drivers/staging/lustre/lustre/llite/rw.c | 3 +-
+ drivers/staging/lustre/lustre/llite/rw26.c | 102 ++--
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 29 +-
+ drivers/usb/gadget/storage_common.c | 4 +-
+ fs/9p/vfs_addr.c | 5 +-
+ fs/9p/vfs_file.c | 14 +-
+ fs/adfs/file.c | 8 +-
+ fs/affs/file.c | 8 +-
+ fs/afs/file.c | 8 +-
+ fs/afs/internal.h | 3 +-
+ fs/afs/write.c | 11 +-
+ fs/aio.c | 14 +-
+ fs/bfs/file.c | 8 +-
+ fs/block_dev.c | 40 +-
+ fs/btrfs/file.c | 51 +-
+ fs/btrfs/inode.c | 47 +-
+ fs/ceph/addr.c | 4 +-
+ fs/ceph/file.c | 185 +++----
+ fs/cifs/cifsfs.c | 55 +-
+ fs/cifs/cifsfs.h | 12 +-
+ fs/cifs/file.c | 81 ++-
+ fs/direct-io.c | 164 ++----
+ fs/ecryptfs/file.c | 13 +-
+ fs/exofs/file.c | 10 +-
+ fs/exofs/inode.c | 2 +-
+ fs/ext2/file.c | 10 +-
+ fs/ext2/inode.c | 10 +-
+ fs/ext3/file.c | 10 +-
+ fs/ext3/inode.c | 15 +-
+ fs/ext4/ext4.h | 3 +-
+ fs/ext4/file.c | 35 +-
+ fs/ext4/indirect.c | 14 +-
+ fs/ext4/inode.c | 24 +-
+ fs/f2fs/data.c | 17 +-
+ fs/f2fs/file.c | 10 +-
+ fs/fat/file.c | 8 +-
+ fs/fat/inode.c | 12 +-
+ fs/file.c | 11 +-
+ fs/file_table.c | 6 +
+ fs/fuse/cuse.c | 8 +-
+ fs/fuse/file.c | 154 +++---
+ fs/fuse/fuse_i.h | 5 +-
+ fs/gfs2/aops.c | 11 +-
+ fs/gfs2/file.c | 30 +-
+ fs/hfs/inode.c | 16 +-
+ fs/hfsplus/inode.c | 15 +-
+ fs/hostfs/hostfs_kern.c | 8 +-
+ fs/hpfs/file.c | 8 +-
+ fs/jffs2/file.c | 8 +-
+ fs/jfs/file.c | 10 +-
+ fs/jfs/inode.c | 8 +-
+ fs/logfs/file.c | 8 +-
+ fs/minix/file.c | 8 +-
+ fs/nfs/direct.c | 328 ++++--------
+ fs/nfs/file.c | 65 +--
+ fs/nfs/internal.h | 6 +-
+ fs/nfs/nfs4file.c | 10 +-
+ fs/nilfs2/file.c | 8 +-
+ fs/nilfs2/inode.c | 9 +-
+ fs/ntfs/file.c | 9 +-
+ fs/ocfs2/aops.c | 7 +-
+ fs/ocfs2/file.c | 138 +----
+ fs/omfs/file.c | 8 +-
+ fs/open.c | 6 +
+ fs/pipe.c | 145 +----
+ fs/ramfs/file-mmu.c | 10 +-
+ fs/ramfs/file-nommu.c | 10 +-
+ fs/read_write.c | 108 +++-
+ fs/reiserfs/file.c | 10 +-
+ fs/reiserfs/inode.c | 10 +-
+ fs/romfs/mmap-nommu.c | 4 +-
+ fs/splice.c | 194 +++----
+ fs/sysv/file.c | 8 +-
+ fs/ubifs/file.c | 25 +-
+ fs/udf/file.c | 19 +-
+ fs/udf/inode.c | 10 +-
+ fs/ufs/file.c | 8 +-
+ fs/xfs/xfs_aops.c | 17 +-
+ fs/xfs/xfs_file.c | 119 +----
+ fs/xfs/xfs_trace.h | 1 -
+ include/linux/blk_types.h | 4 +-
+ include/linux/ceph/libceph.h | 2 -
+ include/linux/fs.h | 41 +-
+ include/linux/mm.h | 11 +
+ include/linux/nfs_fs.h | 7 +-
+ include/linux/splice.h | 10 -
+ include/linux/uio.h | 51 +-
+ mm/filemap.c | 158 ++----
+ mm/iov_iter.c | 595 +++++++++++++++++++--
+ mm/page_io.c | 21 +-
+ mm/process_vm_access.c | 10 +-
+ mm/shmem.c | 26 +-
+ mm/vmscan.c | 2 +-
+ net/ceph/pagevec.c | 35 +-
+ security/apparmor/include/apparmor.h | 1 -
+ security/apparmor/lib.c | 14 -
+ 104 files changed, 1794 insertions(+), 2041 deletions(-)
+Merging pci/next (518a6a34f645 Merge branches 'pci/hotplug', 'pci/msi', 'pci/virtualization' and 'pci/misc' into next)
+$ git merge pci/next
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/misc/genwqe/card_utils.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-pci | 2 +-
+ MAINTAINERS | 1 +
+ drivers/misc/genwqe/card_utils.c | 2 +-
+ drivers/pci/bus.c | 1 -
+ drivers/pci/host-bridge.c | 1 -
+ drivers/pci/hotplug-pci.c | 2 +-
+ drivers/pci/hotplug/acpiphp_glue.c | 3 +--
+ drivers/pci/hotplug/cpci_hotplug_pci.c | 2 +-
+ drivers/pci/hotplug/cpqphp_nvram.c | 1 -
+ drivers/pci/hotplug/pciehp.h | 2 +-
+ drivers/pci/hotplug/pciehp_hpc.c | 2 ++
+ drivers/pci/hotplug/pcihp_slot.c | 3 +--
+ drivers/pci/hotplug/rpaphp_core.c | 15 +++++++++------
+ drivers/pci/hotplug/s390_pci_hpc.c | 1 -
+ drivers/pci/hotplug/shpchp_pci.c | 2 +-
+ drivers/pci/msi.c | 17 ++++++-----------
+ drivers/pci/pci-driver.c | 25 ++++++++++++++++++++++---
+ drivers/pci/pci.c | 2 +-
+ drivers/pci/pci.h | 8 ++++----
+ drivers/pci/pcie/portdrv_core.c | 9 ++++++---
+ drivers/pci/probe.c | 10 +++++-----
+ drivers/pci/quirks.c | 3 +++
+ drivers/pci/search.c | 1 -
+ drivers/pci/setup-bus.c | 25 ++++++++++++-------------
+ drivers/pci/setup-irq.c | 1 -
+ drivers/pci/setup-res.c | 1 -
+ include/linux/pci.h | 10 +++++-----
+ include/linux/pci_ids.h | 3 ---
+ 28 files changed, 84 insertions(+), 71 deletions(-)
+Merging hid/for-next (9795762e2a7e Merge branch 'for-3.16/upstream' into for-next)
+$ git merge hid/for-next
+Auto-merging include/uapi/linux/input.h
+Removing Documentation/ABI/testing/sysfs-driver-hid-thingm
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-driver-hid-thingm | 23 -
+ drivers/hid/Kconfig | 8 +
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-core.c | 2 +
+ drivers/hid/hid-debug.c | 10 +
+ drivers/hid/hid-input.c | 14 +
+ drivers/hid/hid-rmi.c | 888 ++++++++++++++++++++++
+ drivers/hid/hid-sony.c | 434 ++++++++---
+ drivers/hid/hid-thingm.c | 361 +++++----
+ drivers/leds/Kconfig | 2 +
+ include/linux/hid.h | 2 +
+ include/uapi/linux/input.h | 17 +-
+ 12 files changed, 1484 insertions(+), 278 deletions(-)
+ delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-thingm
+ create mode 100644 drivers/hid/hid-rmi.c
+Merging i2c/i2c/for-next (d1db0eea8524 Linux 3.15-rc3)
+$ git merge i2c/i2c/for-next
+Already up-to-date.
+Merging jdelvare-hwmon/master (c9eaa447e77e Linux 3.15-rc1)
+$ git merge jdelvare-hwmon/master
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (d60ba715cd76 hwmon: (vt1211) remove unnecessary OOM messages)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/lm77 | 20 ++-
+ drivers/hwmon/f71805f.c | 4 +-
+ drivers/hwmon/ibmpex.c | 4 +-
+ drivers/hwmon/lm70.c | 62 ++------
+ drivers/hwmon/lm75.c | 51 +++----
+ drivers/hwmon/lm77.c | 374 ++++++++++++++++++----------------------------
+ drivers/hwmon/lm92.c | 224 ++++++++++++---------------
+ drivers/hwmon/lm93.c | 4 +-
+ drivers/hwmon/max1111.c | 4 +-
+ drivers/hwmon/max197.c | 4 +-
+ drivers/hwmon/pc87427.c | 4 +-
+ drivers/hwmon/s3c-hwmon.c | 4 +-
+ drivers/hwmon/tmp102.c | 62 ++++----
+ drivers/hwmon/tmp421.c | 47 ++----
+ drivers/hwmon/vt1211.c | 4 +-
+ 15 files changed, 347 insertions(+), 525 deletions(-)
+Merging v4l-dvb/master (b40dfe97cc3a Merge branch 'v4l_for_linus' into to_next)
+$ git merge v4l-dvb/master
+Merge made by the 'recursive' strategy.
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
+ drivers/media/platform/davinci/vpbe_display.c | 16 +++++++-
+ drivers/media/platform/davinci/vpfe_capture.c | 2 +
+ drivers/media/platform/davinci/vpif_capture.c | 34 +++++++++++------
+ drivers/media/platform/davinci/vpif_display.c | 35 +++++++++++------
+ drivers/media/platform/exynos4-is/fimc-core.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/Makefile | 1 -
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 48 +++++++++++++++++++++---
+ drivers/media/usb/gspca/sonixb.c | 2 -
+ drivers/staging/media/davinci_vpfe/vpfe_video.c | 13 ++++++-
+ drivers/staging/media/sn9c102/sn9c102_devtable.h | 2 -
+ 11 files changed, 119 insertions(+), 38 deletions(-)
+Merging kbuild/for-next (42651ec91af5 Merge branch 'kbuild/misc' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging lib/Kconfig.debug
+Auto-merging init/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ .gitignore | 4 +-
+ Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++
+ Makefile | 25 +++++--
+ arch/x86/Kconfig | 2 +-
+ init/Kconfig | 73 +++++++++++++++++++
+ kernel/gcov/Kconfig | 2 +-
+ lib/Kconfig.debug | 2 +-
+ scripts/Makefile.build | 61 ----------------
+ scripts/Makefile.extrawarn | 67 ++++++++++++++++++
+ scripts/Makefile.lto | 84 ++++++++++++++++++++++
+ scripts/Makefile.modpost | 7 +-
+ scripts/link-vmlinux.sh | 2 +-
+ scripts/package/builddeb | 8 ++-
+ scripts/tags.sh | 9 ++-
+ 14 files changed, 439 insertions(+), 80 deletions(-)
+ create mode 100644 Documentation/lto-build
+ create mode 100644 scripts/Makefile.extrawarn
+ create mode 100644 scripts/Makefile.lto
+Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (49686b98a059 Merge branch 'for-3.16' into for-next)
+$ git merge libata/for-next
+Merge made by the 'recursive' strategy.
+ drivers/ata/pata_octeon_cf.c | 50 +++++++++++++++-----------------------------
+ 1 file changed, 17 insertions(+), 33 deletions(-)
+Merging pm/linux-next (d3b6390a653b Merge branch 'cpufreq-macros' into linux-next)
+$ git merge pm/linux-next
+Resolved 'arch/mips/loongson/lemote-2f/clock.c' using previous resolution.
+Removing tools/power/acpi/tools/acpidump/acpidump.c
+Auto-merging arch/mips/loongson/lemote-2f/clock.c
+CONFLICT (content): Merge conflict in arch/mips/loongson/lemote-2f/clock.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 276540701044] Merge remote-tracking branch 'pm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cpu-freq/cpu-drivers.txt | 19 +
+ Documentation/kernel-parameters.txt | 10 +-
+ arch/arm/mach-davinci/da850.c | 9 +-
+ arch/mips/loongson/lemote-2f/clock.c | 16 +-
+ drivers/acpi/acpi_pad.c | 9 +-
+ drivers/acpi/acpi_processor.c | 7 +-
+ drivers/acpi/acpica/Makefile | 1 +
+ drivers/acpi/acpica/acapps.h | 170 +++
+ drivers/acpi/acpica/acglobal.h | 9 +-
+ drivers/acpi/acpica/aclocal.h | 8 +-
+ drivers/acpi/acpica/actables.h | 60 +-
+ drivers/acpi/acpica/acutils.h | 10 +-
+ drivers/acpi/acpica/evmisc.c | 3 +-
+ drivers/acpi/acpica/evsci.c | 2 +-
+ drivers/acpi/acpica/evxface.c | 61 +-
+ drivers/acpi/acpica/exconfig.c | 82 +-
+ drivers/acpi/acpica/exdump.c | 4 +-
+ drivers/acpi/acpica/tbdata.c | 723 +++++++++++
+ drivers/acpi/acpica/tbfadt.c | 10 +-
+ drivers/acpi/acpica/tbfind.c | 4 +-
+ drivers/acpi/acpica/tbinstal.c | 837 +++++--------
+ drivers/acpi/acpica/tbutils.c | 171 +--
+ drivers/acpi/acpica/tbxface.c | 18 +-
+ drivers/acpi/acpica/tbxfload.c | 87 +-
+ drivers/acpi/acpica/utdecode.c | 74 +-
+ drivers/acpi/acpica/utstring.c | 2 +-
+ drivers/acpi/ec.c | 21 +-
+ drivers/acpi/osl.c | 11 +-
+ drivers/acpi/scan.c | 16 +-
+ drivers/acpi/video.c | 147 +--
+ drivers/cpufreq/acpi-cpufreq.c | 9 +-
+ drivers/cpufreq/arm_big_little.c | 16 +-
+ drivers/cpufreq/cpufreq.c | 11 +
+ drivers/cpufreq/cpufreq_stats.c | 24 +-
+ drivers/cpufreq/dbx500-cpufreq.c | 8 +-
+ drivers/cpufreq/elanfreq.c | 9 +-
+ drivers/cpufreq/exynos-cpufreq.c | 11 +-
+ drivers/cpufreq/exynos5440-cpufreq.c | 30 +-
+ drivers/cpufreq/freq_table.c | 56 +-
+ drivers/cpufreq/longhaul.c | 47 +-
+ drivers/cpufreq/pasemi-cpufreq.c | 10 +-
+ drivers/cpufreq/powernow-k6.c | 37 +-
+ drivers/cpufreq/powernow-k7.c | 4 -
+ drivers/cpufreq/ppc-corenet-cpufreq.c | 5 +-
+ drivers/cpufreq/ppc_cbe_cpufreq.c | 9 +-
+ drivers/cpufreq/s3c2416-cpufreq.c | 40 +-
+ drivers/cpufreq/s3c64xx-cpufreq.c | 15 +-
+ drivers/mfd/db8500-prcmu.c | 19 +-
+ drivers/net/irda/sh_sir.c | 14 +-
+ drivers/pnp/pnpacpi/core.c | 44 +-
+ drivers/pnp/quirks.c | 4 +-
+ drivers/sh/clk/core.c | 20 +-
+ drivers/thermal/cpu_cooling.c | 33 +-
+ include/acpi/acpixf.h | 7 +-
+ include/acpi/actbl.h | 11 +-
+ include/acpi/platform/acgcc.h | 11 +
+ include/acpi/platform/aclinux.h | 5 +-
+ include/linux/cpufreq.h | 21 +
+ kernel/power/hibernate.c | 14 +-
+ tools/power/acpi/Makefile | 28 +-
+ tools/power/acpi/common/cmfsize.c | 101 ++
+ tools/power/acpi/common/getopt.c | 239 ++++
+ tools/power/acpi/man/acpidump.8 | 85 +-
+ .../acpi/os_specific/service_layers/oslinuxtbl.c | 1275 ++++++++++++++++++++
+ .../acpi/os_specific/service_layers/osunixdir.c | 204 ++++
+ .../acpi/os_specific/service_layers/osunixmap.c | 151 +++
+ tools/power/acpi/tools/acpidump/acpidump.c | 559 ---------
+ tools/power/acpi/tools/acpidump/acpidump.h | 131 ++
+ tools/power/acpi/tools/acpidump/apdump.c | 451 +++++++
+ tools/power/acpi/tools/acpidump/apfiles.c | 228 ++++
+ tools/power/acpi/tools/acpidump/apmain.c | 340 ++++++
+ tools/power/acpi/tools/ec/Makefile | 22 +
+ tools/power/acpi/tools/ec/ec_access.c | 238 ++++
+ 73 files changed, 5363 insertions(+), 1834 deletions(-)
+ create mode 100644 drivers/acpi/acpica/acapps.h
+ create mode 100644 drivers/acpi/acpica/tbdata.c
+ create mode 100644 tools/power/acpi/common/cmfsize.c
+ create mode 100644 tools/power/acpi/common/getopt.c
+ create mode 100644 tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
+ create mode 100644 tools/power/acpi/os_specific/service_layers/osunixdir.c
+ create mode 100644 tools/power/acpi/os_specific/service_layers/osunixmap.c
+ delete mode 100644 tools/power/acpi/tools/acpidump/acpidump.c
+ create mode 100644 tools/power/acpi/tools/acpidump/acpidump.h
+ create mode 100644 tools/power/acpi/tools/acpidump/apdump.c
+ create mode 100644 tools/power/acpi/tools/acpidump/apfiles.c
+ create mode 100644 tools/power/acpi/tools/acpidump/apmain.c
+ create mode 100644 tools/power/acpi/tools/ec/Makefile
+ create mode 100644 tools/power/acpi/tools/ec/ec_access.c
+Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release)
+$ git merge idle/next
+Already up-to-date.
+Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
+$ git merge apm/for-next
+Already up-to-date.
+Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (9477165ec525 thermal: rcar-thermal: update thermal zone only when temperature changes)
+$ git merge thermal/next
+Already up-to-date.
+Merging ieee1394/for-next (0ca49345b6f4 firewire: ohci: fix probe failure with Agere/LSI controllers)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2))
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (d54b64156deb Merge branch 'topic/xilinx' into next)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 75 ++
+ arch/arm/common/edma.c | 28 +-
+ drivers/dma/Kconfig | 14 +
+ drivers/dma/Makefile | 1 +
+ drivers/dma/edma.c | 335 +++--
+ drivers/dma/xilinx/Makefile | 1 +
+ drivers/dma/xilinx/xilinx_vdma.c | 1379 ++++++++++++++++++++
+ include/linux/amba/xilinx_dma.h | 47 +
+ include/linux/platform_data/edma.h | 20 +-
+ 9 files changed, 1800 insertions(+), 100 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt
+ create mode 100644 drivers/dma/xilinx/Makefile
+ create mode 100644 drivers/dma/xilinx/xilinx_vdma.c
+ create mode 100644 include/linux/amba/xilinx_dma.h
+Merging dmaengine/next (b9bf6d2e84b7 dma: mv_xor: Flush descriptors before activating a channel)
+$ git merge dmaengine/next
+Auto-merging include/linux/dmaengine.h
+Auto-merging drivers/dma/dmaengine.c
+Merge made by the 'recursive' strategy.
+ drivers/dma/dmaengine.c | 2 ++
+ drivers/dma/ioat/dca.c | 13 +++----
+ drivers/dma/ioat/dma.c | 2 +-
+ drivers/dma/ioat/dma_v3.c | 6 ++--
+ drivers/dma/mv_xor.c | 88 +++++++++++++++++++++++++++++++++++------------
+ include/linux/dmaengine.h | 1 +
+ 6 files changed, 80 insertions(+), 32 deletions(-)
+Merging net-next/master (c25aaf814a63 hyperv: Enable sendbuf mechanism on the send path)
+$ git merge net-next/master
+Resolved 'drivers/net/ethernet/altera/altera_sgdma.c' using previous resolution.
+Resolved 'net/netlink/af_netlink.c' using previous resolution.
+Auto-merging net/sched/cls_api.c
+Auto-merging net/netlink/af_netlink.c
+CONFLICT (content): Merge conflict in net/netlink/af_netlink.c
+Auto-merging net/netfilter/nfnetlink.c
+Auto-merging net/ipv4/tcp_output.c
+Auto-merging kernel/audit.c
+Auto-merging include/linux/netlink.h
+Auto-merging drivers/net/macvlan.c
+Auto-merging drivers/net/hyperv/netvsc_drv.c
+Auto-merging drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c
+Auto-merging drivers/net/ethernet/altera/altera_sgdma.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/altera/altera_sgdma.c
+Auto-merging drivers/net/ethernet/altera/altera_msgdma.c
+Auto-merging drivers/net/can/spi/mcp251x.c
+Auto-merging drivers/net/can/c_can/c_can_pci.c
+Auto-merging drivers/net/bonding/bond_sysfs.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 70753265f451] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/net/broadcom-systemport.txt | 29 +
+ .../bindings/net/ieee802154/at86rf230.txt | 23 +
+ .../devicetree/bindings/net/via-rhine.txt | 17 +
+ Documentation/networking/bonding.txt | 44 +-
+ Documentation/networking/filter.txt | 13 +
+ MAINTAINERS | 6 +
+ arch/arm/boot/dts/vt8500.dtsi | 6 +
+ arch/arm/boot/dts/wm8650.dtsi | 6 +
+ arch/arm/boot/dts/wm8850.dtsi | 6 +
+ drivers/net/bonding/bond_3ad.c | 2 +-
+ drivers/net/bonding/bond_alb.c | 116 +-
+ drivers/net/bonding/bond_alb.h | 1 +
+ drivers/net/bonding/bond_main.c | 20 +-
+ drivers/net/bonding/bond_options.c | 29 +-
+ drivers/net/bonding/bond_options.h | 1 +
+ drivers/net/bonding/bond_sysfs.c | 29 +
+ drivers/net/bonding/bonding.h | 3 +-
+ drivers/net/can/Kconfig | 8 +-
+ drivers/net/can/Makefile | 2 +-
+ drivers/net/can/c_can/c_can_pci.c | 51 +-
+ drivers/net/can/softing/softing_main.c | 20 +-
+ drivers/net/can/spi/Kconfig | 10 +
+ drivers/net/can/spi/Makefile | 8 +
+ drivers/net/can/{ => spi}/mcp251x.c | 93 +-
+ drivers/net/can/usb/Kconfig | 4 +-
+ drivers/net/can/usb/kvaser_usb.c | 53 +-
+ drivers/net/dsa/mv88e6123_61_65.c | 2 +-
+ drivers/net/dsa/mv88e6131.c | 4 +-
+ drivers/net/dsa/mv88e6xxx.c | 12 +-
+ drivers/net/ethernet/altera/altera_msgdma.c | 15 +-
+ drivers/net/ethernet/altera/altera_sgdma.c | 33 +-
+ drivers/net/ethernet/broadcom/Kconfig | 11 +
+ drivers/net/ethernet/broadcom/Makefile | 1 +
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 1614 ++++++++++++++++++++
+ drivers/net/ethernet/broadcom/bcmsysport.h | 677 ++++++++
+ drivers/net/ethernet/emulex/benet/be.h | 12 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 7 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 2 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 92 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 31 +-
+ drivers/net/ethernet/ethoc.c | 6 -
+ drivers/net/ethernet/intel/e1000e/e1000.h | 8 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 11 +-
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 1 +
+ drivers/net/ethernet/intel/e1000e/netdev.c | 19 +-
+ drivers/net/ethernet/intel/e1000e/nvm.c | 1 +
+ drivers/net/ethernet/intel/e1000e/param.c | 4 +
+ drivers/net/ethernet/intel/e1000e/phy.c | 1 +
+ drivers/net/ethernet/intel/i40e/i40e.h | 2 -
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 23 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 41 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 50 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 6 -
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 14 +-
+ drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 278 ++--
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 7 +-
+ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 36 -
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 -
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 4 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 111 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 +
+ drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 22 +
+ drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 1 +
+ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 41 +-
+ drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h | 1 +
+ drivers/net/ethernet/intel/i40evf/i40e_type.h | 4 +
+ drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 316 ++++
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 15 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 93 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.h | 72 +-
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 96 +-
+ drivers/net/ethernet/intel/igb/e1000_hw.h | 96 +-
+ drivers/net/ethernet/intel/igb/e1000_i210.c | 48 +-
+ drivers/net/ethernet/intel/igb/e1000_i210.h | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.c | 56 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.h | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_mbx.c | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_mbx.h | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_nvm.c | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_nvm.h | 49 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.c | 52 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.h | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_regs.h | 54 +-
+ drivers/net/ethernet/intel/igb/igb.h | 49 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 112 +-
+ drivers/net/ethernet/intel/igb/igb_hwmon.c | 47 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 161 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 18 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 27 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 35 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 15 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 2 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 319 ++--
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 49 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 2 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 2 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
+ drivers/net/ethernet/neterion/s2io.c | 9 -
+ drivers/net/ethernet/qlogic/Kconfig | 11 +
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 19 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 13 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2 +
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 13 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 19 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 31 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 35 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 68 +
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 50 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 7 +-
+ drivers/net/ethernet/ti/cpmac.c | 14 -
+ drivers/net/ethernet/via/Kconfig | 2 +-
+ drivers/net/ethernet/via/via-rhine.c | 445 +++---
+ drivers/net/hyperv/hyperv_net.h | 159 +-
+ drivers/net/hyperv/netvsc.c | 529 ++++---
+ drivers/net/hyperv/netvsc_drv.c | 114 +-
+ drivers/net/hyperv/rndis_filter.c | 193 ++-
+ drivers/net/ieee802154/at86rf230.c | 133 +-
+ drivers/net/macvlan.c | 119 +-
+ drivers/net/phy/at803x.c | 39 +-
+ drivers/net/phy/phy_device.c | 3 +-
+ drivers/net/phy/smsc.c | 3 +-
+ drivers/net/phy/vitesse.c | 3 +-
+ drivers/net/virtio_net.c | 7 +
+ drivers/net/vxlan.c | 63 +-
+ drivers/ptp/ptp_clock.c | 5 +-
+ drivers/s390/net/claw.c | 2 +-
+ drivers/s390/net/ctcm_main.c | 2 +-
+ drivers/s390/net/lcs.c | 2 +-
+ drivers/s390/net/qeth_core.h | 6 +-
+ drivers/s390/net/qeth_core_main.c | 77 +-
+ drivers/s390/net/qeth_core_sys.c | 22 +-
+ drivers/s390/net/qeth_l2_main.c | 11 +-
+ drivers/s390/net/qeth_l3_main.c | 7 +-
+ include/linux/ethtool.h | 13 +
+ include/linux/filter.h | 1 +
+ include/linux/netdevice.h | 1 +
+ include/linux/netlink.h | 3 +-
+ include/linux/phy.h | 1 +
+ include/linux/spi/at86rf230.h | 14 -
+ include/net/6lowpan.h | 1 +
+ include/net/addrconf.h | 5 -
+ include/net/dsa.h | 5 +
+ include/net/ipv6.h | 19 +
+ include/net/net_namespace.h | 8 +
+ include/net/pkt_cls.h | 2 +-
+ include/net/sch_generic.h | 2 +-
+ include/net/tcp.h | 1 -
+ include/net/vxlan.h | 2 +-
+ include/uapi/linux/audit.h | 8 +
+ include/uapi/linux/capability.h | 7 +-
+ include/uapi/linux/ethtool.h | 32 +
+ include/uapi/linux/filter.h | 3 +-
+ include/uapi/linux/if_fddi.h | 90 +-
+ include/uapi/linux/tipc.h | 23 +
+ include/uapi/linux/tipc_config.h | 10 +-
+ kernel/audit.c | 64 +-
+ net/8021q/vlan_dev.c | 58 +-
+ net/core/dev.c | 42 +-
+ net/core/ethtool.c | 223 ++-
+ net/core/filter.c | 12 +
+ net/core/net_namespace.c | 2 +-
+ net/ieee802154/reassembly.c | 48 +-
+ net/ipv4/inetpeer.c | 2 +-
+ net/ipv4/ip_gre.c | 6 +-
+ net/ipv4/ip_options.c | 6 +-
+ net/ipv4/tcp.c | 8 +
+ net/ipv4/tcp_input.c | 22 -
+ net/ipv4/tcp_output.c | 56 +-
+ net/ipv6/addrconf.c | 20 +-
+ net/ipv6/icmp.c | 14 +-
+ net/ipv6/ip6_flowlabel.c | 1 -
+ net/ipv6/ip6_gre.c | 52 +-
+ net/ipv6/ping.c | 7 +-
+ net/ipv6/raw.c | 10 +-
+ net/ipv6/udp.c | 10 +-
+ net/l2tp/l2tp_ip6.c | 10 +-
+ net/netfilter/nfnetlink.c | 10 +-
+ net/netlink/af_netlink.c | 70 +-
+ net/netlink/af_netlink.h | 6 +-
+ net/openvswitch/vport-vxlan.c | 3 +-
+ net/sched/cls_api.c | 23 +-
+ net/sched/cls_basic.c | 10 +-
+ net/sched/cls_bpf.c | 10 +-
+ net/sched/cls_cgroup.c | 4 +-
+ net/sched/cls_flow.c | 4 +-
+ net/sched/cls_fw.c | 10 +-
+ net/sched/cls_route.c | 11 +-
+ net/sched/cls_rsvp.h | 4 +-
+ net/sched/cls_tcindex.c | 8 +-
+ net/sched/cls_u32.c | 10 +-
+ net/sctp/socket.c | 5 +
+ net/sctp/ulpqueue.c | 4 +
+ net/tipc/bcast.c | 37 +-
+ net/tipc/bcast.h | 5 +-
+ net/tipc/bearer.c | 117 +-
+ net/tipc/bearer.h | 12 +-
+ net/tipc/config.c | 6 +-
+ net/tipc/core.h | 2 +-
+ net/tipc/discover.c | 66 +-
+ net/tipc/discover.h | 1 +
+ net/tipc/link.c | 89 +-
+ net/tipc/link.h | 6 +-
+ net/tipc/name_distr.c | 20 +-
+ net/tipc/name_distr.h | 5 +-
+ net/tipc/name_table.c | 14 +-
+ net/tipc/net.c | 61 +-
+ net/tipc/net.h | 2 -
+ net/tipc/node.c | 43 +-
+ net/tipc/node.h | 1 +
+ net/tipc/socket.c | 29 +-
+ security/selinux/include/classmap.h | 2 +-
+ tools/net/bpf_exp.l | 1 +
+ tools/net/bpf_exp.y | 11 +-
+ 221 files changed, 7180 insertions(+), 2615 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/broadcom-systemport.txt
+ create mode 100644 Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt
+ create mode 100644 Documentation/devicetree/bindings/net/via-rhine.txt
+ create mode 100644 drivers/net/can/spi/Kconfig
+ create mode 100644 drivers/net/can/spi/Makefile
+ rename drivers/net/can/{ => spi}/mcp251x.c (96%)
+ create mode 100644 drivers/net/ethernet/broadcom/bcmsysport.c
+ create mode 100644 drivers/net/ethernet/broadcom/bcmsysport.h
+Merging ipsec-next/master (2e71029e2c32 xfrm: Remove useless xfrm_audit struct.)
+$ git merge ipsec-next/master
+Auto-merging net/xfrm/xfrm_user.c
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 57 +++++++++++++++++++-------------------------------
+ net/key/af_key.c | 32 +++++++---------------------
+ net/xfrm/xfrm_policy.c | 46 +++++++++++++---------------------------
+ net/xfrm/xfrm_state.c | 37 +++++++++++---------------------
+ net/xfrm/xfrm_user.c | 53 +++++++---------------------------------------
+ 5 files changed, 63 insertions(+), 162 deletions(-)
+Merging wireless-next/master (48d11dc37977 rsi: Changing opcode for sta mode according to changes in firmware)
+$ git merge wireless-next/master
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging net/bluetooth/hci_conn.c
+Auto-merging drivers/net/wireless/rt2x00/rt2x00mac.c
+Auto-merging drivers/net/wireless/ath/ath9k/recv.c
+Auto-merging drivers/net/wireless/ath/ath9k/init.c
+Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/80211.tmpl | 1 +
+ drivers/bluetooth/btmrvl_drv.h | 4 +-
+ drivers/bluetooth/btmrvl_main.c | 19 +-
+ drivers/bluetooth/btmrvl_sdio.c | 103 ++-
+ drivers/bluetooth/btmrvl_sdio.h | 3 +
+ drivers/bluetooth/hci_h4.c | 7 -
+ drivers/net/wireless/ath/ar5523/ar5523.c | 3 +-
+ drivers/net/wireless/ath/ath10k/bmi.c | 13 +-
+ drivers/net/wireless/ath/ath10k/bmi.h | 2 +-
+ drivers/net/wireless/ath/ath10k/ce.c | 356 +++++-----
+ drivers/net/wireless/ath/ath10k/ce.h | 15 +-
+ drivers/net/wireless/ath/ath10k/core.c | 85 ++-
+ drivers/net/wireless/ath/ath10k/core.h | 18 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 109 ++-
+ drivers/net/wireless/ath/ath10k/htc.c | 12 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 21 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 513 +++++++++-----
+ drivers/net/wireless/ath/ath10k/hw.h | 1 +
+ drivers/net/wireless/ath/ath10k/mac.c | 766 ++++++++++++---------
+ drivers/net/wireless/ath/ath10k/pci.c | 219 ++++--
+ drivers/net/wireless/ath/ath10k/pci.h | 3 -
+ drivers/net/wireless/ath/ath10k/txrx.c | 183 -----
+ drivers/net/wireless/ath/ath10k/txrx.h | 1 -
+ drivers/net/wireless/ath/ath10k/wmi.c | 62 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 98 ++-
+ drivers/net/wireless/ath/ath5k/phy.c | 4 +-
+ drivers/net/wireless/ath/ath6kl/Kconfig | 30 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 9 +-
+ drivers/net/wireless/ath/ath6kl/core.c | 6 +-
+ drivers/net/wireless/ath/ath6kl/debug.c | 4 -
+ drivers/net/wireless/ath/ath6kl/debug.h | 2 +-
+ drivers/net/wireless/ath/ath6kl/hif.c | 3 -
+ drivers/net/wireless/ath/ath6kl/hif.h | 4 +-
+ drivers/net/wireless/ath/ath6kl/htc_mbox.c | 23 +-
+ drivers/net/wireless/ath/ath6kl/htc_pipe.c | 10 +-
+ drivers/net/wireless/ath/ath6kl/init.c | 1 -
+ drivers/net/wireless/ath/ath6kl/main.c | 10 +-
+ drivers/net/wireless/ath/ath6kl/sdio.c | 17 +-
+ drivers/net/wireless/ath/ath6kl/target.h | 2 +-
+ drivers/net/wireless/ath/ath6kl/txrx.c | 31 +-
+ drivers/net/wireless/ath/ath6kl/usb.c | 2 -
+ drivers/net/wireless/ath/ath6kl/wmi.c | 19 +-
+ drivers/net/wireless/ath/ath6kl/wmi.h | 1 -
+ .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 +-
+ .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h | 2 +-
+ .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 8 +-
+ drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 6 +-
+ .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 12 +
+ drivers/net/wireless/ath/ath9k/init.c | 10 +-
+ drivers/net/wireless/ath/ath9k/main.c | 109 ++-
+ drivers/net/wireless/ath/ath9k/recv.c | 3 +
+ drivers/net/wireless/ath/carl9170/main.c | 4 +-
+ drivers/net/wireless/ath/wil6210/interrupt.c | 2 +-
+ drivers/net/wireless/ath/wil6210/main.c | 4 +-
+ drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 -
+ drivers/net/wireless/ath/wil6210/rx_reorder.c | 17 +
+ drivers/net/wireless/ath/wil6210/wil6210.h | 3 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 11 +-
+ drivers/net/wireless/ath/wil6210/wmi.h | 50 +-
+ drivers/net/wireless/b43/b43.h | 4 -
+ drivers/net/wireless/b43/main.c | 97 ++-
+ drivers/net/wireless/b43/phy_common.c | 6 +-
+ drivers/net/wireless/b43/phy_g.c | 6 +-
+ drivers/net/wireless/b43/phy_n.c | 304 ++++++--
+ drivers/net/wireless/b43/radio_2056.c | 418 +++++++++--
+ drivers/net/wireless/b43/tables_nphy.c | 72 +-
+ drivers/net/wireless/b43/tables_nphy.h | 3 +-
+ drivers/net/wireless/b43/wa.c | 2 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 3 +-
+ drivers/net/wireless/cw1200/sta.c | 3 +-
+ drivers/net/wireless/cw1200/sta.h | 3 +-
+ drivers/net/wireless/iwlegacy/3945.c | 2 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c | 2 +-
+ drivers/net/wireless/iwlegacy/common.c | 3 +-
+ drivers/net/wireless/iwlegacy/common.h | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/lib.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 5 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c | 12 +
+ drivers/net/wireless/iwlwifi/iwl-1000.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-2000.c | 2 +
+ drivers/net/wireless/iwlwifi/iwl-5000.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-6000.c | 3 +
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 5 +
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 27 +-
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 25 +-
+ drivers/net/wireless/iwlwifi/iwl-op-mode.h | 25 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 8 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 10 +-
+ drivers/net/wireless/iwlwifi/mvm/coex.c | 34 +-
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 94 ++-
+ drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 13 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 15 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 38 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 17 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 26 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 46 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 3 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 54 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h | 6 +-
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 12 +-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 5 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 49 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 26 +-
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 56 +-
+ drivers/net/wireless/iwlwifi/mvm/power.c | 272 ++++----
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 330 ++++++++-
+ drivers/net/wireless/iwlwifi/mvm/rs.h | 24 +
+ drivers/net/wireless/iwlwifi/mvm/rx.c | 45 +-
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 20 +-
+ drivers/net/wireless/iwlwifi/mvm/sf.c | 3 -
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 177 +----
+ drivers/net/wireless/iwlwifi/mvm/sta.h | 3 +
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 71 +-
+ drivers/net/wireless/iwlwifi/mvm/tt.c | 10 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 11 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 46 +-
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 9 +-
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 84 +--
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 47 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 62 +-
+ drivers/net/wireless/mac80211_hwsim.c | 5 +-
+ drivers/net/wireless/mwifiex/11ac.c | 3 +-
+ drivers/net/wireless/mwifiex/11n.c | 3 +-
+ drivers/net/wireless/mwifiex/11n_aggr.c | 21 +-
+ drivers/net/wireless/mwifiex/README | 7 +
+ drivers/net/wireless/mwifiex/cmdevt.c | 2 -
+ drivers/net/wireless/mwifiex/debugfs.c | 25 +
+ drivers/net/wireless/mwifiex/decl.h | 8 +-
+ drivers/net/wireless/mwifiex/ioctl.h | 2 +-
+ drivers/net/wireless/mwifiex/main.c | 2 -
+ drivers/net/wireless/mwifiex/main.h | 2 +-
+ drivers/net/wireless/mwifiex/pcie.c | 3 -
+ drivers/net/wireless/mwifiex/scan.c | 37 +-
+ drivers/net/wireless/mwifiex/sdio.c | 9 +-
+ drivers/net/wireless/mwifiex/sdio.h | 18 +-
+ drivers/net/wireless/mwifiex/uap_cmd.c | 8 +-
+ drivers/net/wireless/mwifiex/usb.c | 55 +-
+ drivers/net/wireless/mwifiex/wmm.c | 9 -
+ drivers/net/wireless/p54/main.c | 3 +-
+ drivers/net/wireless/ray_cs.c | 2 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c | 4 +-
+ drivers/net/wireless/rsi/rsi_mgmt.h | 1 +
+ drivers/net/wireless/rt2x00/rt2800lib.c | 15 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 3 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 3 +-
+ drivers/net/wireless/rt2x00/rt61pci.c | 10 +-
+ drivers/net/wireless/rt2x00/rt73usb.c | 10 +-
+ drivers/net/wireless/rtl818x/rtl8180/Makefile | 4 +-
+ drivers/net/wireless/rtl818x/rtl8180/dev.c | 10 +-
+ drivers/net/wireless/rtl818x/rtl818x.h | 6 +-
+ drivers/net/wireless/rtlwifi/core.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 1 -
+ drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 2 +-
+ drivers/net/wireless/ti/wlcore/main.c | 3 +-
+ drivers/net/wireless/ti/wlcore/sdio.c | 28 +-
+ drivers/net/wireless/ti/wlcore/spi.c | 23 +-
+ drivers/staging/rtl8821ae/core.c | 14 +-
+ include/net/bluetooth/hci.h | 1 +
+ include/net/bluetooth/hci_core.h | 13 +-
+ include/net/cfg80211.h | 86 ++-
+ include/net/mac80211.h | 31 +-
+ include/net/regulatory.h | 6 +
+ include/uapi/linux/nl80211.h | 42 ++
+ net/bluetooth/hci_conn.c | 81 ++-
+ net/bluetooth/hci_core.c | 20 +-
+ net/bluetooth/hci_event.c | 246 +++++--
+ net/bluetooth/hci_sock.c | 11 +-
+ net/bluetooth/lib.c | 1 +
+ net/bluetooth/mgmt.c | 36 +-
+ net/mac80211/aes_ccm.c | 37 +-
+ net/mac80211/cfg.c | 53 +-
+ net/mac80211/chan.c | 614 ++++++++++++++---
+ net/mac80211/debugfs.c | 2 +-
+ net/mac80211/debugfs.h | 2 +
+ net/mac80211/debugfs_netdev.h | 2 +
+ net/mac80211/driver-ops.h | 8 +-
+ net/mac80211/ht.c | 22 +-
+ net/mac80211/ibss.c | 75 +-
+ net/mac80211/ieee80211_i.h | 33 +-
+ net/mac80211/iface.c | 36 +-
+ net/mac80211/main.c | 8 +-
+ net/mac80211/mesh.c | 36 +-
+ net/mac80211/mesh_hwmp.c | 5 +-
+ net/mac80211/michael.h | 1 +
+ net/mac80211/mlme.c | 4 +-
+ net/mac80211/rx.c | 19 +-
+ net/mac80211/scan.c | 10 +-
+ net/mac80211/sta_info.c | 3 +-
+ net/mac80211/util.c | 145 +++-
+ net/mac80211/wpa.c | 5 +-
+ net/wireless/Kconfig | 37 +
+ net/wireless/chan.c | 176 ++++-
+ net/wireless/core.c | 75 +-
+ net/wireless/core.h | 46 +-
+ net/wireless/ethtool.c | 10 +-
+ net/wireless/ibss.c | 41 +-
+ net/wireless/mesh.c | 28 +-
+ net/wireless/mlme.c | 38 +-
+ net/wireless/nl80211.c | 499 +++++++-------
+ net/wireless/rdev-ops.h | 13 +
+ net/wireless/reg.c | 153 +++-
+ net/wireless/reg.h | 18 +
+ net/wireless/scan.c | 154 +++--
+ net/wireless/sme.c | 40 +-
+ net/wireless/trace.h | 29 +-
+ net/wireless/util.c | 171 +++--
+ net/wireless/wext-compat.c | 40 +-
+ net/wireless/wext-compat.h | 2 +-
+ net/wireless/wext-sme.c | 12 +-
+ 213 files changed, 6045 insertions(+), 3415 deletions(-)
+Merging bluetooth/master (22e70786413e Bluetooth: Remove hci_h4 unused defines)
+$ git merge bluetooth/master
+Already up-to-date.
+Merging infiniband/for-next (7d0a73a40c5c RDMA/cxgb4: Update Kconfig to include Chelsio T5 adapter)
+$ git merge infiniband/for-next
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/hw/cxgb4/Kconfig | 6 ++---
+ drivers/infiniband/hw/cxgb4/cm.c | 39 ++++++++++++++++++++++---------
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 +
+ drivers/infiniband/hw/cxgb4/qp.c | 13 +++++++----
+ drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 14 +++++++++++
+ 5 files changed, 55 insertions(+), 18 deletions(-)
+Merging mtd/master (28c015a9daab mtd: davinci-nand: disable subpage write for keystone-nand)
+$ git merge mtd/master
+Merge made by the 'recursive' strategy.
+ drivers/mtd/nand/davinci_nand.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging l2-mtd/master (35fc51956b53 mtd: nand: fix a typo in a comment line)
+$ git merge l2-mtd/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/fsl-quadspi.txt | 35 +
+ Documentation/mtd/spi-nor.txt | 62 +
+ drivers/mtd/Kconfig | 2 +
+ drivers/mtd/Makefile | 1 +
+ drivers/mtd/devices/Kconfig | 4 +-
+ drivers/mtd/devices/m25p80.c | 1303 ++------------------
+ drivers/mtd/devices/serial_flash_cmds.h | 44 +-
+ drivers/mtd/devices/st_spi_fsm.c | 338 +++--
+ drivers/mtd/mtd_blkdevs.c | 6 +
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 5 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 53 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 28 +-
+ drivers/mtd/nand/nand_base.c | 5 +-
+ drivers/mtd/nand/nand_ecc.c | 2 +-
+ drivers/mtd/nand/omap2.c | 2 +-
+ drivers/mtd/spi-nor/Kconfig | 17 +
+ drivers/mtd/spi-nor/Makefile | 2 +
+ drivers/mtd/spi-nor/fsl-quadspi.c | 1009 +++++++++++++++
+ drivers/mtd/spi-nor/spi-nor.c | 1107 +++++++++++++++++
+ drivers/mtd/tests/oobtest.c | 17 +-
+ include/linux/mtd/spi-nor.h | 214 ++++
+ 21 files changed, 2789 insertions(+), 1467 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/fsl-quadspi.txt
+ create mode 100644 Documentation/mtd/spi-nor.txt
+ create mode 100644 drivers/mtd/spi-nor/Kconfig
+ create mode 100644 drivers/mtd/spi-nor/Makefile
+ create mode 100644 drivers/mtd/spi-nor/fsl-quadspi.c
+ create mode 100644 drivers/mtd/spi-nor/spi-nor.c
+ create mode 100644 include/linux/mtd/spi-nor.h
+Merging crypto/master (9f84951fc6f3 crypto: atmel-aes - check alignment of cfb64 mode)
+$ git merge crypto/master
+Resolved 'drivers/char/hw_random/Kconfig' using previous resolution.
+CONFLICT (rename/delete): drivers/crypto/bfin_crc.h deleted in HEAD and renamed in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.h left in tree.
+Removing drivers/char/hw_random/picoxcell-rng.c
+Auto-merging drivers/char/hw_random/Kconfig
+CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bc24ba39c2e3] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/crypto/ghash-clmulni-intel_asm.S | 4 +-
+ arch/x86/crypto/ghash-clmulni-intel_glue.c | 12 +-
+ crypto/tcrypt.c | 21 +-
+ crypto/testmgr.h | 775 ++++++++++++++++++++++++++++-
+ drivers/char/hw_random/Kconfig | 103 ++--
+ drivers/char/hw_random/Makefile | 1 -
+ drivers/char/hw_random/picoxcell-rng.c | 181 -------
+ drivers/crypto/atmel-aes.c | 8 +-
+ drivers/crypto/bfin_crc.c | 103 ++--
+ drivers/crypto/bfin_crc.h | 125 +++++
+ drivers/crypto/caam/caamhash.c | 4 +-
+ drivers/crypto/ccp/ccp-pci.c | 7 +-
+ drivers/crypto/nx/nx-842.c | 4 +-
+ drivers/crypto/omap-des.c | 33 +-
+ 14 files changed, 1057 insertions(+), 324 deletions(-)
+ delete mode 100644 drivers/char/hw_random/picoxcell-rng.c
+ create mode 100644 drivers/crypto/bfin_crc.h
+Merging drm/drm-next (444c9a08bf78 Merge branch 'drm-init-cleanup' of git://people.freedesktop.org/~danvet/drm into drm-next)
+$ git merge drm/drm-next
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/drm.tmpl | 10 +-
+ drivers/gpu/drm/armada/armada_drv.c | 2 +-
+ drivers/gpu/drm/ast/ast_drv.c | 1 -
+ drivers/gpu/drm/ast/ast_main.c | 7 +-
+ drivers/gpu/drm/bochs/bochs_mm.c | 6 +-
+ drivers/gpu/drm/cirrus/cirrus_main.c | 6 +-
+ drivers/gpu/drm/drm_bufs.c | 32 +-
+ drivers/gpu/drm/drm_cache.c | 4 +-
+ drivers/gpu/drm/drm_info.c | 6 +-
+ drivers/gpu/drm/drm_ioctl.c | 13 +-
+ drivers/gpu/drm/drm_irq.c | 105 ++---
+ drivers/gpu/drm/drm_modes.c | 9 +-
+ drivers/gpu/drm/drm_pci.c | 93 ++---
+ drivers/gpu/drm/drm_platform.c | 25 --
+ drivers/gpu/drm/drm_probe_helper.c | 64 ++-
+ drivers/gpu/drm/drm_stub.c | 12 +-
+ drivers/gpu/drm/drm_usb.c | 14 -
+ drivers/gpu/drm/gma500/psb_drv.c | 2 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 6 +-
+ drivers/gpu/drm/i915/Kconfig | 2 +-
+ drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +-
+ drivers/gpu/drm/i915/dvo_ivch.c | 2 +-
+ drivers/gpu/drm/i915/dvo_ns2501.c | 24 +-
+ drivers/gpu/drm/i915/dvo_sil164.c | 2 +-
+ drivers/gpu/drm/i915/dvo_tfp410.c | 2 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 616 +++++++++++++++++++++++++----
+ drivers/gpu/drm/i915/i915_debugfs.c | 25 +-
+ drivers/gpu/drm/i915/i915_dma.c | 16 +-
+ drivers/gpu/drm/i915/i915_drv.c | 62 ++-
+ drivers/gpu/drm/i915/i915_drv.h | 265 +++----------
+ drivers/gpu/drm/i915/i915_gem.c | 12 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 18 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 6 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 73 +---
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 283 +++++++++++++
+ drivers/gpu/drm/i915/i915_gpu_error.c | 23 +-
+ drivers/gpu/drm/i915/i915_irq.c | 504 +++++++++++------------
+ drivers/gpu/drm/i915/i915_params.c | 8 +-
+ drivers/gpu/drm/i915/i915_reg.h | 116 +++++-
+ drivers/gpu/drm/i915/intel_bios.c | 242 +++++++++++-
+ drivers/gpu/drm/i915/intel_bios.h | 60 +++
+ drivers/gpu/drm/i915/intel_display.c | 283 ++++++-------
+ drivers/gpu/drm/i915/intel_dp.c | 197 ++++++++-
+ drivers/gpu/drm/i915/intel_drv.h | 35 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 125 ++++--
+ drivers/gpu/drm/i915/intel_dsi.h | 4 +-
+ drivers/gpu/drm/i915/intel_dsi_cmd.c | 4 +-
+ drivers/gpu/drm/i915/intel_dsi_cmd.h | 5 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 38 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 7 -
+ drivers/gpu/drm/i915/intel_panel.c | 8 +-
+ drivers/gpu/drm/i915/intel_pm.c | 219 ++++++----
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 21 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 4 -
+ drivers/gpu/drm/i915/intel_sdvo.c | 4 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 8 +
+ drivers/gpu/drm/i915/intel_uncore.c | 24 +-
+ drivers/gpu/drm/mga/mga_state.c | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_main.c | 6 +-
+ drivers/gpu/drm/msm/msm_drv.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_vga.c | 11 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_drv.c | 1 -
+ drivers/gpu/drm/qxl/qxl_irq.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 6 -
+ drivers/gpu/drm/r128/r128_state.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 11 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 1 -
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_state.c | 2 +-
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 +-
+ drivers/gpu/drm/tegra/bus.c | 11 -
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +-
+ drivers/gpu/drm/udl/udl_main.c | 1 +
+ drivers/gpu/drm/via/via_mm.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
+ include/drm/drmP.h | 35 +-
+ include/drm/drm_crtc_helper.h | 4 +
+ include/drm/drm_modes.h | 2 +-
+ include/uapi/drm/i915_drm.h | 1 +
+ 82 files changed, 2546 insertions(+), 1337 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_gtt.h
+Merging drm-panel/drm/panel/for-next (810e49d8978f drm/panel: add support for LG LD070WX3-SL01 panel)
+$ git merge drm-panel/drm/panel/for-next
+Merge made by the 'recursive' strategy.
+Merging drm-intel/for-linux-next (e5c03ca36281 drm/i915/sdvo: Remove ->mode_set callback)
+$ git merge drm-intel/for-linux-next
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_bios.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+Auto-merging Documentation/DocBook/drm.tmpl
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/drm.tmpl | 5 +
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 66 +--
+ drivers/gpu/drm/i915/i915_dma.c | 12 +-
+ drivers/gpu/drm/i915/i915_drv.c | 110 +++--
+ drivers/gpu/drm/i915/i915_drv.h | 19 +-
+ drivers/gpu/drm/i915/i915_gem.c | 181 +++++----
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 77 +++-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 17 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 18 +-
+ drivers/gpu/drm/i915/i915_irq.c | 173 ++++----
+ drivers/gpu/drm/i915/i915_reg.h | 14 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 4 +
+ drivers/gpu/drm/i915/i915_trace.h | 75 ++++
+ drivers/gpu/drm/i915/intel_bios.c | 76 +++-
+ drivers/gpu/drm/i915/intel_crt.c | 76 ++--
+ drivers/gpu/drm/i915/intel_display.c | 47 ++-
+ drivers/gpu/drm/i915/intel_dp.c | 9 +-
+ drivers/gpu/drm/i915/intel_drv.h | 5 +
+ drivers/gpu/drm/i915/intel_dvo.c | 4 +-
+ drivers/gpu/drm/i915/intel_pm.c | 290 +++++++++----
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 449 +++++++++++++--------
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 30 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 4 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 231 +++++++++--
+ drivers/gpu/drm/i915/intel_tv.c | 214 +++++-----
+ drivers/gpu/drm/i915/intel_uncore.c | 2 +-
+ include/drm/i915_pciids.h | 22 +-
+ lib/Kconfig | 14 +
+ lib/Kconfig.debug | 1 +
+ lib/Makefile | 3 +-
+ lib/interval_tree.c | 6 +
+ ...erval_tree_test_main.c => interval_tree_test.c} | 0
+ 33 files changed, 1493 insertions(+), 765 deletions(-)
+ rename lib/{interval_tree_test_main.c => interval_tree_test.c} (100%)
+Merging drm-tegra/drm/tegra/for-next (4b9701e02b3b drm/tegra: hdmi - Add Tegra124 support)
+$ git merge drm-tegra/drm/tegra/for-next
+Auto-merging drivers/gpu/drm/tegra/dc.c
+Merge made by the 'recursive' strategy.
+ .../bindings/gpu/nvidia,tegra20-host1x.txt | 2 +
+ drivers/gpu/drm/tegra/dc.c | 536 +++++++++++----------
+ drivers/gpu/drm/tegra/dc.h | 3 +-
+ drivers/gpu/drm/tegra/drm.c | 1 +
+ drivers/gpu/drm/tegra/drm.h | 54 +--
+ drivers/gpu/drm/tegra/dsi.c | 244 ++++++----
+ drivers/gpu/drm/tegra/dsi.h | 10 +
+ drivers/gpu/drm/tegra/hdmi.c | 196 ++++++--
+ drivers/gpu/drm/tegra/hdmi.h | 5 +
+ drivers/gpu/drm/tegra/rgb.c | 31 +-
+ drivers/gpu/drm/tegra/sor.c | 192 +++++++-
+ drivers/gpu/drm/tegra/sor.h | 4 +
+ 12 files changed, 807 insertions(+), 471 deletions(-)
+Merging sound/for-next (02fd1a76bfeb ALSA: fm801: introduce fm801_ac97_is_ready()/fm801_ac97_is_valid() helpers)
+$ git merge sound/for-next
+Auto-merging sound/pci/hda/patch_realtek.c
+Merge made by the 'recursive' strategy.
+ include/sound/atmel-ac97c.h | 2 -
+ sound/atmel/ac97c.c | 15 +-
+ sound/core/pcm_lib.c | 2 +-
+ sound/core/seq/seq_midi.c | 4 +-
+ sound/pci/fm801.c | 200 +++++++++---------
+ sound/pci/hda/patch_realtek.c | 91 +++++++++
+ sound/pci/lx6464es/lx_core.c | 46 ++---
+ sound/usb/Kconfig | 13 ++
+ sound/usb/Makefile | 2 +-
+ sound/usb/bcd2000/Makefile | 3 +
+ sound/usb/bcd2000/bcd2000.c | 461 ++++++++++++++++++++++++++++++++++++++++++
+ sound/usb/mixer.c | 2 +-
+ 12 files changed, 696 insertions(+), 145 deletions(-)
+ create mode 100644 sound/usb/bcd2000/Makefile
+ create mode 100644 sound/usb/bcd2000/bcd2000.c
+Merging sound-asoc/for-next (86f4c423e813 Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing sound/soc/sirf/sirf-audio-port.h
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/mc13xxx.txt | 3 +
+ Documentation/devicetree/bindings/sound/ak4104.txt | 3 +
+ .../devicetree/bindings/sound/fsl-sai.txt | 11 +-
+ .../devicetree/bindings/sound/max98095.txt | 16 +
+ .../devicetree/bindings/sound/nokia,rx51.txt | 27 +
+ Documentation/devicetree/bindings/sound/rt5640.txt | 13 +-
+ .../devicetree/bindings/sound/simple-card.txt | 88 +-
+ Documentation/devicetree/bindings/sound/snow.txt | 17 +
+ .../devicetree/bindings/sound/st,sta350.txt | 107 +
+ arch/mips/include/asm/mach-jz4740/dma.h | 2 -
+ arch/mips/jz4740/board-qi_lb60.c | 11 +
+ drivers/mfd/mc13xxx-core.c | 10 +-
+ include/sound/rt5640.h | 4 +
+ include/sound/rt5651.h | 21 +
+ include/sound/soc-dapm.h | 13 +-
+ include/sound/soc.h | 138 +-
+ include/sound/sta350.h | 52 +
+ include/trace/events/asoc.h | 92 -
+ sound/soc/atmel/Kconfig | 2 +-
+ sound/soc/codecs/88pm860x-codec.c | 20 +-
+ sound/soc/codecs/Kconfig | 15 +-
+ sound/soc/codecs/Makefile | 6 +
+ sound/soc/codecs/ab8500-codec.c | 12 +-
+ sound/soc/codecs/adau1373.c | 7 +-
+ sound/soc/codecs/adav80x.c | 12 +-
+ sound/soc/codecs/ak4104.c | 62 +-
+ sound/soc/codecs/ak4641.c | 4 +-
+ sound/soc/codecs/arizona.h | 4 +-
+ sound/soc/codecs/cq93vc.c | 10 +-
+ sound/soc/codecs/cs4270.c | 2 +-
+ sound/soc/codecs/cs4271.c | 4 +-
+ sound/soc/codecs/cs42l51-i2c.c | 59 +
+ sound/soc/codecs/cs42l51.c | 80 +-
+ sound/soc/codecs/cs42l51.h | 6 +
+ sound/soc/codecs/da7210.c | 4 +-
+ sound/soc/codecs/da7213.c | 4 +-
+ sound/soc/codecs/da732x.c | 4 +-
+ sound/soc/codecs/da9055.c | 2 +-
+ sound/soc/codecs/hdmi.c | 1 +
+ sound/soc/codecs/lm4857.c | 4 +-
+ sound/soc/codecs/max9768.c | 4 +-
+ sound/soc/codecs/max98088.c | 12 +-
+ sound/soc/codecs/max98090.c | 10 +-
+ sound/soc/codecs/max98095.c | 23 +-
+ sound/soc/codecs/mc13783.c | 36 +-
+ sound/soc/codecs/pcm1681.c | 4 +-
+ sound/soc/codecs/pcm512x.c | 4 +-
+ sound/soc/codecs/rt5631.c | 4 +-
+ sound/soc/codecs/rt5640.c | 420 ++--
+ sound/soc/codecs/rt5640.h | 10 +-
+ sound/soc/codecs/rt5651.c | 1898 ++++++++++++++++++
+ sound/soc/codecs/rt5651.h | 2081 ++++++++++++++++++++
+ sound/soc/codecs/sgtl5000.c | 15 +-
+ sound/soc/codecs/si476x.c | 14 +-
+ sound/soc/codecs/sirf-audio-codec.c | 74 +-
+ sound/soc/codecs/sirf-audio-codec.h | 50 +
+ sound/soc/codecs/sta32x.c | 4 +-
+ sound/soc/codecs/sta350.c | 1266 ++++++++++++
+ sound/soc/codecs/sta350.h | 228 +++
+ sound/soc/codecs/tas5086.c | 4 +-
+ sound/soc/codecs/tlv320aic23-i2c.c | 1 +
+ sound/soc/codecs/tlv320aic23.c | 4 +-
+ sound/soc/codecs/tlv320aic31xx.c | 3 +-
+ sound/soc/codecs/tlv320dac33.c | 12 +-
+ sound/soc/codecs/tpa6130a2.c | 1 +
+ sound/soc/codecs/twl4030.c | 10 +-
+ sound/soc/codecs/twl6040.c | 8 +-
+ sound/soc/codecs/wl1273.c | 12 +-
+ sound/soc/codecs/wm2000.c | 8 +-
+ sound/soc/codecs/wm2200.c | 4 +-
+ sound/soc/codecs/wm5100.c | 4 +-
+ sound/soc/codecs/wm5102.c | 26 +-
+ sound/soc/codecs/wm5110.c | 35 +-
+ sound/soc/codecs/wm8350.c | 14 +-
+ sound/soc/codecs/wm8400.c | 12 +-
+ sound/soc/codecs/wm8580.c | 2 +-
+ sound/soc/codecs/wm8731.c | 11 +-
+ sound/soc/codecs/wm8753.c | 4 +-
+ sound/soc/codecs/wm8804.c | 11 +-
+ sound/soc/codecs/wm8903.c | 4 +-
+ sound/soc/codecs/wm8904.c | 14 +-
+ sound/soc/codecs/wm8955.c | 13 +-
+ sound/soc/codecs/wm8958-dsp2.c | 32 +-
+ sound/soc/codecs/wm8960.c | 4 +-
+ sound/soc/codecs/wm8962.c | 8 +-
+ sound/soc/codecs/wm8983.c | 4 +-
+ sound/soc/codecs/wm8985.c | 11 +-
+ sound/soc/codecs/wm8988.c | 8 +-
+ sound/soc/codecs/wm8990.c | 2 +-
+ sound/soc/codecs/wm8991.c | 2 +-
+ sound/soc/codecs/wm8994.c | 32 +-
+ sound/soc/codecs/wm8995.c | 10 +-
+ sound/soc/codecs/wm8996.c | 4 +-
+ sound/soc/codecs/wm8997.c | 25 +-
+ sound/soc/codecs/wm9081.c | 4 +-
+ sound/soc/codecs/wm_adsp.c | 6 +-
+ sound/soc/codecs/wm_hubs.c | 2 +-
+ sound/soc/davinci/Kconfig | 10 +-
+ sound/soc/davinci/davinci-i2s.c | 1 -
+ sound/soc/davinci/davinci-mcasp.c | 260 ++-
+ sound/soc/davinci/davinci-mcasp.h | 1 +
+ sound/soc/davinci/davinci-pcm.c | 8 +-
+ sound/soc/davinci/davinci-pcm.h | 8 +-
+ sound/soc/davinci/davinci-vcif.c | 1 -
+ sound/soc/fsl/Kconfig | 71 +-
+ sound/soc/fsl/fsl_esai.c | 9 +-
+ sound/soc/fsl/fsl_sai.c | 255 +--
+ sound/soc/fsl/fsl_sai.h | 16 +
+ sound/soc/fsl/fsl_spdif.c | 41 +-
+ sound/soc/fsl/fsl_ssi.c | 150 +-
+ sound/soc/fsl/imx-audmux.c | 2 +-
+ sound/soc/fsl/imx-pcm-dma.c | 1 -
+ sound/soc/generic/simple-card.c | 250 ++-
+ sound/soc/intel/sst-baytrail-ipc.c | 8 +
+ sound/soc/intel/sst-firmware.c | 4 +-
+ sound/soc/intel/sst-haswell-ipc.c | 9 +
+ sound/soc/intel/sst-haswell-pcm.c | 8 +-
+ sound/soc/jz4740/Kconfig | 11 +-
+ sound/soc/jz4740/jz4740-i2s.c | 5 +-
+ sound/soc/jz4740/qi_lb60.c | 84 +-
+ sound/soc/nuc900/Kconfig | 1 +
+ sound/soc/nuc900/nuc900-ac97.c | 1 +
+ sound/soc/omap/Kconfig | 2 +-
+ sound/soc/omap/am3517evm.c | 2 +-
+ sound/soc/omap/ams-delta.c | 66 +-
+ sound/soc/omap/n810.c | 2 +-
+ sound/soc/omap/omap-abe-twl6040.c | 8 +-
+ sound/soc/omap/omap-dmic.c | 9 +-
+ sound/soc/omap/omap-hdmi-card.c | 2 +-
+ sound/soc/omap/omap-hdmi.c | 6 +-
+ sound/soc/omap/omap-mcbsp.c | 25 +-
+ sound/soc/omap/omap-mcbsp.h | 2 +-
+ sound/soc/omap/omap-mcpdm.c | 16 +-
+ sound/soc/omap/omap-pcm.c | 25 +-
+ sound/soc/omap/omap-pcm.h | 30 +
+ sound/soc/omap/omap-twl4030.c | 10 +-
+ sound/soc/omap/omap3pandora.c | 35 +-
+ sound/soc/omap/osk5912.c | 2 +-
+ sound/soc/omap/rx51.c | 275 ++-
+ sound/soc/pxa/Kconfig | 2 +-
+ sound/soc/samsung/Kconfig | 12 +
+ sound/soc/samsung/Makefile | 2 +
+ sound/soc/samsung/i2s.c | 4 +-
+ sound/soc/samsung/idma.c | 2 +-
+ sound/soc/samsung/snow.c | 122 ++
+ sound/soc/sh/rcar/core.c | 5 +-
+ sound/soc/sirf/sirf-audio-port.c | 107 -
+ sound/soc/sirf/sirf-audio-port.h | 62 -
+ sound/soc/soc-cache.c | 2 -
+ sound/soc/soc-core.c | 975 ++++-----
+ sound/soc/soc-dapm.c | 142 +-
+ sound/soc/soc-devres.c | 35 +
+ sound/soc/soc-io.c | 296 ++-
+ sound/soc/soc-pcm.c | 19 +-
+ 154 files changed, 8735 insertions(+), 2264 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/max98095.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nokia,rx51.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/snow.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/st,sta350.txt
+ create mode 100644 include/sound/rt5651.h
+ create mode 100644 include/sound/sta350.h
+ create mode 100644 sound/soc/codecs/cs42l51-i2c.c
+ create mode 100644 sound/soc/codecs/rt5651.c
+ create mode 100644 sound/soc/codecs/rt5651.h
+ create mode 100644 sound/soc/codecs/sta350.c
+ create mode 100644 sound/soc/codecs/sta350.h
+ create mode 100644 sound/soc/omap/omap-pcm.h
+ create mode 100644 sound/soc/samsung/snow.c
+ delete mode 100644 sound/soc/sirf/sirf-audio-port.h
+Merging modules/modules-next (51e158c12aca param: hand arguments after -- straight to init)
+$ git merge modules/modules-next
+Auto-merging kernel/module.c
+Merge made by the 'recursive' strategy.
+ include/linux/moduleparam.h | 2 +-
+ init/main.c | 33 +++++++++++++++++++++++++++++----
+ kernel/module.c | 12 +++++++++---
+ kernel/params.c | 25 ++++++++++++++-----------
+ scripts/mod/modpost.c | 2 ++
+ 5 files changed, 55 insertions(+), 19 deletions(-)
+Merging virtio/virtio-next (e75279c4fb85 virtio_ccw: introduce device_lost in virtio_ccw_device)
+$ git merge virtio/virtio-next
+Merge made by the 'recursive' strategy.
+ drivers/s390/kvm/virtio_ccw.c | 49 ++++++++++++++++++++++++++++++++-----------
+ drivers/virtio/virtio_ring.c | 15 +++++++++++++
+ include/linux/virtio.h | 2 ++
+ 3 files changed, 54 insertions(+), 12 deletions(-)
+Merging input/next (0aa21e226149 Input: gpio-beeper - simplify GPIO handling)
+$ git merge input/next
+Auto-merging drivers/input/touchscreen/ads7846.c
+Auto-merging drivers/input/tablet/wacom_wac.c
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging drivers/input/evdev.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/st-keyscan.txt | 60 +++++
+ drivers/input/evdev.c | 18 --
+ drivers/input/keyboard/Kconfig | 11 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/gpio_keys.c | 74 ++----
+ drivers/input/keyboard/st-keyscan.c | 274 +++++++++++++++++++++
+ drivers/input/keyboard/tc3589x-keypad.c | 66 ++++-
+ drivers/input/misc/Kconfig | 2 +-
+ drivers/input/misc/gpio-beeper.c | 29 ++-
+ drivers/input/misc/twl6040-vibra.c | 83 +++----
+ drivers/input/tablet/wacom_wac.c | 88 +++++--
+ drivers/input/tablet/wacom_wac.h | 4 +-
+ drivers/input/touchscreen/Kconfig | 2 +-
+ drivers/input/touchscreen/ad7877.c | 5 -
+ drivers/input/touchscreen/ads7846.c | 2 +-
+ drivers/input/touchscreen/tsc2005.c | 41 ++-
+ include/linux/gpio_keys.h | 48 +++-
+ 17 files changed, 611 insertions(+), 197 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/st-keyscan.txt
+ create mode 100644 drivers/input/keyboard/st-keyscan.c
+Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging block/for-next (2041a6e1eea7 Merge branch 'for-3.16/drivers' into for-next)
+$ git merge block/for-next
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/mtd/mtd_blkdevs.c
+Removing drivers/block/drbd/drbd_wrappers.h
+Merge made by the 'recursive' strategy.
+ block/blk-core.c | 45 +--
+ block/blk-flush.c | 26 +-
+ block/blk-map.c | 3 -
+ block/blk-mq-cpumap.c | 6 +-
+ block/blk-mq-sysfs.c | 50 +---
+ block/blk-mq-tag.c | 18 +-
+ block/blk-mq-tag.h | 21 +-
+ block/blk-mq.c | 574 +++++++++++++++++++++++--------------
+ block/blk-mq.h | 11 +-
+ block/blk-throttle.c | 2 +-
+ block/blk-timeout.c | 47 +--
+ block/blk.h | 3 +-
+ block/bsg.c | 2 +-
+ block/cfq-iosched.c | 2 +-
+ drivers/block/amiflop.c | 2 +-
+ drivers/block/ataflop.c | 2 +-
+ drivers/block/cciss.c | 6 +-
+ drivers/block/drbd/drbd_actlog.c | 23 +-
+ drivers/block/drbd/drbd_int.h | 92 +++++-
+ drivers/block/drbd/drbd_main.c | 28 +-
+ drivers/block/drbd/drbd_nl.c | 485 +++++++++++++++++++------------
+ drivers/block/drbd/drbd_nla.c | 1 -
+ drivers/block/drbd/drbd_proc.c | 2 +-
+ drivers/block/drbd/drbd_protocol.h | 12 +
+ drivers/block/drbd/drbd_receiver.c | 196 +++++++++----
+ drivers/block/drbd/drbd_req.c | 74 ++++-
+ drivers/block/drbd/drbd_req.h | 6 +-
+ drivers/block/drbd/drbd_state.c | 38 +--
+ drivers/block/drbd/drbd_worker.c | 107 +++----
+ drivers/block/drbd/drbd_wrappers.h | 54 ----
+ drivers/block/floppy.c | 18 +-
+ drivers/block/hd.c | 10 +-
+ drivers/block/mg_disk.c | 12 +-
+ drivers/block/mtip32xx/mtip32xx.c | 123 +++++---
+ drivers/block/null_blk.c | 98 ++++---
+ drivers/block/paride/pcd.c | 2 +-
+ drivers/block/paride/pd.c | 4 +-
+ drivers/block/paride/pf.c | 4 +-
+ drivers/block/skd_main.c | 12 +-
+ drivers/block/swim.c | 2 +-
+ drivers/block/swim3.c | 6 +-
+ drivers/block/virtio_blk.c | 73 +++--
+ drivers/block/xen-blkfront.c | 4 +-
+ drivers/block/xsysace.c | 4 +-
+ drivers/block/z2ram.c | 6 +-
+ drivers/cdrom/gdrom.c | 2 +-
+ drivers/char/random.c | 1 +
+ drivers/ide/ide-disk.c | 5 +-
+ drivers/md/dm.c | 1 -
+ drivers/mtd/mtd_blkdevs.c | 3 +-
+ drivers/mtd/ubi/block.c | 2 +-
+ drivers/sbus/char/jsflash.c | 2 +-
+ drivers/scsi/scsi_lib.c | 5 +-
+ drivers/scsi/sd.c | 13 +-
+ fs/bio-integrity.c | 2 +-
+ fs/bio.c | 11 +-
+ include/linux/bio.h | 2 +-
+ include/linux/blk-mq.h | 60 ++--
+ include/linux/blkdev.h | 21 +-
+ 59 files changed, 1447 insertions(+), 999 deletions(-)
+ delete mode 100644 drivers/block/drbd/drbd_wrappers.h
+Merging device-mapper/for-next (131cd131a9ff dm cache: fix writethrough mode quiescing in cache_map)
+$ git merge device-mapper/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-cache-target.c | 1 +
+ drivers/md/dm-thin.c | 77 ++++++++++++++++++++++++++++++++++++++++----
+ drivers/md/dm-verity.c | 15 +++++----
+ 3 files changed, 81 insertions(+), 12 deletions(-)
+Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (865042c01637 mmc: Add realtek USB sdmmc host driver)
+$ git merge mmc/mmc-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 5 -
+ drivers/mmc/core/core.c | 9 +
+ drivers/mmc/core/debugfs.c | 3 +
+ drivers/mmc/core/mmc.c | 14 +-
+ drivers/mmc/core/sd.c | 12 +-
+ drivers/mmc/core/sdio.c | 45 +-
+ drivers/mmc/core/sdio_bus.c | 14 +-
+ drivers/mmc/core/slot-gpio.c | 4 +-
+ drivers/mmc/host/Kconfig | 7 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/dw_mmc-exynos.c | 7 +-
+ drivers/mmc/host/dw_mmc.c | 178 +--
+ drivers/mmc/host/dw_mmc.h | 2 -
+ drivers/mmc/host/mmci.c | 6 +-
+ drivers/mmc/host/mxcmmc.c | 114 +-
+ drivers/mmc/host/omap_hsmmc.c | 4 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 124 +-
+ drivers/mmc/host/rtsx_usb_sdmmc.c | 1455 ++++++++++++++++++++
+ drivers/mmc/host/sdhci-s3c.c | 3 -
+ drivers/mmc/host/sdhci.c | 4 +-
+ drivers/mmc/host/sh_mmcif.c | 9 +-
+ include/linux/mmc/card.h | 2 +-
+ include/linux/mmc/dw_mmc.h | 14 -
+ include/linux/mmc/host.h | 5 +-
+ 24 files changed, 1642 insertions(+), 399 deletions(-)
+ create mode 100644 drivers/mmc/host/rtsx_usb_sdmmc.c
+Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+Merging slab/for-next (34bf6ef94a83 mm: slab/slub: use page->list consistently instead of page->lru)
+$ git merge slab/for-next
+Already up-to-date.
+Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (e2f23b606b94 md: avoid oops on unload if some process is in poll or select.)
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
+$ git merge mfd/master
+Already up-to-date.
+Merging mfd-lj/for-mfd-next (06ed83a1566a mfd: sec-core: Remove duplicated device type from sec_pmic_dev)
+$ git merge mfd-lj/for-mfd-next
+Auto-merging drivers/mfd/mc13xxx-core.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regulator/tps65090.txt | 4 +
+ arch/arm/mach-omap2/omap_twl.c | 60 ---
+ drivers/extcon/Kconfig | 4 +-
+ drivers/extcon/extcon-max14577.c | 174 ++++++--
+ drivers/mfd/Kconfig | 16 +-
+ drivers/mfd/Makefile | 1 +
+ drivers/mfd/arizona-core.c | 41 +-
+ drivers/mfd/bcm590xx.c | 9 +-
+ drivers/mfd/cros_ec.c | 3 +
+ drivers/mfd/ipaq-micro.c | 482 +++++++++++++++++++++
+ drivers/mfd/kempld-core.c | 127 +++++-
+ drivers/mfd/lpc_ich.c | 1 +
+ drivers/mfd/max14577.c | 315 ++++++++++++--
+ drivers/mfd/mc13xxx-core.c | 4 +-
+ drivers/mfd/rtsx_usb.c | 14 +-
+ drivers/mfd/sec-core.c | 58 +--
+ drivers/mfd/sec-irq.c | 2 +-
+ drivers/mfd/tps65090.c | 41 +-
+ drivers/mfd/twl-core.c | 15 +
+ drivers/mfd/wm5110-tables.c | 2 +
+ drivers/power/tps65090-charger.c | 11 -
+ drivers/regulator/Kconfig | 7 +-
+ drivers/regulator/arizona-ldo1.c | 57 +++
+ drivers/regulator/arizona-micsupp.c | 37 ++
+ drivers/regulator/max14577.c | 277 ++++++++++--
+ drivers/regulator/tps65090-regulator.c | 56 +++
+ drivers/rtc/rtc-s5m.c | 75 +++-
+ include/linux/mfd/arizona/core.h | 3 +
+ include/linux/mfd/ipaq-micro.h | 148 +++++++
+ include/linux/mfd/kempld.h | 4 +
+ include/linux/mfd/max14577-private.h | 222 +++++++---
+ include/linux/mfd/max14577.h | 19 +-
+ include/linux/mfd/mc13xxx.h | 22 +-
+ include/linux/mfd/samsung/core.h | 6 +-
+ include/linux/mfd/tps65090.h | 19 +
+ include/linux/mfd/tps65218.h | 1 -
+ 36 files changed, 1941 insertions(+), 396 deletions(-)
+ create mode 100644 drivers/mfd/ipaq-micro.c
+ create mode 100644 include/linux/mfd/ipaq-micro.h
+Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
+$ git merge battery/master
+Already up-to-date.
+Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
+$ git merge fbdev/for-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (a798c10faf62 Linux 3.15-rc2)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (01bd9b79cbec Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/axp20', 'regulator/topic/of', 'regulator/topic/pbias', 'regulator/topic/s2mps11', 'regulator/topic/s5m8767', 'regulator/topic/tps65090' and 'regulator/topic/tps65217' into regulator-next)
+$ git merge regulator/for-next
+Recorded preimage for 'drivers/regulator/tps65090-regulator.c'
+Auto-merging drivers/regulator/tps65090-regulator.c
+CONFLICT (content): Merge conflict in drivers/regulator/tps65090-regulator.c
+Auto-merging drivers/regulator/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/regulator/tps65090-regulator.c'.
+[master a5d820150fc4] Merge remote-tracking branch 'regulator/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/mfd/s2mps11.txt | 14 ++
+ drivers/regulator/Kconfig | 7 +
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/axp20x-regulator.c | 285 ++++++++++++++++++++++
+ drivers/regulator/core.c | 3 +-
+ drivers/regulator/of_regulator.c | 31 ++-
+ drivers/regulator/pbias-regulator.c | 25 +-
+ drivers/regulator/s2mps11.c | 98 +++++++-
+ drivers/regulator/s5m8767.c | 37 +--
+ drivers/regulator/tps65090-regulator.c | 162 ++++++++++--
+ drivers/regulator/tps65217-regulator.c | 4 +-
+ include/linux/mfd/samsung/s2mps14.h | 2 +
+ include/linux/mfd/tps65217.h | 1 -
+ 13 files changed, 587 insertions(+), 83 deletions(-)
+ create mode 100644 drivers/regulator/axp20x-regulator.c
+Merging security/next (fab71a90edda security: Convert use of typedef ctl_table to struct ctl_table)
+$ git merge security/next
+Auto-merging security/selinux/hooks.c
+Auto-merging security/security.c
+Auto-merging include/linux/security.h
+Merge made by the 'recursive' strategy.
+ include/linux/key.h | 11 +++++++++++
+ include/linux/security.h | 6 +++---
+ security/capability.c | 2 +-
+ security/keys/internal.h | 11 +----------
+ security/keys/key.c | 6 +++---
+ security/keys/keyctl.c | 44 ++++++++++++++++++++++----------------------
+ security/keys/keyring.c | 8 ++++----
+ security/keys/permission.c | 4 ++--
+ security/keys/persistent.c | 4 ++--
+ security/keys/proc.c | 2 +-
+ security/keys/sysctl.c | 2 +-
+ security/security.c | 2 +-
+ security/selinux/hooks.c | 2 +-
+ security/smack/smack_lsm.c | 9 +++++++--
+ 14 files changed, 60 insertions(+), 53 deletions(-)
+Merging selinux/next (6d32c850621b Merge tag 'v3.14' into next)
+$ git merge selinux/next
+Merge made by the 'recursive' strategy.
+Merging lblnet/next (d8ec26d7f828 Linux 3.13)
+$ git merge lblnet/next
+Already up-to-date.
+Merging watchdog/master (4a4d559006e7 watchdog: via_wdt: replace del_timer by del_timer_sync)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/Kconfig | 2 +-
+ drivers/watchdog/via_wdt.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging iommu/next (57c343bad18f Merge branches 'iommu/fixes' and 'arm/omap' into next)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ drivers/iommu/omap-iommu.c | 31 ++++++++++++-------------------
+ drivers/iommu/omap-iopgtable.h | 3 ---
+ 2 files changed, 12 insertions(+), 22 deletions(-)
+Merging dwmw2-iommu/master (5ae0566a0fff iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (4379d2ae1528 vfio: always select ANON_INODES)
+$ git merge vfio/next
+Already up-to-date.
+Merging osd/linux-next (f1f6630b53e7 MAINTAINERS: Update email address for bhalevy)
+$ git merge osd/linux-next
+Already up-to-date.
+Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (c800bcd5f53f sparse: fix comment)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/master (35d0c383e526 sparc: implement is_32bit_task)
+$ git merge audit/master
+Resolved 'arch/mips/include/asm/syscall.h' using previous resolution.
+Resolved 'arch/mips/kernel/ptrace.c' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'kernel/audit.c' using previous resolution.
+Auto-merging kernel/audit.c
+CONFLICT (content): Merge conflict in kernel/audit.c
+Auto-merging include/uapi/linux/audit.h
+Auto-merging arch/x86/kernel/ptrace.c
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/um/kernel/ptrace.c
+Auto-merging arch/s390/kernel/ptrace.c
+Auto-merging arch/mips/kernel/ptrace.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
+Auto-merging arch/mips/include/asm/syscall.h
+CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fd14a2db3883] Merge remote-tracking branch 'audit/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/include/asm/syscall.h | 11 +++++++++++
+ arch/alpha/kernel/ptrace.c | 2 +-
+ arch/arm/kernel/ptrace.c | 4 ++--
+ arch/ia64/include/asm/syscall.h | 6 ++++++
+ arch/ia64/kernel/ptrace.c | 2 +-
+ arch/microblaze/include/asm/syscall.h | 5 +++++
+ arch/microblaze/kernel/ptrace.c | 3 +--
+ arch/mips/include/asm/syscall.h | 2 +-
+ arch/mips/kernel/ptrace.c | 4 +---
+ arch/openrisc/include/asm/syscall.h | 5 +++++
+ arch/openrisc/kernel/ptrace.c | 3 +--
+ arch/parisc/include/asm/syscall.h | 11 +++++++++++
+ arch/parisc/kernel/ptrace.c | 9 +++------
+ arch/powerpc/include/asm/syscall.h | 6 ++++++
+ arch/powerpc/kernel/ptrace.c | 7 ++-----
+ arch/s390/kernel/ptrace.c | 4 +---
+ arch/sh/include/asm/syscall_32.h | 10 ++++++++++
+ arch/sh/include/asm/syscall_64.h | 14 ++++++++++++++
+ arch/sh/kernel/ptrace_32.c | 14 +-------------
+ arch/sh/kernel/ptrace_64.c | 17 +----------------
+ arch/sparc/include/asm/syscall.h | 7 +++++++
+ arch/sparc/include/asm/thread_info_32.h | 2 ++
+ arch/sparc/include/asm/thread_info_64.h | 2 ++
+ arch/sparc/kernel/ptrace_64.c | 9 ++-------
+ arch/um/kernel/ptrace.c | 3 +--
+ arch/x86/kernel/ptrace.c | 8 ++------
+ arch/x86/um/asm/ptrace.h | 4 ----
+ arch/x86/um/asm/syscall.h | 15 +++++++++++++++
+ arch/xtensa/kernel/ptrace.c | 2 +-
+ include/asm-generic/syscall.h | 2 +-
+ include/linux/audit.h | 8 +++++---
+ include/uapi/linux/audit.h | 14 +-------------
+ kernel/auditsc.c | 11 +++++------
+ 33 files changed, 128 insertions(+), 98 deletions(-)
+ create mode 100644 arch/alpha/include/asm/syscall.h
+ create mode 100644 arch/x86/um/asm/syscall.h
+Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Already up-to-date.
+Merging devicetree/devicetree/next (d88cf7d7b424 Merge remote-tracking branch 'robh/for-next' into devicetree/next)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (c3fc952d2fbe of: push struct boot_param_header and defines into powerpc)
+$ git merge dt-rh/for-next
+Auto-merging arch/xtensa/kernel/setup.c
+Auto-merging arch/powerpc/platforms/pseries/setup.c
+Auto-merging arch/powerpc/platforms/powernv/opal.c
+Auto-merging arch/powerpc/mm/hash_utils_64.c
+Auto-merging arch/powerpc/kernel/fadump.c
+Merge made by the 'recursive' strategy.
+ arch/arc/include/asm/sections.h | 1 -
+ arch/arc/kernel/devtree.c | 2 +-
+ arch/arm/include/asm/prom.h | 2 -
+ arch/arm/kernel/devtree.c | 34 +--
+ arch/arm/mach-exynos/exynos.c | 2 +-
+ arch/arm/mach-vexpress/platsmp.c | 2 +-
+ arch/arm/mm/init.c | 1 -
+ arch/arm/plat-samsung/s5p-dev-mfc.c | 4 +-
+ arch/arm64/mm/init.c | 21 --
+ arch/c6x/kernel/setup.c | 4 +-
+ arch/metag/kernel/setup.c | 4 -
+ arch/microblaze/kernel/prom.c | 39 +--
+ arch/mips/cavium-octeon/setup.c | 20 +-
+ arch/mips/include/asm/mips-boards/generic.h | 4 -
+ arch/mips/include/asm/prom.h | 6 +-
+ arch/mips/kernel/prom.c | 2 +-
+ arch/mips/lantiq/prom.c | 15 +-
+ arch/mips/lantiq/prom.h | 2 -
+ arch/mips/mti-sead3/sead3-setup.c | 8 +-
+ arch/mips/netlogic/xlp/dt.c | 19 +-
+ arch/mips/ralink/of.c | 29 +-
+ arch/openrisc/kernel/vmlinux.h | 2 -
+ arch/powerpc/include/asm/prom.h | 39 +++
+ arch/powerpc/kernel/Makefile | 1 +
+ arch/powerpc/kernel/epapr_paravirt.c | 2 +-
+ arch/powerpc/kernel/fadump.c | 4 +-
+ arch/powerpc/kernel/prom.c | 82 ++----
+ arch/powerpc/kernel/rtas.c | 2 +-
+ arch/powerpc/mm/hash_utils_64.c | 22 +-
+ arch/powerpc/platforms/52xx/efika.c | 4 +-
+ arch/powerpc/platforms/chrp/setup.c | 4 +-
+ arch/powerpc/platforms/powernv/opal.c | 12 +-
+ arch/powerpc/platforms/pseries/setup.c | 4 +-
+ arch/x86/kernel/devicetree.c | 12 +-
+ arch/xtensa/kernel/setup.c | 3 +-
+ drivers/of/Kconfig | 1 +
+ drivers/of/Makefile | 2 +
+ drivers/of/fdt.c | 398 ++++++++++------------------
+ drivers/of/of_reserved_mem.c | 4 +-
+ include/linux/of_fdt.h | 63 +----
+ 40 files changed, 282 insertions(+), 600 deletions(-)
+Merging spi/for-next (889393d7a047 Merge remote-tracking branches 'spi/topic/oom', 'spi/topic/pxa2xx', 'spi/topic/sirf' and 'spi/topic/workqueue' into spi-next)
+$ git merge spi/for-next
+Auto-merging include/linux/spi/adi_spi3.h
+Auto-merging drivers/spi/spi-adi-v3.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/fsl-spi.txt | 6 +
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 2 +
+ .../devicetree/bindings/spi/spi-cadence.txt | 31 +
+ Documentation/devicetree/bindings/spi/spi-dw.txt | 24 +
+ arch/blackfin/mach-bf609/boards/ezkit.c | 22 +-
+ arch/blackfin/mach-bf609/clock.c | 7 +
+ drivers/spi/Kconfig | 11 +-
+ drivers/spi/Makefile | 3 +-
+ drivers/spi/{spi-bfin-v3.c => spi-adi-v3.c} | 433 ++++++-------
+ drivers/spi/spi-ath79.c | 1 -
+ drivers/spi/spi-atmel.c | 4 +-
+ drivers/spi/spi-bcm63xx-hsspi.c | 1 -
+ drivers/spi/spi-bcm63xx.c | 1 -
+ drivers/spi/spi-cadence.c | 673 +++++++++++++++++++++
+ drivers/spi/spi-dw-mmio.c | 22 +
+ drivers/spi/spi-dw.c | 197 +-----
+ drivers/spi/spi-dw.h | 24 +-
+ drivers/spi/spi-falcon.c | 1 -
+ drivers/spi/spi-fsl-espi.c | 36 +-
+ drivers/spi/spi-fsl-lib.c | 6 -
+ drivers/spi/spi-fsl-lib.h | 1 -
+ drivers/spi/spi-fsl-spi.c | 2 +-
+ drivers/spi/spi-nuc900.c | 1 -
+ drivers/spi/spi-omap-uwire.c | 1 -
+ drivers/spi/spi-pl022.c | 13 +-
+ drivers/spi/spi-pxa2xx-pci.c | 76 ++-
+ drivers/spi/spi-pxa2xx.c | 11 +-
+ drivers/spi/spi-s3c24xx.c | 15 +-
+ drivers/spi/spi-s3c64xx.c | 6 +-
+ drivers/spi/spi-sh-msiof.c | 4 +-
+ drivers/spi/spi-sh-sci.c | 1 -
+ drivers/spi/spi-sirf.c | 248 ++++----
+ drivers/spi/spi-sun4i.c | 1 -
+ drivers/spi/spi-sun6i.c | 1 -
+ drivers/spi/spi-tle62x0.c | 4 +-
+ drivers/spi/spi-topcliff-pch.c | 5 +-
+ drivers/spi/spi.c | 4 +-
+ .../bfin_spi3.h => include/linux/spi/adi_spi3.h | 20 +-
+ 38 files changed, 1309 insertions(+), 610 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-cadence.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-dw.txt
+ rename drivers/spi/{spi-bfin-v3.c => spi-adi-v3.c} (60%)
+ create mode 100644 drivers/spi/spi-cadence.c
+ rename arch/blackfin/include/asm/bfin_spi3.h => include/linux/spi/adi_spi3.h (97%)
+Merging tip/auto-latest (c3d94576af33 Merge branch 'x86/uv')
+$ git merge tip/auto-latest
+Auto-merging net/ipv4/tcp_output.c
+Auto-merging net/ipv4/inetpeer.c
+Auto-merging net/core/dev.c
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging mm/filemap.c
+Auto-merging include/linux/netdevice.h
+Auto-merging fs/nfs/write.c
+Auto-merging fs/nfs/inode.c
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging drivers/net/wireless/ti/wlcore/main.c
+Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c
+Auto-merging drivers/net/ethernet/freescale/gianfar.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/drm_irq.c
+Auto-merging drivers/block/mtip32xx/mtip32xx.c
+Merge made by the 'recursive' strategy.
+ Documentation/atomic_ops.txt | 31 +-
+ Documentation/kprobes.txt | 16 +-
+ Documentation/memory-barriers.txt | 42 +-
+ arch/alpha/include/asm/atomic.h | 5 -
+ arch/alpha/include/asm/bitops.h | 3 -
+ arch/arc/include/asm/atomic.h | 5 -
+ arch/arc/include/asm/bitops.h | 5 +-
+ arch/arm/include/asm/atomic.h | 5 -
+ arch/arm/include/asm/barrier.h | 3 +
+ arch/arm/include/asm/bitops.h | 4 +-
+ arch/arm64/include/asm/atomic.h | 5 -
+ arch/arm64/include/asm/barrier.h | 3 +
+ arch/arm64/include/asm/bitops.h | 9 -
+ arch/avr32/include/asm/atomic.h | 5 -
+ arch/avr32/include/asm/bitops.h | 9 +-
+ arch/blackfin/include/asm/barrier.h | 3 +
+ arch/blackfin/include/asm/bitops.h | 14 +-
+ arch/c6x/include/asm/bitops.h | 8 +-
+ arch/cris/include/asm/atomic.h | 8 +-
+ arch/cris/include/asm/bitops.h | 9 +-
+ arch/frv/include/asm/atomic.h | 7 +-
+ arch/frv/include/asm/bitops.h | 6 -
+ arch/hexagon/include/asm/atomic.h | 6 +-
+ arch/hexagon/include/asm/bitops.h | 4 +-
+ arch/ia64/include/asm/atomic.h | 7 +-
+ arch/ia64/include/asm/barrier.h | 3 +
+ arch/ia64/include/asm/bitops.h | 9 +-
+ arch/ia64/include/uapi/asm/cmpxchg.h | 9 +
+ arch/m32r/include/asm/atomic.h | 7 +-
+ arch/m32r/include/asm/bitops.h | 6 +-
+ arch/m68k/include/asm/atomic.h | 8 +-
+ arch/m68k/include/asm/bitops.h | 7 +-
+ arch/metag/include/asm/atomic.h | 6 +-
+ arch/metag/include/asm/barrier.h | 3 +
+ arch/metag/include/asm/bitops.h | 6 -
+ arch/mips/include/asm/atomic.h | 9 -
+ arch/mips/include/asm/barrier.h | 3 +
+ arch/mips/include/asm/bitops.h | 11 +-
+ arch/mips/kernel/irq.c | 4 +-
+ arch/mn10300/include/asm/atomic.h | 7 +-
+ arch/mn10300/include/asm/bitops.h | 4 +-
+ arch/mn10300/mm/tlb-smp.c | 4 +-
+ arch/openrisc/include/asm/bitops.h | 9 +-
+ arch/parisc/include/asm/atomic.h | 6 +-
+ arch/parisc/include/asm/bitops.h | 4 +-
+ arch/powerpc/include/asm/atomic.h | 6 +-
+ arch/powerpc/include/asm/barrier.h | 3 +
+ arch/powerpc/include/asm/bitops.h | 6 +-
+ arch/powerpc/kernel/crash.c | 2 +-
+ arch/s390/include/asm/atomic.h | 5 -
+ arch/s390/include/asm/barrier.h | 5 +-
+ arch/score/include/asm/bitops.h | 7 +-
+ arch/sh/include/asm/atomic.h | 6 +-
+ arch/sh/include/asm/bitops.h | 7 +-
+ arch/sparc/include/asm/atomic_32.h | 7 +-
+ arch/sparc/include/asm/atomic_64.h | 7 +-
+ arch/sparc/include/asm/barrier_64.h | 3 +
+ arch/sparc/include/asm/bitops_32.h | 3 -
+ arch/sparc/include/asm/bitops_64.h | 4 +-
+ arch/tile/include/asm/atomic_32.h | 10 -
+ arch/tile/include/asm/atomic_64.h | 6 -
+ arch/tile/include/asm/barrier.h | 14 +
+ arch/tile/include/asm/bitops.h | 1 +
+ arch/tile/include/asm/bitops_32.h | 8 +-
+ arch/tile/include/asm/bitops_64.h | 4 -
+ arch/x86/Makefile | 4 +-
+ arch/x86/boot/compressed/eboot.c | 3 +-
+ arch/x86/boot/compressed/head_64.S | 2 +-
+ arch/x86/include/asm/asm.h | 7 +
+ arch/x86/include/asm/atomic.h | 7 +-
+ arch/x86/include/asm/barrier.h | 4 +
+ arch/x86/include/asm/bitops.h | 6 +-
+ arch/x86/include/asm/efi.h | 100 ++--
+ arch/x86/include/asm/fpu-internal.h | 10 +-
+ arch/x86/include/asm/hw_irq.h | 4 +-
+ arch/x86/include/asm/kprobes.h | 2 +
+ arch/x86/include/asm/sync_bitops.h | 2 +-
+ arch/x86/include/asm/traps.h | 2 +-
+ arch/x86/include/asm/uprobes.h | 16 +-
+ arch/x86/include/asm/uv/uv_hub.h | 12 +-
+ arch/x86/include/asm/uv/uv_mmrs.h | 42 +-
+ arch/x86/kernel/alternative.c | 3 +-
+ arch/x86/kernel/apic/hw_nmi.c | 5 +-
+ arch/x86/kernel/apic/io_apic.c | 28 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 26 +-
+ arch/x86/kernel/cpu/common.c | 4 +
+ arch/x86/kernel/cpu/mshyperv.c | 9 -
+ arch/x86/kernel/cpu/perf_event.c | 4 +-
+ arch/x86/kernel/cpu/perf_event_amd_ibs.c | 3 +-
+ arch/x86/kernel/dumpstack.c | 9 +-
+ arch/x86/kernel/entry_32.S | 33 --
+ arch/x86/kernel/entry_64.S | 20 -
+ arch/x86/kernel/hw_breakpoint.c | 5 +-
+ arch/x86/kernel/i8259.c | 20 +-
+ arch/x86/kernel/irq.c | 13 +-
+ arch/x86/kernel/kprobes/core.c | 128 ++---
+ arch/x86/kernel/kprobes/ftrace.c | 17 +-
+ arch/x86/kernel/kprobes/opt.c | 32 +-
+ arch/x86/kernel/kvm.c | 4 +-
+ arch/x86/kernel/nmi.c | 18 +-
+ arch/x86/kernel/paravirt.c | 6 +
+ arch/x86/kernel/traps.c | 35 +-
+ arch/x86/kernel/uprobes.c | 551 ++++++++++++++--------
+ arch/x86/lib/thunk_32.S | 3 +-
+ arch/x86/lib/thunk_64.S | 3 +
+ arch/x86/mm/fault.c | 29 +-
+ arch/x86/mm/pgtable.c | 21 +-
+ arch/x86/platform/efi/efi.c | 48 +-
+ arch/x86/platform/efi/efi_stub_64.S | 81 +---
+ arch/x86/platform/uv/bios_uv.c | 2 +-
+ arch/x86/realmode/rm/Makefile | 3 +-
+ arch/xtensa/include/asm/atomic.h | 7 +-
+ arch/xtensa/include/asm/barrier.h | 3 +
+ arch/xtensa/include/asm/bitops.h | 4 +-
+ block/blk-iopoll.c | 4 +-
+ crypto/chainiv.c | 2 +-
+ drivers/base/power/domain.c | 2 +-
+ drivers/block/loop.c | 2 +-
+ drivers/block/mtip32xx/mtip32xx.c | 4 +-
+ drivers/block/nbd.c | 2 +-
+ drivers/block/pktcdvd.c | 2 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 2 +-
+ drivers/cpuidle/coupled.c | 2 +-
+ drivers/firewire/ohci.c | 2 +-
+ drivers/firmware/efi/efi-stub-helper.c | 144 ++++--
+ drivers/firmware/efi/efivars.c | 192 ++++++--
+ drivers/firmware/efi/vars.c | 30 +-
+ drivers/gpu/drm/drm_irq.c | 10 +-
+ drivers/gpu/drm/i915/i915_irq.c | 2 +-
+ drivers/md/bcache/bcache.h | 2 +-
+ drivers/md/bcache/closure.h | 2 +-
+ drivers/md/dm-bufio.c | 8 +-
+ drivers/md/dm-snap.c | 4 +-
+ drivers/md/dm.c | 2 +-
+ drivers/md/raid5.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 6 +-
+ drivers/misc/sgi-gru/grufile.c | 11 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 18 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 26 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 8 +-
+ drivers/net/ethernet/broadcom/cnic.c | 8 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +-
+ drivers/net/ethernet/freescale/gianfar.c | 8 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 +-
+ drivers/net/wireless/ti/wlcore/main.c | 2 +-
+ drivers/pci/xen-pcifront.c | 4 +-
+ drivers/s390/crypto/ap_bus.c | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
+ drivers/scsi/fcoe/fcoe.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +-
+ drivers/scsi/isci/remote_device.c | 2 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
+ drivers/scsi/qla2xxx/qla_os.c | 2 +-
+ drivers/staging/android/binder.c | 2 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 2 +-
+ drivers/target/loopback/tcm_loop.c | 4 +-
+ drivers/target/target_core_alua.c | 26 +-
+ drivers/target/target_core_device.c | 6 +-
+ drivers/target/target_core_iblock.c | 2 +-
+ drivers/target/target_core_pr.c | 56 +--
+ drivers/target/target_core_transport.c | 16 +-
+ drivers/target/target_core_ua.c | 10 +-
+ drivers/tty/n_tty.c | 2 +-
+ drivers/tty/serial/mxs-auart.c | 4 +-
+ drivers/usb/gadget/tcm_usb_gadget.c | 4 +-
+ drivers/usb/serial/usb_wwan.c | 2 +-
+ drivers/vhost/scsi.c | 2 +-
+ drivers/w1/w1_family.c | 4 +-
+ drivers/xen/xen-pciback/pciback_ops.c | 4 +-
+ fs/btrfs/btrfs_inode.h | 2 +-
+ fs/btrfs/extent_io.c | 2 +-
+ fs/btrfs/inode.c | 6 +-
+ fs/btrfs/ioctl.c | 2 +-
+ fs/buffer.c | 2 +-
+ fs/ext4/resize.c | 2 +-
+ fs/gfs2/glock.c | 8 +-
+ fs/gfs2/glops.c | 2 +-
+ fs/gfs2/lock_dlm.c | 4 +-
+ fs/gfs2/recovery.c | 2 +-
+ fs/gfs2/sys.c | 4 +-
+ fs/jbd2/commit.c | 6 +-
+ fs/nfs/dir.c | 12 +-
+ fs/nfs/inode.c | 2 +-
+ fs/nfs/nfs4filelayoutdev.c | 4 +-
+ fs/nfs/nfs4state.c | 4 +-
+ fs/nfs/pagelist.c | 6 +-
+ fs/nfs/pnfs.c | 2 +-
+ fs/nfs/pnfs.h | 2 +-
+ fs/nfs/write.c | 4 +-
+ fs/ocfs2/cluster/heartbeat.c | 2 +-
+ fs/ubifs/lpt_commit.c | 4 +-
+ fs/ubifs/tnc_commit.c | 4 +-
+ include/asm-generic/atomic.h | 7 +-
+ include/asm-generic/barrier.h | 8 +
+ include/asm-generic/bitops.h | 9 +-
+ include/asm-generic/bitops/atomic.h | 2 +-
+ include/asm-generic/bitops/lock.h | 2 +-
+ include/asm-generic/vmlinux.lds.h | 9 +
+ include/linux/atomic.h | 36 ++
+ include/linux/bitops.h | 20 +
+ include/linux/buffer_head.h | 2 +-
+ include/linux/compiler-intel.h | 3 -
+ include/linux/compiler.h | 2 +
+ include/linux/efi.h | 12 +-
+ include/linux/genhd.h | 2 +-
+ include/linux/interrupt.h | 8 +-
+ include/linux/kprobes.h | 21 +-
+ include/linux/netdevice.h | 2 +-
+ include/linux/perf_event.h | 1 +
+ include/linux/sched.h | 6 +-
+ include/linux/smp.h | 11 +
+ include/linux/sunrpc/sched.h | 8 +-
+ include/linux/sunrpc/xprt.h | 8 +-
+ include/linux/thread_info.h | 14 -
+ include/linux/tick.h | 2 +
+ include/linux/tracehook.h | 2 +-
+ include/net/ip_vs.h | 4 +-
+ kernel/debug/debug_core.c | 4 +-
+ kernel/events/core.c | 15 +
+ kernel/events/uprobes.c | 31 +-
+ kernel/futex.c | 4 +-
+ kernel/hrtimer.c | 1 +
+ kernel/kmod.c | 2 +-
+ kernel/kprobes.c | 392 ++++++++-------
+ kernel/locking/lockdep_internals.h | 6 +-
+ kernel/locking/locktorture.c | 2 +-
+ kernel/notifier.c | 22 +-
+ kernel/rcu/tree.c | 22 +-
+ kernel/rcu/tree_plugin.h | 8 +-
+ kernel/sched/core.c | 30 +-
+ kernel/sched/cpupri.c | 6 +-
+ kernel/sched/fair.c | 12 +-
+ kernel/sched/rt.c | 119 ++++-
+ kernel/sched/sched.h | 16 +-
+ kernel/sched/wait.c | 2 +-
+ kernel/smp.c | 42 ++
+ kernel/time/tick-sched.c | 21 +
+ kernel/trace/trace_event_perf.c | 5 +-
+ kernel/trace/trace_kprobe.c | 71 +--
+ kernel/trace/trace_probe.c | 65 +--
+ kernel/trace/trace_probe.h | 15 +-
+ kernel/trace/trace_uprobe.c | 20 +-
+ kernel/workqueue.c | 6 +-
+ mm/backing-dev.c | 2 +-
+ mm/filemap.c | 4 +-
+ mm/huge_memory.c | 2 +-
+ net/atm/pppoatm.c | 2 +-
+ net/bluetooth/hci_event.c | 4 +-
+ net/core/dev.c | 8 +-
+ net/core/link_watch.c | 2 +-
+ net/ipv4/inetpeer.c | 2 +-
+ net/ipv4/tcp_output.c | 4 +-
+ net/netfilter/nf_conntrack_core.c | 2 +-
+ net/rds/ib_recv.c | 4 +-
+ net/rds/iw_recv.c | 4 +-
+ net/rds/send.c | 6 +-
+ net/rds/tcp_send.c | 2 +-
+ net/sunrpc/auth.c | 2 +-
+ net/sunrpc/auth_gss/auth_gss.c | 2 +-
+ net/sunrpc/backchannel_rqst.c | 4 +-
+ net/sunrpc/xprt.c | 4 +-
+ net/sunrpc/xprtsock.c | 16 +-
+ net/unix/af_unix.c | 2 +-
+ sound/pci/bt87x.c | 4 +-
+ tools/perf/Documentation/perf-diff.txt | 21 +-
+ tools/perf/Documentation/perf-report.txt | 24 +-
+ tools/perf/Documentation/perf-top.txt | 18 +-
+ tools/perf/builtin-annotate.c | 3 +-
+ tools/perf/builtin-diff.c | 43 +-
+ tools/perf/builtin-kmem.c | 86 +---
+ tools/perf/builtin-lock.c | 10 +-
+ tools/perf/builtin-mem.c | 15 +-
+ tools/perf/builtin-report.c | 155 ++----
+ tools/perf/builtin-sched.c | 10 +-
+ tools/perf/builtin-top.c | 8 +-
+ tools/perf/perf-completion.sh | 4 +-
+ tools/perf/ui/browsers/hists.c | 131 +++--
+ tools/perf/ui/gtk/hists.c | 11 +-
+ tools/perf/ui/hist.c | 8 +-
+ tools/perf/util/callchain.c | 78 +++
+ tools/perf/util/callchain.h | 1 +
+ tools/perf/util/config.c | 4 +
+ tools/perf/util/cpumap.c | 160 +++++++
+ tools/perf/util/cpumap.h | 35 ++
+ tools/perf/util/hist.c | 112 +++--
+ tools/perf/util/hist.h | 19 +-
+ tools/perf/util/pmu.c | 6 +-
+ tools/perf/util/symbol.h | 3 +-
+ 297 files changed, 2841 insertions(+), 2014 deletions(-)
+Merging clockevents/clockevents/next (09e15176ded1 clocksource: exynos_mct: silence a static checker warning)
+$ git merge clockevents/clockevents/next
+Already up-to-date.
+Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (c045ebdf6079 Merge branch 'edac-for-3.15' into for-next)
+$ git merge edac-amd/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ftrace/for-next (b1169cc69ba9 tracing: Remove mock up poll wait function)
+$ git merge ftrace/for-next
+Auto-merging kernel/trace/ftrace.c
+Auto-merging include/linux/ftrace.h
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/ftrace.c | 2 +-
+ include/linux/ftrace.h | 20 ++---
+ kernel/trace/ftrace.c | 169 +++++++++++------------------------
+ kernel/trace/trace.c | 105 ++++++++--------------
+ kernel/trace/trace.h | 41 +++++----
+ kernel/trace/trace_functions.c | 56 ++++--------
+ kernel/trace/trace_functions_graph.c | 1 -
+ kernel/trace/trace_irqsoff.c | 71 ++++++++-------
+ kernel/trace/trace_nop.c | 1 -
+ kernel/trace/trace_sched_wakeup.c | 70 ++++++++-------
+ kernel/trace/trace_selftest.c | 69 +++++++-------
+ kernel/trace/trace_stack.c | 8 +-
+ 12 files changed, 265 insertions(+), 348 deletions(-)
+Merging rcu/rcu/next (15af2a9fb5c3 rcu: Variable name changed in tree_plugin.h and used in tree.c)
+$ git merge rcu/rcu/next
+Auto-merging tools/testing/selftests/rcutorture/bin/parse-torture.sh
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/rcu/tree_plugin.h
+Auto-merging kernel/rcu/tree.c
+Auto-merging kernel/locking/locktorture.c
+Merge made by the 'recursive' strategy.
+ Documentation/RCU/00-INDEX | 2 +
+ Documentation/RCU/checklist.txt | 12 +-
+ Documentation/RCU/rcu_dereference.txt | 371 +++++++++++++++++++++
+ Documentation/RCU/stallwarn.txt | 2 +-
+ Documentation/RCU/whatisRCU.txt | 55 ++-
+ include/linux/percpu.h | 2 +-
+ include/linux/rcupdate.h | 60 +++-
+ include/linux/rcutiny.h | 4 +
+ include/linux/rcutree.h | 1 +
+ include/linux/torture.h | 8 +-
+ kernel/locking/locktorture.c | 10 +-
+ kernel/rcu/rcutorture.c | 216 +++++++++---
+ kernel/rcu/tiny_plugin.h | 8 +-
+ kernel/rcu/tree.c | 294 +++++++++++-----
+ kernel/rcu/tree.h | 11 +-
+ kernel/rcu/tree_plugin.h | 136 ++------
+ kernel/rcu/update.c | 18 +
+ kernel/sched/core.c | 7 +-
+ kernel/softirq.c | 4 +-
+ kernel/torture.c | 39 ++-
+ .../testing/selftests/rcutorture/bin/configinit.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/functions.sh | 45 ++-
+ .../testing/selftests/rcutorture/bin/kvm-build.sh | 6 +-
+ .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 24 +-
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh | 42 ++-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 144 ++++----
+ .../bin/{parse-rcutorture.sh => parse-torture.sh} | 22 +-
+ .../selftests/rcutorture/configs/rcu/TREE02-T | 25 ++
+ .../selftests/rcutorture/configs/rcu/TREE08.boot | 1 +
+ 31 files changed, 1164 insertions(+), 411 deletions(-)
+ create mode 100644 Documentation/RCU/rcu_dereference.txt
+ rename tools/testing/selftests/rcutorture/bin/{parse-rcutorture.sh => parse-torture.sh} (79%)
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE02-T
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08.boot
+Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (198c74f43f0f KVM: MMU: flush tlb out of mmu lock when write-protect the sptes)
+$ git merge kvm/linux-next
+Auto-merging arch/s390/mm/pgtable.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kernel/entry64.S
+Auto-merging arch/s390/kernel/entry.S
+Auto-merging arch/s390/kernel/asm-offsets.c
+Auto-merging arch/s390/include/asm/ptrace.h
+Auto-merging arch/s390/include/asm/mmu_context.h
+Auto-merging arch/s390/include/asm/lowcore.h
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 8 +-
+ Documentation/virtual/kvm/devices/vm.txt | 26 ++
+ Documentation/virtual/kvm/s390-diag.txt | 2 +
+ arch/s390/include/asm/ctl_reg.h | 14 +
+ arch/s390/include/asm/kvm_host.h | 149 ++++++-
+ arch/s390/include/asm/lowcore.h | 10 +-
+ arch/s390/include/asm/mmu.h | 2 +
+ arch/s390/include/asm/mmu_context.h | 1 +
+ arch/s390/include/asm/pgalloc.h | 3 +-
+ arch/s390/include/asm/pgtable.h | 169 ++++----
+ arch/s390/include/asm/ptrace.h | 44 +++
+ arch/s390/include/asm/sclp.h | 7 +-
+ arch/s390/include/uapi/asm/kvm.h | 28 ++
+ arch/s390/kernel/asm-offsets.c | 14 +-
+ arch/s390/kernel/entry.S | 4 +-
+ arch/s390/kernel/entry64.S | 4 +-
+ arch/s390/kvm/Makefile | 4 +-
+ arch/s390/kvm/diag.c | 15 +-
+ arch/s390/kvm/gaccess.c | 645 +++++++++++++++++++++++++++++++
+ arch/s390/kvm/gaccess.h | 373 ++++++++++++++----
+ arch/s390/kvm/guestdbg.c | 481 +++++++++++++++++++++++
+ arch/s390/kvm/intercept.c | 110 +++++-
+ arch/s390/kvm/interrupt.c | 339 +++++++++++-----
+ arch/s390/kvm/kvm-s390.c | 373 +++++++++++++-----
+ arch/s390/kvm/kvm-s390.h | 59 ++-
+ arch/s390/kvm/priv.c | 272 +++++++++----
+ arch/s390/kvm/sigp.c | 12 +-
+ arch/s390/kvm/trace.h | 39 ++
+ arch/s390/mm/pgtable.c | 93 ++++-
+ arch/x86/include/asm/kvm_host.h | 6 +-
+ arch/x86/kvm/emulate.c | 17 +-
+ arch/x86/kvm/irq.c | 1 +
+ arch/x86/kvm/mmu.c | 78 ++--
+ arch/x86/kvm/mmu.h | 33 ++
+ arch/x86/kvm/paging_tmpl.h | 7 +-
+ arch/x86/kvm/pmu.c | 7 +-
+ arch/x86/kvm/vmx.c | 45 ++-
+ arch/x86/kvm/x86.c | 48 ++-
+ drivers/s390/char/sclp_early.c | 22 +-
+ include/linux/kvm_host.h | 12 +-
+ include/uapi/linux/kvm.h | 5 +-
+ virt/kvm/eventfd.c | 43 ++-
+ virt/kvm/kvm_main.c | 8 +-
+ 43 files changed, 3036 insertions(+), 596 deletions(-)
+ create mode 100644 Documentation/virtual/kvm/devices/vm.txt
+ create mode 100644 arch/s390/kvm/gaccess.c
+ create mode 100644 arch/s390/kvm/guestdbg.c
+Merging kvm-arm/next (198c74f43f0f KVM: MMU: flush tlb out of mmu lock when write-protect the sptes)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-ppc/kvm-ppc-next (0f689a33ad17 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
+$ git merge fw-nohz/nohz/next
+Already up-to-date.
+Merging xen-tip/linux-next (0a25e113b480 Merge branch 'devel/for-linus-3.15' into linux-next)
+$ git merge xen-tip/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/xen/xen-acpi-processor.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging percpu/for-next (4abee313c9a8 Merge branch 'for-3.16' into for-next)
+$ git merge percpu/for-next
+Auto-merging include/linux/percpu.h
+Merge made by the 'recursive' strategy.
+ include/linux/percpu.h | 2 +-
+ mm/percpu.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging workqueues/for-next (534a3fbb3f37 workqueue: simplify wq_update_unbound_numa() by jumping to use_dfl_pwq if the target cpumask equals wq's)
+$ git merge workqueues/for-next
+Auto-merging kernel/workqueue.c
+Merge made by the 'recursive' strategy.
+ kernel/workqueue.c | 44 ++++++++++++++++++++++++++++++++------------
+ 1 file changed, 32 insertions(+), 12 deletions(-)
+Merging drivers-x86/linux-next (7a70906e55bf alienware-wmi: cover some scenarios where memory allocations would fail)
+$ git merge drivers-x86/linux-next
+Merge made by the 'recursive' strategy.
+Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
+$ git merge chrome-platform/for-next
+Already up-to-date.
+Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (ef298cbafb9d Merge remote-tracking branches 'regmap/topic/le', 'regmap/topic/mmio', 'regmap/topic/rbtree' and 'regmap/topic/smbus' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regcache-rbtree.c | 8 +--
+ drivers/base/regmap/regmap-i2c.c | 104 +++++++++++++++++++++++++++++++++-
+ drivers/base/regmap/regmap-mmio.c | 29 ++++++++--
+ drivers/base/regmap/regmap.c | 83 ++++++++++++++++++++++++++-
+ include/linux/regmap.h | 6 ++
+ 5 files changed, 218 insertions(+), 12 deletions(-)
+Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (c73bcf7cca71 leds: 88pm860x: Fix missing refcount decrement for parent of_node)
+$ git merge leds/for-next
+Removing include/linux/platform_data/leds-pca9685.h
+Removing drivers/leds/leds-pca9685.c
+Auto-merging drivers/leds/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/leds/leds-pwm.txt | 2 +
+ drivers/leds/Kconfig | 10 -
+ drivers/leds/Makefile | 1 -
+ drivers/leds/dell-led.c | 171 ++++++++++++++++-
+ drivers/leds/leds-88pm860x.c | 5 +-
+ drivers/leds/leds-pca9685.c | 213 ---------------------
+ drivers/leds/leds-pwm.c | 144 +++++++-------
+ include/linux/dell-led.h | 10 +
+ include/linux/platform_data/leds-pca9685.h | 35 ----
+ 9 files changed, 248 insertions(+), 343 deletions(-)
+ delete mode 100644 drivers/leds/leds-pca9685.c
+ create mode 100644 include/linux/dell-led.h
+ delete mode 100644 include/linux/platform_data/leds-pca9685.h
+Merging driver-core/driver-core-next (d35cc56ddfc9 Merge 3.15-rc3 into staging-next)
+$ git merge driver-core/driver-core-next
+Merge made by the 'recursive' strategy.
+ drivers/base/Kconfig | 17 +++++++++++------
+ fs/kernfs/dir.c | 1 +
+ fs/kernfs/file.c | 41 +++++++++++++++++++++++++++++++++++------
+ fs/kernfs/kernfs-internal.h | 5 +++++
+ fs/kernfs/mount.c | 11 +++++++++++
+ include/linux/kernfs.h | 4 ++++
+ include/linux/kobject.h | 2 ++
+ kernel/ksysfs.c | 5 ++++-
+ kernel/sysctl.c | 4 ++--
+ lib/kobject_uevent.c | 6 ++++++
+ 10 files changed, 81 insertions(+), 15 deletions(-)
+Merging tty/tty-next (f379a071091b Merge 3.15-rc3 into tty-next)
+$ git merge tty/tty-next
+Auto-merging arch/x86/Kconfig
+Removing arch/arm64/kernel/early_printk.c
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/serial/nxp,sc16is7xx.txt | 33 +
+ Documentation/kernel-parameters.txt | 9 +
+ arch/arm64/Kconfig | 3 +
+ arch/arm64/Kconfig.debug | 9 -
+ arch/arm64/kernel/Makefile | 1 -
+ arch/arm64/kernel/early_printk.c | 158 ---
+ arch/x86/Kconfig | 3 +
+ drivers/bluetooth/hci_ldisc.c | 24 +-
+ drivers/bluetooth/hci_uart.h | 1 +
+ drivers/tty/serial/8250/8250_core.c | 5 -
+ drivers/tty/serial/8250/8250_dw.c | 81 +-
+ drivers/tty/serial/8250/8250_early.c | 138 +--
+ drivers/tty/serial/8250/Kconfig | 6 +-
+ drivers/tty/serial/Kconfig | 47 +-
+ drivers/tty/serial/Makefile | 5 +
+ drivers/tty/serial/amba-pl011.c | 30 +-
+ drivers/tty/serial/earlycon-arm-semihost.c | 61 +
+ drivers/tty/serial/earlycon.c | 152 +++
+ drivers/tty/serial/men_z135_uart.c | 866 +++++++++++++
+ drivers/tty/serial/mux.c | 4 +-
+ drivers/tty/serial/omap-serial.c | 94 +-
+ drivers/tty/serial/pch_uart.c | 13 +-
+ drivers/tty/serial/pxa.c | 5 -
+ drivers/tty/serial/sc16is7xx.c | 1280 ++++++++++++++++++++
+ drivers/tty/serial/serial_core.c | 3 +
+ drivers/tty/serial/serial_txx9.c | 5 -
+ drivers/tty/serial/xilinx_uartps.c | 1129 +++++++++--------
+ include/linux/serial_core.h | 16 +
+ include/linux/tty_ldisc.h | 5 +-
+ include/uapi/linux/serial_core.h | 8 +-
+ include/uapi/linux/serial_reg.h | 2 +-
+ 31 files changed, 3196 insertions(+), 1000 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt
+ delete mode 100644 arch/arm64/kernel/early_printk.c
+ create mode 100644 drivers/tty/serial/earlycon-arm-semihost.c
+ create mode 100644 drivers/tty/serial/earlycon.c
+ create mode 100644 drivers/tty/serial/men_z135_uart.c
+ create mode 100644 drivers/tty/serial/sc16is7xx.c
+Merging usb/usb-next (53971a86d2db Merge 3.15-rc3 into usb-next)
+$ git merge usb/usb-next
+Removing drivers/usb/phy/phy-mv-u3d-usb.h
+Removing drivers/usb/phy/phy-mv-u3d-usb.c
+Auto-merging drivers/usb/phy/phy-fsm-usb.c
+Removing drivers/usb/gadget/s3c-hsotg.h
+Auto-merging drivers/usb/dwc2/gadget.c
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-platform-chipidea-usb-otg | 56 +
+ Documentation/usb/chipidea.txt | 71 +
+ arch/arm/mach-pxa/zeus.c | 89 +-
+ drivers/usb/chipidea/Makefile | 1 +
+ drivers/usb/chipidea/bits.h | 10 +
+ drivers/usb/chipidea/ci.h | 23 +
+ drivers/usb/chipidea/core.c | 81 +-
+ drivers/usb/chipidea/debug.c | 135 +
+ drivers/usb/chipidea/host.c | 21 +-
+ drivers/usb/chipidea/otg.c | 48 +-
+ drivers/usb/chipidea/otg.h | 18 +-
+ drivers/usb/chipidea/otg_fsm.c | 865 ++++
+ drivers/usb/chipidea/otg_fsm.h | 129 +
+ drivers/usb/chipidea/udc.c | 58 +-
+ drivers/usb/chipidea/usbmisc_imx.c | 58 +
+ drivers/usb/dwc2/Kconfig | 61 +-
+ drivers/usb/dwc2/Makefile | 37 +-
+ drivers/usb/dwc2/core.h | 182 +
+ drivers/usb/{gadget/s3c-hsotg.c => dwc2/gadget.c} | 594 +--
+ drivers/usb/dwc2/hw.h | 12 +-
+ drivers/usb/gadget/Kconfig | 6 -
+ drivers/usb/gadget/Makefile | 1 -
+ drivers/usb/gadget/s3c-hsotg.h | 378 --
+ drivers/usb/host/ehci-hub.c | 12 +-
+ drivers/usb/host/ehci-tegra.c | 8 +-
+ drivers/usb/host/ehci.h | 3 +
+ drivers/usb/host/ohci-at91.c | 11 +-
+ drivers/usb/host/ohci-exynos.c | 6 -
+ drivers/usb/host/ohci-hub.c | 8 +-
+ drivers/usb/host/ohci-pxa27x.c | 68 +
+ drivers/usb/host/ohci-s3c2410.c | 13 +-
+ drivers/usb/host/ohci.h | 3 +
+ drivers/usb/misc/ftdi-elan.c | 4878 ++++++++++----------
+ drivers/usb/phy/Kconfig | 8 -
+ drivers/usb/phy/Makefile | 1 -
+ drivers/usb/phy/phy-fsm-usb.c | 1 +
+ drivers/usb/phy/phy-mv-u3d-usb.c | 338 --
+ drivers/usb/phy/phy-mv-u3d-usb.h | 105 -
+ 38 files changed, 4507 insertions(+), 3890 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg
+ create mode 100644 Documentation/usb/chipidea.txt
+ create mode 100644 drivers/usb/chipidea/otg_fsm.c
+ create mode 100644 drivers/usb/chipidea/otg_fsm.h
+ rename drivers/usb/{gadget/s3c-hsotg.c => dwc2/gadget.c} (85%)
+ delete mode 100644 drivers/usb/gadget/s3c-hsotg.h
+ delete mode 100644 drivers/usb/phy/phy-mv-u3d-usb.c
+ delete mode 100644 drivers/usb/phy/phy-mv-u3d-usb.h
+Merging usb-gadget/next (041832565e40 usb: phy: mv-u3d: switch over to writel/readl)
+$ git merge usb-gadget/next
+CONFLICT (modify/delete): drivers/usb/phy/phy-mv-u3d-usb.c deleted in HEAD and modified in usb-gadget/next. Version usb-gadget/next of drivers/usb/phy/phy-mv-u3d-usb.c left in tree.
+Auto-merging drivers/usb/dwc3/gadget.c
+Auto-merging drivers/usb/dwc3/core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/usb/phy/phy-mv-u3d-usb.c
+drivers/usb/phy/phy-mv-u3d-usb.c: needs merge
+rm 'drivers/usb/phy/phy-mv-u3d-usb.c'
+$ git commit -v -a
+[master 6f8775115c81] Merge remote-tracking branch 'usb-gadget/next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/usb/dwc3/core.c | 120 +++++++++++++++++++++++++---------------------
+ drivers/usb/dwc3/gadget.c | 4 ++
+ 2 files changed, 70 insertions(+), 54 deletions(-)
+Merging staging/staging-next (37aa48368f25 Merge 3.15-rc3 into staging-next)
+$ git merge staging/staging-next
+Resolved 'drivers/iio/adc/Kconfig' using previous resolution.
+Removing drivers/staging/sbe-2t3e3/netdev.c
+Removing drivers/staging/sbe-2t3e3/module.c
+Removing drivers/staging/sbe-2t3e3/maps.c
+Removing drivers/staging/sbe-2t3e3/main.c
+Removing drivers/staging/sbe-2t3e3/io.c
+Removing drivers/staging/sbe-2t3e3/intr.c
+Removing drivers/staging/sbe-2t3e3/exar7300.c
+Removing drivers/staging/sbe-2t3e3/exar7250.c
+Removing drivers/staging/sbe-2t3e3/dc.c
+Removing drivers/staging/sbe-2t3e3/ctrl.h
+Removing drivers/staging/sbe-2t3e3/ctrl.c
+Removing drivers/staging/sbe-2t3e3/cpld.c
+Removing drivers/staging/sbe-2t3e3/TODO
+Removing drivers/staging/sbe-2t3e3/Makefile
+Removing drivers/staging/sbe-2t3e3/Kconfig
+Removing drivers/staging/sbe-2t3e3/2t3e3.h
+Removing drivers/staging/rtl8723au/include/rtw_p2p.h
+Removing drivers/staging/rtl8723au/include/ethernet.h
+Removing drivers/staging/rtl8723au/include/cmd_osdep.h
+Removing drivers/staging/rtl8723au/core/rtw_p2p.c
+Removing drivers/staging/rtl8188eu/include/drv_types_linux.h
+Removing drivers/staging/lustre/lustre/lov/lov_log.c
+Auto-merging drivers/staging/lustre/lustre/llite/vvp_io.c
+Auto-merging drivers/staging/lustre/lustre/llite/rw26.c
+Auto-merging drivers/staging/lustre/lustre/llite/rw.c
+Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
+Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h
+Auto-merging drivers/staging/lustre/lustre/llite/file.c
+Auto-merging drivers/staging/lustre/lustre/lclient/lcommon_cl.c
+Removing drivers/staging/lustre/lustre/include/obd_lov.h
+Removing drivers/staging/lustre/lustre/include/ioctl.h
+Removing drivers/staging/iio/adc/ad799x_ring.c
+Removing drivers/staging/iio/adc/ad799x.h
+Removing drivers/staging/android/ram_console.h
+Auto-merging drivers/staging/android/binder.c
+Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
+Auto-merging drivers/iio/adc/ad799x.c
+Auto-merging drivers/iio/adc/Kconfig
+CONFLICT (content): Merge conflict in drivers/iio/adc/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c7030f0ca730] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio | 8 +
+ .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 16 +
+ .../devicetree/bindings/iio/proximity/as3935.txt | 28 +
+ .../bindings/staging/imx-drm/fsl-imx-drm.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ MAINTAINERS | 7 +
+ drivers/iio/Kconfig | 1 +
+ drivers/iio/Makefile | 1 +
+ drivers/iio/accel/st_accel_core.c | 7 +
+ drivers/iio/adc/Kconfig | 20 +-
+ drivers/iio/adc/Makefile | 1 +
+ .../iio/adc/ad799x_core.c => iio/adc/ad799x.c} | 145 +-
+ drivers/iio/adc/mcp3422.c | 33 +-
+ drivers/iio/common/st_sensors/st_sensors_core.c | 37 +
+ drivers/iio/gyro/itg3200_core.c | 2 -
+ drivers/iio/gyro/st_gyro_core.c | 7 +
+ drivers/iio/imu/inv_mpu6050/Kconfig | 2 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 1 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 1 +
+ drivers/iio/industrialio-core.c | 6 +-
+ drivers/iio/industrialio-event.c | 4 +-
+ drivers/iio/inkern.c | 18 +
+ drivers/iio/magnetometer/Kconfig | 3 +-
+ drivers/iio/magnetometer/ak8975.c | 70 +-
+ drivers/iio/magnetometer/st_magn_core.c | 7 +
+ drivers/iio/pressure/st_pressure_core.c | 42 +-
+ drivers/iio/proximity/Kconfig | 19 +
+ drivers/iio/proximity/Makefile | 6 +
+ drivers/iio/proximity/as3935.c | 456 ++
+ drivers/staging/Kconfig | 4 +-
+ drivers/staging/Makefile | 2 +-
+ drivers/staging/android/binder.c | 8 +-
+ drivers/staging/android/ion/ion_carveout_heap.c | 2 +-
+ drivers/staging/android/ion/ion_chunk_heap.c | 2 +-
+ drivers/staging/android/ion/ion_system_heap.c | 4 +-
+ drivers/staging/android/ram_console.h | 22 -
+ drivers/staging/android/uapi/ion.h | 12 +-
+ drivers/staging/bcm/CmHost.c | 50 +-
+ drivers/staging/bcm/InterfaceMisc.h | 12 +-
+ drivers/staging/bcm/Qos.c | 189 +-
+ drivers/staging/bcm/hostmibs.c | 51 +-
+ drivers/staging/comedi/comedi_fops.c | 9 +-
+ drivers/staging/comedi/drivers.c | 1 +
+ drivers/staging/comedi/drivers/8255.c | 3 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c | 103 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 4 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 43 +-
+ drivers/staging/comedi/drivers/addi_apci_1032.c | 5 +-
+ drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c | 209 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 40 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 131 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 25 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 115 +-
+ .../staging/comedi/drivers/amplc_dio200_common.c | 27 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 3 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 262 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 327 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c | 90 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 129 +-
+ drivers/staging/comedi/drivers/comedi_parport.c | 3 +-
+ drivers/staging/comedi/drivers/comedi_test.c | 4 -
+ drivers/staging/comedi/drivers/das16.c | 51 +-
+ drivers/staging/comedi/drivers/das16m1.c | 49 +-
+ drivers/staging/comedi/drivers/das1800.c | 37 +-
+ drivers/staging/comedi/drivers/das6402.c | 2 +-
+ drivers/staging/comedi/drivers/das800.c | 52 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 51 +-
+ drivers/staging/comedi/drivers/dt282x.c | 8 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 36 +-
+ drivers/staging/comedi/drivers/me4000.c | 88 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 3 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 3 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 74 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 92 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 105 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 6 +-
+ drivers/staging/comedi/drivers/ni_tiocmd.c | 18 +-
+ drivers/staging/comedi/drivers/pcl726.c | 3 +-
+ drivers/staging/comedi/drivers/pcl812.c | 4 +-
+ drivers/staging/comedi/drivers/pcmmio.c | 22 +-
+ drivers/staging/comedi/drivers/pcmuio.c | 22 +-
+ drivers/staging/comedi/drivers/rtd520.c | 6 +-
+ drivers/staging/comedi/drivers/s626.c | 55 +-
+ drivers/staging/comedi/drivers/usbdux.c | 22 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 21 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 12 +-
+ drivers/staging/crystalhd/crystalhd_lnx.c | 29 +-
+ drivers/staging/cxt1e1/hwprobe.c | 16 +-
+ drivers/staging/cxt1e1/linux.c | 21 +-
+ drivers/staging/cxt1e1/musycc.c | 12 +-
+ drivers/staging/cxt1e1/pmc93x6_eeprom.c | 550 +-
+ drivers/staging/cxt1e1/pmcc4_drv.c | 47 +-
+ drivers/staging/cxt1e1/pmcc4_private.h | 2 +-
+ drivers/staging/cxt1e1/sbecom_inline_linux.h | 23 +-
+ drivers/staging/cxt1e1/sbecrc.c | 5 +-
+ drivers/staging/cxt1e1/sbeproc.c | 2 +-
+ drivers/staging/dgap/dgap.c | 191 +-
+ drivers/staging/dgap/dgap.h | 423 +-
+ drivers/staging/fwserial/dma_fifo.c | 32 +-
+ drivers/staging/fwserial/dma_fifo.h | 22 +-
+ drivers/staging/fwserial/fwserial.c | 42 +-
+ drivers/staging/goldfish/README | 1 -
+ drivers/staging/goldfish/goldfish_audio.c | 1 +
+ drivers/staging/goldfish/goldfish_nand.c | 16 +-
+ drivers/staging/iio/adc/Kconfig | 20 -
+ drivers/staging/iio/adc/Makefile | 4 -
+ drivers/staging/iio/adc/ad7606.h | 4 +-
+ drivers/staging/iio/adc/ad7816.c | 2 +-
+ drivers/staging/iio/adc/ad799x.h | 121 -
+ drivers/staging/iio/adc/ad799x_ring.c | 84 -
+ drivers/staging/iio/adc/spear_adc.c | 315 +-
+ drivers/staging/iio/addac/adt7316.c | 4 +-
+ drivers/staging/iio/cdc/ad7152.c | 2 +-
+ drivers/staging/iio/cdc/ad7746.c | 2 +-
+ drivers/staging/iio/light/tsl2583.c | 38 +-
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 3 +-
+ drivers/staging/imx-drm/imx-drm-core.c | 2 +-
+ drivers/staging/imx-drm/imx-hdmi.c | 18 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-common.c | 6 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 12 +-
+ drivers/staging/imx-drm/parallel-display.c | 2 +
+ drivers/staging/keucr/init.c | 1 +
+ drivers/staging/keucr/init.h | 1 -
+ drivers/staging/keucr/smil.h | 3 +-
+ drivers/staging/keucr/smilsub.c | 1 +
+ drivers/staging/keucr/transport.c | 1 +
+ drivers/staging/line6/driver.c | 1 +
+ drivers/staging/line6/pcm.c | 2 +-
+ drivers/staging/line6/playback.c | 5 +
+ drivers/staging/line6/toneport.c | 1 +
+ .../staging/lustre/include/linux/libcfs/libcfs.h | 1 +
+ .../lustre/include/linux/libcfs/libcfs_cpu.h | 9 +-
+ .../lustre/include/linux/libcfs/libcfs_crypto.h | 2 +-
+ .../lustre/include/linux/libcfs/libcfs_debug.h | 4 +-
+ .../lustre/include/linux/libcfs/libcfs_hash.h | 8 +-
+ .../lustre/include/linux/libcfs/libcfs_private.h | 4 +-
+ .../lustre/include/linux/libcfs/linux/linux-lock.h | 2 +-
+ .../lustre/include/linux/libcfs/linux/linux-mem.h | 5 +
+ .../staging/lustre/include/linux/lnet/lib-lnet.h | 2 +-
+ .../staging/lustre/include/linux/lnet/lib-types.h | 6 +-
+ drivers/staging/lustre/include/linux/lnet/lnetst.h | 2 +-
+ drivers/staging/lustre/include/linux/lnet/ptllnd.h | 2 +-
+ .../lustre/include/linux/lnet/ptllnd_wire.h | 14 +-
+ drivers/staging/lustre/include/linux/lnet/types.h | 8 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +-
+ drivers/staging/lustre/lnet/lnet/api-ni.c | 9 +-
+ drivers/staging/lustre/lustre/fid/lproc_fid.c | 41 +-
+ drivers/staging/lustre/lustre/include/dt_object.h | 9 +-
+ drivers/staging/lustre/lustre/include/ioctl.h | 106 -
+ drivers/staging/lustre/lustre/include/linux/obd.h | 2 +-
+ .../staging/lustre/lustre/include/lprocfs_status.h | 4 +-
+ drivers/staging/lustre/lustre/include/lu_object.h | 8 +-
+ drivers/staging/lustre/lustre/include/lu_ref.h | 4 +-
+ .../lustre/lustre/include/lustre/lustre_idl.h | 28 +-
+ .../lustre/lustre/include/lustre/lustre_user.h | 5 +-
+ .../staging/lustre/lustre/include/lustre_debug.h | 1 -
+ drivers/staging/lustre/lustre/include/lustre_dlm.h | 12 +-
+ drivers/staging/lustre/lustre/include/lustre_lib.h | 13 -
+ drivers/staging/lustre/lustre/include/lustre_log.h | 10 -
+ drivers/staging/lustre/lustre/include/lustre_mdc.h | 23 +-
+ drivers/staging/lustre/lustre/include/lustre_net.h | 4 +-
+ drivers/staging/lustre/lustre/include/obd.h | 24 +-
+ drivers/staging/lustre/lustre/include/obd_class.h | 16 +-
+ drivers/staging/lustre/lustre/include/obd_lov.h | 116 -
+ .../staging/lustre/lustre/include/obd_support.h | 10 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 17 +-
+ .../staging/lustre/lustre/lclient/lcommon_misc.c | 15 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 2 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 4 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 10 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 16 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 +-
+ drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 21 +
+ .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 18 +-
+ .../lustre/lustre/libcfs/linux/linux-module.c | 4 +
+ drivers/staging/lustre/lustre/libcfs/module.c | 3 +-
+ drivers/staging/lustre/lustre/libcfs/nidstrings.c | 12 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.c | 14 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.h | 2 +-
+ drivers/staging/lustre/lustre/libcfs/workitem.c | 2 +-
+ drivers/staging/lustre/lustre/llite/dcache.c | 26 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 15 +-
+ drivers/staging/lustre/lustre/llite/file.c | 148 +-
+ drivers/staging/lustre/lustre/llite/llite_capa.c | 4 +-
+ .../staging/lustre/lustre/llite/llite_internal.h | 177 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 135 +-
+ drivers/staging/lustre/lustre/llite/llite_mmap.c | 23 +-
+ drivers/staging/lustre/lustre/llite/llite_nfs.c | 4 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 10 +-
+ drivers/staging/lustre/lustre/llite/lproc_llite.c | 155 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 40 +-
+ drivers/staging/lustre/lustre/llite/remote_perm.c | 2 +-
+ drivers/staging/lustre/lustre/llite/rw.c | 7 -
+ drivers/staging/lustre/lustre/llite/rw26.c | 15 +-
+ drivers/staging/lustre/lustre/llite/statahead.c | 68 +-
+ drivers/staging/lustre/lustre/llite/super25.c | 9 +-
+ drivers/staging/lustre/lustre/llite/symlink.c | 2 +-
+ drivers/staging/lustre/lustre/llite/vvp_dev.c | 10 +-
+ drivers/staging/lustre/lustre/llite/vvp_internal.h | 2 +-
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 4 +-
+ drivers/staging/lustre/lustre/llite/vvp_object.c | 35 +-
+ drivers/staging/lustre/lustre/llite/xattr.c | 5 +
+ drivers/staging/lustre/lustre/llite/xattr_cache.c | 4 +-
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c | 25 +-
+ drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 16 +-
+ drivers/staging/lustre/lustre/lov/Makefile | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_dev.c | 6 +-
+ drivers/staging/lustre/lustre/lov/lov_ea.c | 14 +-
+ drivers/staging/lustre/lustre/lov/lov_internal.h | 37 +-
+ drivers/staging/lustre/lustre/lov/lov_lock.c | 42 +-
+ drivers/staging/lustre/lustre/lov/lov_log.c | 272 -
+ drivers/staging/lustre/lustre/lov/lov_merge.c | 6 +-
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 21 +-
+ drivers/staging/lustre/lustre/lov/lov_object.c | 3 +-
+ drivers/staging/lustre/lustre/lov/lov_offset.c | 1 -
+ drivers/staging/lustre/lustre/lov/lov_pack.c | 10 +-
+ drivers/staging/lustre/lustre/lov/lov_request.c | 1 -
+ drivers/staging/lustre/lustre/lov/lovsub_dev.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lovsub_lock.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lovsub_object.c | 2 +-
+ drivers/staging/lustre/lustre/mdc/mdc_locks.c | 23 +-
+ drivers/staging/lustre/lustre/mdc/mdc_reint.c | 11 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 49 +-
+ drivers/staging/lustre/lustre/mgc/mgc_request.c | 8 +-
+ drivers/staging/lustre/lustre/obdclass/cl_lock.c | 16 +-
+ drivers/staging/lustre/lustre/obdclass/cl_object.c | 6 +-
+ drivers/staging/lustre/lustre/obdclass/cl_page.c | 4 +-
+ drivers/staging/lustre/lustre/obdclass/debug.c | 12 -
+ drivers/staging/lustre/lustre/obdclass/genops.c | 6 +-
+ .../lustre/lustre/obdclass/linux/linux-module.c | 15 +-
+ drivers/staging/lustre/lustre/obdclass/llog_obd.c | 29 +-
+ drivers/staging/lustre/lustre/obdclass/obd_mount.c | 18 +-
+ .../staging/lustre/lustre/obdecho/echo_client.c | 11 +-
+ drivers/staging/lustre/lustre/osc/lproc_osc.c | 16 +-
+ drivers/staging/lustre/lustre/osc/osc_cache.c | 4 +-
+ .../staging/lustre/lustre/osc/osc_cl_internal.h | 9 +
+ drivers/staging/lustre/lustre/osc/osc_dev.c | 4 +-
+ drivers/staging/lustre/lustre/osc/osc_io.c | 28 +-
+ drivers/staging/lustre/lustre/osc/osc_lock.c | 3 +-
+ drivers/staging/lustre/lustre/osc/osc_object.c | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_request.c | 1 -
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 50 +-
+ drivers/staging/lustre/lustre/ptlrpc/events.c | 2 +-
+ .../staging/lustre/lustre/ptlrpc/gss/gss_bulk.c | 12 +-
+ .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 4 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c | 36 +-
+ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/nrs.c | 2 +-
+ .../staging/lustre/lustre/ptlrpc/pack_generic.c | 1 +
+ drivers/staging/lustre/lustre/ptlrpc/pinger.c | 2 +-
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 4 +
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 32 +-
+ drivers/staging/lustre/lustre/ptlrpc/recover.c | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec.c | 24 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 4 +-
+ drivers/staging/lustre/lustre/ptlrpc/service.c | 20 +-
+ drivers/staging/netlogic/xlr_net.c | 1 +
+ drivers/staging/panel/panel.c | 226 +-
+ drivers/staging/rtl8188eu/core/rtw_br_ext.c | 1 +
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 35 -
+ drivers/staging/rtl8188eu/core/rtw_led.c | 1415 +----
+ drivers/staging/rtl8188eu/core/rtw_p2p.c | 6 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 7 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 43 +-
+ drivers/staging/rtl8188eu/hal/usb_halinit.c | 26 -
+ drivers/staging/rtl8188eu/include/drv_types.h | 1 -
+ .../staging/rtl8188eu/include/drv_types_linux.h | 24 -
+ drivers/staging/rtl8188eu/include/rtw_cmd.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_led.h | 119 +-
+ drivers/staging/rtl8188eu/include/xmit_osdep.h | 4 -
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 6 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 29 -
+ drivers/staging/rtl8192e/rtl8192e/Kconfig | 1 +
+ drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 95 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 5 -
+ drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c | 2771 ---------
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 -
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 5 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.h | 3 +-
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 14 +-
+ drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 2 +-
+ drivers/staging/rtl8192u/r8190_rtl8256.c | 6 +-
+ drivers/staging/rtl8723au/Kconfig | 8 -
+ drivers/staging/rtl8723au/Makefile | 1 -
+ drivers/staging/rtl8723au/core/rtw_ap.c | 226 +-
+ drivers/staging/rtl8723au/core/rtw_cmd.c | 373 +-
+ drivers/staging/rtl8723au/core/rtw_ieee80211.c | 737 +--
+ drivers/staging/rtl8723au/core/rtw_io.c | 144 +-
+ drivers/staging/rtl8723au/core/rtw_ioctl_set.c | 95 +-
+ drivers/staging/rtl8723au/core/rtw_mlme.c | 1405 +++--
+ drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 5965 +++++---------------
+ drivers/staging/rtl8723au/core/rtw_p2p.c | 4001 -------------
+ drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 88 +-
+ drivers/staging/rtl8723au/core/rtw_recv.c | 44 +-
+ drivers/staging/rtl8723au/core/rtw_sreset.c | 22 +-
+ drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 10 +-
+ drivers/staging/rtl8723au/core/rtw_wlan_util.c | 497 +-
+ drivers/staging/rtl8723au/core/rtw_xmit.c | 179 +-
+ drivers/staging/rtl8723au/hal/hal_com.c | 111 +-
+ drivers/staging/rtl8723au/hal/hal_intf.c | 45 -
+ .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 292 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 100 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 11 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 316 +-
+ drivers/staging/rtl8723au/hal/rtl8723au_recv.c | 22 +-
+ drivers/staging/rtl8723au/hal/usb_halinit.c | 74 +-
+ drivers/staging/rtl8723au/hal/usb_ops_linux.c | 52 +-
+ drivers/staging/rtl8723au/include/cmd_osdep.h | 26 -
+ drivers/staging/rtl8723au/include/drv_types.h | 68 +-
+ drivers/staging/rtl8723au/include/ethernet.h | 22 -
+ drivers/staging/rtl8723au/include/hal_com.h | 13 +-
+ drivers/staging/rtl8723au/include/hal_intf.h | 111 +-
+ drivers/staging/rtl8723au/include/ieee80211.h | 148 +-
+ drivers/staging/rtl8723au/include/mlme_osdep.h | 4 -
+ drivers/staging/rtl8723au/include/osdep_intf.h | 2 -
+ drivers/staging/rtl8723au/include/osdep_service.h | 21 -
+ drivers/staging/rtl8723au/include/recv_osdep.h | 9 -
+ drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 4 -
+ drivers/staging/rtl8723au/include/rtl8723a_hal.h | 15 -
+ drivers/staging/rtl8723au/include/rtw_ap.h | 4 +-
+ drivers/staging/rtl8723au/include/rtw_cmd.h | 20 +-
+ drivers/staging/rtl8723au/include/rtw_io.h | 115 +-
+ drivers/staging/rtl8723au/include/rtw_mlme.h | 146 +-
+ drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 103 +-
+ drivers/staging/rtl8723au/include/rtw_p2p.h | 158 -
+ drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 3 -
+ drivers/staging/rtl8723au/include/rtw_recv.h | 12 +-
+ drivers/staging/rtl8723au/include/rtw_security.h | 17 -
+ drivers/staging/rtl8723au/include/rtw_xmit.h | 16 +-
+ drivers/staging/rtl8723au/include/sta_info.h | 4 +-
+ drivers/staging/rtl8723au/include/usb_ops.h | 3 +-
+ drivers/staging/rtl8723au/include/usb_ops_linux.h | 12 +-
+ drivers/staging/rtl8723au/include/wifi.h | 259 +-
+ drivers/staging/rtl8723au/include/xmit_osdep.h | 19 -
+ drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 1003 +---
+ drivers/staging/rtl8723au/os_dep/mlme_linux.c | 105 -
+ drivers/staging/rtl8723au/os_dep/os_intfs.c | 114 +-
+ drivers/staging/rtl8723au/os_dep/osdep_service.c | 13 -
+ drivers/staging/rtl8723au/os_dep/recv_linux.c | 58 -
+ drivers/staging/rtl8723au/os_dep/usb_intf.c | 37 +-
+ drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 15 +-
+ drivers/staging/rtl8723au/os_dep/xmit_linux.c | 41 -
+ .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.c | 475 +-
+ drivers/staging/rtl8821ae/pci.c | 14 +-
+ drivers/staging/rtl8821ae/rtl8821ae/hw.h | 35 +-
+ drivers/staging/rtl8821ae/wifi.h | 4 +-
+ drivers/staging/sbe-2t3e3/2t3e3.h | 889 ---
+ drivers/staging/sbe-2t3e3/Kconfig | 13 -
+ drivers/staging/sbe-2t3e3/Makefile | 4 -
+ drivers/staging/sbe-2t3e3/TODO | 6 -
+ drivers/staging/sbe-2t3e3/cpld.c | 351 --
+ drivers/staging/sbe-2t3e3/ctrl.c | 350 --
+ drivers/staging/sbe-2t3e3/ctrl.h | 131 -
+ drivers/staging/sbe-2t3e3/dc.c | 460 --
+ drivers/staging/sbe-2t3e3/exar7250.c | 185 -
+ drivers/staging/sbe-2t3e3/exar7300.c | 165 -
+ drivers/staging/sbe-2t3e3/intr.c | 579 --
+ drivers/staging/sbe-2t3e3/io.c | 330 --
+ drivers/staging/sbe-2t3e3/main.c | 172 -
+ drivers/staging/sbe-2t3e3/maps.c | 101 -
+ drivers/staging/sbe-2t3e3/module.c | 208 -
+ drivers/staging/sbe-2t3e3/netdev.c | 143 -
+ drivers/staging/silicom/bpctl_mod.c | 47 +-
+ drivers/staging/silicom/bypasslib/bypass.c | 51 +-
+ drivers/staging/skein/Kconfig | 32 +
+ drivers/staging/skein/Makefile | 13 +
+ drivers/staging/skein/TODO | 11 +
+ drivers/staging/skein/include/skein.h | 344 ++
+ drivers/staging/skein/include/skeinApi.h | 230 +
+ drivers/staging/skein/include/skein_block.h | 22 +
+ drivers/staging/skein/include/skein_iv.h | 186 +
+ drivers/staging/skein/include/threefishApi.h | 164 +
+ drivers/staging/skein/skein.c | 880 +++
+ drivers/staging/skein/skeinApi.c | 237 +
+ drivers/staging/skein/skeinBlockNo3F.c | 175 +
+ drivers/staging/skein/skein_block.c | 770 +++
+ drivers/staging/skein/threefish1024Block.c | 4900 ++++++++++++++++
+ drivers/staging/skein/threefish256Block.c | 1137 ++++
+ drivers/staging/skein/threefish512Block.c | 2223 ++++++++
+ drivers/staging/skein/threefishApi.c | 79 +
+ drivers/staging/slicoss/slicoss.c | 3 +-
+ drivers/staging/speakup/kobjects.c | 2 +-
+ drivers/staging/unisys/channels/channel.c | 2 +-
+ drivers/staging/unisys/channels/chanstub.c | 2 +-
+ drivers/staging/unisys/channels/chanstub.h | 2 +-
+ .../unisys/common-spar/include/channels/channel.h | 4 +-
+ .../common-spar/include/channels/channel_guid.h | 2 +-
+ .../include/channels/controlframework.h | 2 +-
+ .../include/channels/controlvmchannel.h | 2 +-
+ .../common-spar/include/channels/diagchannel.h | 4 +-
+ .../common-spar/include/channels/iochannel.h | 4 +-
+ .../common-spar/include/channels/vbuschannel.h | 2 +-
+ .../include/controlvmcompletionstatus.h | 2 +-
+ .../include/diagnostics/appos_subsystems.h | 2 +-
+ .../unisys/common-spar/include/iovmcall_gnuc.h | 2 +-
+ .../unisys/common-spar/include/vbusdeviceinfo.h | 2 +-
+ .../staging/unisys/common-spar/include/version.h | 2 +-
+ .../unisys/common-spar/include/vmcallinterface.h | 2 +-
+ drivers/staging/unisys/include/commontypes.h | 4 +-
+ drivers/staging/unisys/include/guestlinuxdebug.h | 6 +-
+ drivers/staging/unisys/include/guidutils.h | 2 +-
+ drivers/staging/unisys/include/periodic_work.h | 2 +-
+ drivers/staging/unisys/include/procobjecttree.h | 2 +-
+ drivers/staging/unisys/include/sparstop.h | 2 +-
+ drivers/staging/unisys/include/timskmod.h | 2 +-
+ drivers/staging/unisys/include/timskmodutils.h | 2 +-
+ drivers/staging/unisys/include/uisqueue.h | 2 +-
+ drivers/staging/unisys/include/uisthread.h | 2 +-
+ drivers/staging/unisys/include/uisutils.h | 2 +-
+ drivers/staging/unisys/include/uniklog.h | 2 +-
+ drivers/staging/unisys/uislib/uislib.c | 2 +-
+ drivers/staging/unisys/uislib/uisqueue.c | 2 +-
+ drivers/staging/unisys/uislib/uisthread.c | 2 +-
+ drivers/staging/unisys/uislib/uisutils.c | 2 +-
+ drivers/staging/unisys/virthba/virthba.c | 16 +-
+ drivers/staging/unisys/virthba/virthba.h | 2 +-
+ drivers/staging/unisys/virtpci/virtpci.c | 2 +-
+ drivers/staging/unisys/virtpci/virtpci.h | 2 +-
+ drivers/staging/unisys/visorchannel/globals.h | 2 +-
+ drivers/staging/unisys/visorchannel/visorchannel.h | 2 +-
+ .../unisys/visorchannel/visorchannel_funcs.c | 2 +-
+ .../unisys/visorchannel/visorchannel_main.c | 2 +-
+ drivers/staging/unisys/visorchipset/controlvm.h | 2 +-
+ .../staging/unisys/visorchipset/controlvm_direct.c | 2 +-
+ drivers/staging/unisys/visorchipset/file.c | 2 +-
+ drivers/staging/unisys/visorchipset/file.h | 2 +-
+ drivers/staging/unisys/visorchipset/globals.h | 2 +-
+ drivers/staging/unisys/visorchipset/parser.c | 2 +-
+ drivers/staging/unisys/visorchipset/parser.h | 2 +-
+ drivers/staging/unisys/visorchipset/testing.h | 2 +-
+ drivers/staging/unisys/visorchipset/visorchipset.h | 2 +-
+ .../unisys/visorchipset/visorchipset_main.c | 2 +-
+ .../unisys/visorchipset/visorchipset_umode.h | 2 +-
+ drivers/staging/unisys/visorutil/charqueue.c | 2 +-
+ drivers/staging/unisys/visorutil/charqueue.h | 2 +-
+ drivers/staging/unisys/visorutil/easyproc.c | 2 +-
+ drivers/staging/unisys/visorutil/easyproc.h | 2 +-
+ drivers/staging/unisys/visorutil/memregion.h | 2 +-
+ .../staging/unisys/visorutil/memregion_direct.c | 2 +-
+ drivers/staging/unisys/visorutil/periodic_work.c | 2 +-
+ drivers/staging/unisys/visorutil/procobjecttree.c | 2 +-
+ drivers/staging/unisys/visorutil/visorkmodutils.c | 2 +-
+ drivers/staging/vme/devices/vme_user.c | 9 +-
+ drivers/staging/vt6655/card.c | 14 -
+ drivers/staging/vt6655/datarate.c | 2 +-
+ drivers/staging/vt6655/device.h | 13 +-
+ drivers/staging/vt6655/ioctl.c | 6 +-
+ drivers/staging/vt6655/iwctl.c | 9 +-
+ drivers/staging/vt6655/wpactl.c | 11 +-
+ drivers/staging/vt6656/aes_ccmp.c | 1 +
+ drivers/staging/vt6656/firmware.c | 3 +-
+ drivers/staging/vt6656/rxtx.c | 59 +-
+ drivers/staging/vt6656/rxtx.h | 8 +-
+ drivers/staging/vt6656/tether.h | 4 -
+ drivers/staging/wlan-ng/prism2usb.c | 164 +-
+ drivers/staging/xgifb/XGI_main_26.c | 2 +
+ drivers/staging/xgifb/vb_init.c | 2 +
+ drivers/staging/xgifb/vb_setmode.c | 2 +
+ include/linux/iio/common/st_sensors.h | 4 +
+ include/linux/iio/consumer.h | 13 +
+ 470 files changed, 19612 insertions(+), 27660 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
+ create mode 100644 Documentation/devicetree/bindings/iio/proximity/as3935.txt
+ rename drivers/{staging/iio/adc/ad799x_core.c => iio/adc/ad799x.c} (81%)
+ create mode 100644 drivers/iio/proximity/Kconfig
+ create mode 100644 drivers/iio/proximity/Makefile
+ create mode 100644 drivers/iio/proximity/as3935.c
+ delete mode 100644 drivers/staging/android/ram_console.h
+ delete mode 100644 drivers/staging/iio/adc/ad799x.h
+ delete mode 100644 drivers/staging/iio/adc/ad799x_ring.c
+ delete mode 100644 drivers/staging/lustre/lustre/include/ioctl.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/obd_lov.h
+ delete mode 100644 drivers/staging/lustre/lustre/lov/lov_log.c
+ delete mode 100644 drivers/staging/rtl8188eu/include/drv_types_linux.h
+ delete mode 100644 drivers/staging/rtl8723au/core/rtw_p2p.c
+ delete mode 100644 drivers/staging/rtl8723au/include/cmd_osdep.h
+ delete mode 100644 drivers/staging/rtl8723au/include/ethernet.h
+ delete mode 100644 drivers/staging/rtl8723au/include/rtw_p2p.h
+ delete mode 100644 drivers/staging/sbe-2t3e3/2t3e3.h
+ delete mode 100644 drivers/staging/sbe-2t3e3/Kconfig
+ delete mode 100644 drivers/staging/sbe-2t3e3/Makefile
+ delete mode 100644 drivers/staging/sbe-2t3e3/TODO
+ delete mode 100644 drivers/staging/sbe-2t3e3/cpld.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/ctrl.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/ctrl.h
+ delete mode 100644 drivers/staging/sbe-2t3e3/dc.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/exar7250.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/exar7300.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/intr.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/io.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/main.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/maps.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/module.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/netdev.c
+ create mode 100644 drivers/staging/skein/Kconfig
+ create mode 100644 drivers/staging/skein/Makefile
+ create mode 100644 drivers/staging/skein/TODO
+ create mode 100644 drivers/staging/skein/include/skein.h
+ create mode 100644 drivers/staging/skein/include/skeinApi.h
+ create mode 100644 drivers/staging/skein/include/skein_block.h
+ create mode 100644 drivers/staging/skein/include/skein_iv.h
+ create mode 100644 drivers/staging/skein/include/threefishApi.h
+ create mode 100644 drivers/staging/skein/skein.c
+ create mode 100644 drivers/staging/skein/skeinApi.c
+ create mode 100644 drivers/staging/skein/skeinBlockNo3F.c
+ create mode 100644 drivers/staging/skein/skein_block.c
+ create mode 100644 drivers/staging/skein/threefish1024Block.c
+ create mode 100644 drivers/staging/skein/threefish256Block.c
+ create mode 100644 drivers/staging/skein/threefish512Block.c
+ create mode 100644 drivers/staging/skein/threefishApi.c
+Merging char-misc/char-misc-next (d1db0eea8524 Linux 3.15-rc3)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging cgroup/for-next (9f30813bbca6 Merge branch 'for-3.16' into for-next)
+$ git merge cgroup/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/cgroups/unified-hierarchy.txt | 359 +++++++++++++
+ include/linux/cgroup.h | 59 +-
+ kernel/cgroup.c | 802 ++++++++++++++++++++++------
+ security/device_cgroup.c | 162 ++++--
+ 4 files changed, 1183 insertions(+), 199 deletions(-)
+ create mode 100644 Documentation/cgroups/unified-hierarchy.txt
+Merging scsi/for-next (1a2184c0d747 [SCSI] More USB deadlock fixes)
+$ git merge scsi/for-next
+Merge made by the 'recursive' strategy.
+Merging target-updates/for-next (b076808051f2 ib_srpt: Use correct ib_sg_dma primitives)
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (d1b2402c203b Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 9 +-
+ .../bindings/pinctrl/marvell,orion-pinctrl.txt | 91 +++
+ .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 88 +++
+ .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 95 +++
+ arch/arm/Kconfig | 2 +-
+ drivers/pinctrl/Kconfig | 23 +-
+ drivers/pinctrl/Makefile | 2 +
+ drivers/pinctrl/core.c | 17 +-
+ drivers/pinctrl/mvebu/Kconfig | 4 +
+ drivers/pinctrl/mvebu/Makefile | 1 +
+ drivers/pinctrl/mvebu/pinctrl-orion.c | 261 ++++++++
+ drivers/pinctrl/pinctrl-adi2.c | 2 +-
+ drivers/pinctrl/pinctrl-apq8064.c | 566 ++++++++++++++++++
+ drivers/pinctrl/pinctrl-at91.c | 138 +----
+ drivers/pinctrl/pinctrl-exynos.c | 67 +++
+ drivers/pinctrl/pinctrl-imx.c | 2 +-
+ drivers/pinctrl/pinctrl-ipq8064.c | 653 +++++++++++++++++++++
+ drivers/pinctrl/pinctrl-lantiq.h | 1 +
+ drivers/pinctrl/pinctrl-msm.c | 4 +-
+ drivers/pinctrl/pinctrl-msm.h | 3 +-
+ drivers/pinctrl/pinctrl-msm8x74.c | 3 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 47 +-
+ drivers/pinctrl/pinctrl-samsung.c | 2 +
+ drivers/pinctrl/pinctrl-samsung.h | 1 +
+ drivers/pinctrl/pinctrl-st.c | 130 ++--
+ drivers/pinctrl/pinctrl-sunxi-pins.h | 74 +++
+ drivers/pinctrl/pinctrl-sunxi.c | 55 +-
+ drivers/pinctrl/pinctrl-sunxi.h | 69 +++
+ drivers/pinctrl/pinctrl-tegra.c | 49 +-
+ drivers/pinctrl/pinctrl-tegra.h | 133 ++---
+ drivers/pinctrl/pinctrl-tegra114.c | 412 +++++++------
+ drivers/pinctrl/pinctrl-tegra124.c | 520 ++++++++--------
+ drivers/pinctrl/pinctrl-tegra20.c | 244 ++++----
+ drivers/pinctrl/pinctrl-tegra30.c | 551 +++++++++--------
+ drivers/pinctrl/pinmux.c | 23 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 138 ++++-
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 412 ++++++++++++-
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 274 ++++-----
+ 38 files changed, 3743 insertions(+), 1423 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,orion-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt
+ create mode 100644 drivers/pinctrl/mvebu/pinctrl-orion.c
+ create mode 100644 drivers/pinctrl/pinctrl-apq8064.c
+ create mode 100644 drivers/pinctrl/pinctrl-ipq8064.c
+Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
+$ git merge vhost/linux-next
+Already up-to-date.
+Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
+$ git merge rpmsg/for-next
+Already up-to-date.
+Merging gpio/for-next (4e6a8ae77deb Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 6 +
+ Documentation/gpio/driver.txt | 59 +++++++
+ MAINTAINERS | 1 +
+ drivers/gpio/Kconfig | 11 +-
+ drivers/gpio/Makefile | 2 +-
+ drivers/gpio/gpio-dwapb.c | 3 -
+ drivers/gpio/gpio-ge.c | 174 +++++++--------------
+ drivers/gpio/gpio-ich.c | 4 +
+ drivers/gpio/gpio-kempld.c | 2 +-
+ drivers/gpio/gpio-max730x.c | 5 +-
+ drivers/gpio/gpio-mcp23s08.c | 12 +-
+ drivers/gpio/gpio-omap.c | 145 +++++++++--------
+ drivers/gpio/gpio-pl061.c | 1 -
+ drivers/gpio/gpio-rcar.c | 8 +
+ drivers/gpio/gpio-rdc321x.c | 19 +--
+ drivers/gpio/gpio-sch.c | 26 ++-
+ drivers/gpio/gpio-sch311x.c | 16 +-
+ drivers/gpio/gpio-sx150x.c | 1 -
+ drivers/gpio/gpio-tc3589x.c | 148 ++++--------------
+ drivers/gpio/gpio-zevio.c | 12 +-
+ drivers/gpio/gpiolib-of.c | 2 +-
+ drivers/gpio/gpiolib.c | 56 +++++--
+ include/linux/gpio/driver.h | 5 +-
+ include/linux/mfd/tc3589x.h | 1 -
+ 24 files changed, 357 insertions(+), 362 deletions(-)
+Merging dma-mapping/dma-mapping-next (59f0f119e85c arm: dma-mapping: Fix mapping size value)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (093e00bb3f82 pwm: lpss: Add support for PCI devices)
+$ git merge pwm/for-next
+Auto-merging drivers/pwm/pwm-spear.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pwm/bcm-kona-pwm.txt | 21 ++
+ Documentation/pwm.txt | 7 +
+ drivers/pwm/Kconfig | 9 +
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/pwm-ab8500.c | 4 +-
+ drivers/pwm/pwm-bcm-kona.c | 318 +++++++++++++++++++++
+ drivers/pwm/pwm-imx.c | 4 +-
+ drivers/pwm/pwm-lpss.c | 161 +++++++++--
+ drivers/pwm/pwm-pxa.c | 4 +-
+ drivers/pwm/pwm-renesas-tpu.c | 4 +-
+ drivers/pwm/pwm-spear.c | 4 +-
+ drivers/pwm/pwm-tegra.c | 4 +-
+ drivers/pwm/pwm-tiecap.c | 4 +-
+ drivers/pwm/pwm-tiehrpwm.c | 4 +-
+ drivers/pwm/pwm-vt8500.c | 4 +-
+ 15 files changed, 495 insertions(+), 58 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/bcm-kona-pwm.txt
+ create mode 100644 drivers/pwm/pwm-bcm-kona.c
+Merging dma-buf/for-next (dcb99fd9b08c Linux 3.14-rc7)
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files)
+$ git merge userns/for-next
+Resolved 'fs/dcache.c' using previous resolution.
+Resolved 'fs/namei.c' using previous resolution.
+Resolved 'fs/namespace.c' using previous resolution.
+Auto-merging include/linux/dcache.h
+Auto-merging fs/proc/fd.c
+Auto-merging fs/proc/base.c
+Auto-merging fs/nfs/dir.c
+Auto-merging fs/namespace.c
+CONFLICT (content): Merge conflict in fs/namespace.c
+Auto-merging fs/namei.c
+CONFLICT (content): Merge conflict in fs/namei.c
+Auto-merging fs/mount.h
+Auto-merging fs/kernfs/dir.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/dcache.c
+CONFLICT (content): Merge conflict in fs/dcache.c
+Auto-merging fs/ceph/dir.c
+Auto-merging fs/btrfs/ioctl.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master be2f7406ee94] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/afs/dir.c | 5 --
+ fs/btrfs/ioctl.c | 5 +-
+ fs/ceph/dir.c | 1 -
+ fs/cifs/readdir.c | 6 +--
+ fs/dcache.c | 140 ++++++++++++++++++-------------------------------
+ fs/fuse/dir.c | 7 +--
+ fs/gfs2/dentry.c | 3 --
+ fs/kernfs/dir.c | 11 ----
+ fs/mount.h | 22 ++++++++
+ fs/namei.c | 22 ++++----
+ fs/namespace.c | 130 +++++++++++++++++++++++++++++++++++++++++----
+ fs/nfs/dir.c | 7 +--
+ fs/proc/base.c | 10 +---
+ fs/proc/fd.c | 2 -
+ include/linux/dcache.h | 3 +-
+ kernel/acct.c | 25 +++++++--
+ 16 files changed, 231 insertions(+), 168 deletions(-)
+Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect)
+$ git merge ktest/for-next
+Merge made by the 'recursive' strategy.
+ tools/testing/ktest/ktest.pl | 581 +++++++++++++++++++---------------------
+ tools/testing/ktest/sample.conf | 65 ++---
+ 2 files changed, 297 insertions(+), 349 deletions(-)
+Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge signal/for-next
+Already up-to-date.
+Merging clk/clk-next (4fdd44dfb5bd Merge branch 'clk-fixes' into clk-next)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/bcm-kona-clock.txt | 116 ++++++---
+ .../devicetree/bindings/clock/qcom,gcc.txt | 1 +
+ .../devicetree/bindings/clock/qcom,gcc.txt.rej | 10 +
+ arch/arm/boot/dts/bcm21664.dtsi | 164 +++++++-----
+ drivers/clk/bcm/Kconfig | 2 +-
+ drivers/clk/bcm/Makefile | 1 +
+ drivers/clk/bcm/clk-bcm21664.c | 290 +++++++++++++++++++++
+ drivers/clk/bcm/clk-bcm281xx.c | 231 +++++++---------
+ drivers/clk/bcm/clk-kona-setup.c | 260 ++++++++++++------
+ drivers/clk/bcm/clk-kona.c | 276 +++++++++++++++++---
+ drivers/clk/bcm/clk-kona.h | 188 ++++++++++---
+ drivers/clk/clk-divider.c | 118 ++++++++-
+ drivers/clk/clk.c | 113 ++++----
+ drivers/clk/qcom/Kconfig | 4 +-
+ drivers/clk/qcom/Makefile | 1 +
+ drivers/clk/qcom/common.c | 99 +++++++
+ drivers/clk/qcom/common.h | 34 +++
+ drivers/clk/qcom/gcc-msm8660.c | 87 +------
+ drivers/clk/qcom/gcc-msm8960.c | 109 +++-----
+ drivers/clk/qcom/gcc-msm8974.c | 77 +-----
+ drivers/clk/qcom/mmcc-msm8960.c | 78 +-----
+ drivers/clk/qcom/mmcc-msm8974.c | 80 ++----
+ drivers/clk/socfpga/clk-pll.c | 7 +
+ drivers/clk/socfpga/clk.c | 23 +-
+ include/dt-bindings/clock/bcm21664.h | 62 +++++
+ include/dt-bindings/clock/bcm281xx.h | 12 +
+ include/dt-bindings/clock/qcom,gcc-msm8960.h | 7 +-
+ include/dt-bindings/reset/qcom,gcc-msm8960.h | 2 +-
+ include/linux/clk-provider.h | 3 +
+ 29 files changed, 1632 insertions(+), 823 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc.txt.rej
+ create mode 100644 drivers/clk/bcm/clk-bcm21664.c
+ create mode 100644 drivers/clk/qcom/common.c
+ create mode 100644 drivers/clk/qcom/common.h
+ create mode 100644 include/dt-bindings/clock/bcm21664.h
+Merging random/dev (7b878d4b48c4 random: Add arch_has_random[_seed]())
+$ git merge random/dev
+Already up-to-date.
+Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
+$ git merge lzo-update/lzo-update
+Merge made by the 'recursive' strategy.
+ lib/lzo/lzo1x_decompress_safe.c | 4 ++++
+ lib/lzo/lzodefs.h | 6 ++++++
+ 2 files changed, 10 insertions(+)
+Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
+$ git merge arm64-hugepages/for-next/hugepages
+Already up-to-date.
+Merging aio/master (fa88b6f8803c aio: cleanup: flatten kill_ioctx())
+$ git merge aio/master
+Auto-merging fs/aio.c
+Merge made by the 'recursive' strategy.
+ fs/aio.c | 70 +++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 36 insertions(+), 34 deletions(-)
+Merging llvmlinux/for-next (4f6d454aae03 unwind_support)
+$ git merge llvmlinux/for-next
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 2 +-
+ arch/arm/include/asm/glue-cache.h | 22 +++++++++++-----------
+ arch/arm/kernel/unwind.c | 2 +-
+ crypto/shash.c | 3 ++-
+ net/netfilter/xt_repldata.h | 22 +++++++++++++++++-----
+ 5 files changed, 32 insertions(+), 19 deletions(-)
+Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
+$ git merge powernv-cpuidle/powernv-cpuidle
+Already up-to-date.
+Merging rd-docs/master (c9e7f4124daa The sum at the beginning of line "intr" includes also unnumbered interrupts. It implies that the sum at the beginning isn't the sum of the remainder of the line, not even an estimation.)
+$ git merge rd-docs/master
+Auto-merging Documentation/DocBook/drm.tmpl
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/drm.tmpl | 12 ++++++------
+ Documentation/email-clients.txt | 15 +++++----------
+ Documentation/filesystems/proc.txt | 5 +++--
+ Documentation/java.txt | 8 ++++++++
+ 4 files changed, 22 insertions(+), 18 deletions(-)
+Merging akpm-current/current (9d325a9c00bb sysrq,rcu: suppress RCU stall warnings while sysrq runs)
+$ git merge --no-ff akpm-current/current
+Resolved 'arch/x86/kernel/apic/hw_nmi.c' using previous resolution.
+Auto-merging mm/vmscan.c
+Auto-merging mm/page_io.c
+Auto-merging mm/memblock.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/filemap.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/rcu/update.c
+Auto-merging kernel/kmod.c
+Auto-merging kernel/audit.c
+Auto-merging kernel/acct.c
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/thread_info.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/rcupdate.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/memblock.h
+Auto-merging include/linux/interrupt.h
+Auto-merging include/linux/buffer_head.h
+Auto-merging include/linux/blkdev.h
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/fat/inode.c
+Auto-merging fs/fat/file.c
+Auto-merging fs/ceph/addr.c
+Auto-merging fs/buffer.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/bio.c
+Auto-merging fs/affs/file.c
+Auto-merging fs/9p/vfs_file.c
+Auto-merging drivers/leds/Kconfig
+Auto-merging arch/x86/kernel/apic/hw_nmi.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/apic/hw_nmi.c
+Removing arch/x86/include/asm/scatterlist.h
+Auto-merging arch/x86/Kconfig
+Removing arch/sparc/include/asm/scatterlist.h
+Removing arch/score/include/asm/scatterlist.h
+Removing arch/s390/include/asm/scatterlist.h
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/platforms/52xx/efika.c
+Removing arch/powerpc/include/asm/scatterlist.h
+Removing arch/mn10300/include/asm/scatterlist.h
+Removing arch/microblaze/include/asm/scatterlist.h
+Removing arch/m32r/include/asm/scatterlist.h
+Removing arch/ia64/include/asm/scatterlist.h
+Removing arch/frv/include/asm/scatterlist.h
+Removing arch/cris/include/asm/scatterlist.h
+Auto-merging arch/arm64/Kconfig
+Removing arch/arm/include/asm/scatterlist.h
+Auto-merging arch/arm/Kconfig
+Removing arch/alpha/include/asm/scatterlist.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6cbacf83e97a] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 7 +
+ Documentation/SubmittingPatches | 22 +-
+ Documentation/cgroups/memory.txt | 56 ++-
+ .../devicetree/bindings/rtc/xgene-rtc.txt | 28 ++
+ Documentation/filesystems/vfat.txt | 15 +
+ Documentation/kernel-parameters.txt | 24 +-
+ Documentation/leds/leds-class.txt | 3 -
+ Documentation/memory-hotplug.txt | 125 +++---
+ Documentation/printk-formats.txt | 6 +
+ Documentation/sysctl/kernel.txt | 17 +
+ Documentation/sysctl/vm.txt | 17 +-
+ MAINTAINERS | 5 +-
+ arch/alpha/include/asm/Kbuild | 1 +
+ arch/alpha/include/asm/scatterlist.h | 6 -
+ arch/arc/kernel/troubleshoot.c | 10 +-
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/Kbuild | 1 +
+ arch/arm/include/asm/scatterlist.h | 12 -
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/boot/dts/apm-storm.dtsi | 21 +
+ arch/blackfin/include/asm/unistd.h | 1 -
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/scatterlist.h | 6 -
+ arch/cris/include/asm/unistd.h | 1 -
+ arch/frv/include/asm/Kbuild | 1 +
+ arch/frv/include/asm/scatterlist.h | 6 -
+ arch/frv/include/asm/unistd.h | 1 -
+ arch/ia64/Kconfig | 1 +
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/scatterlist.h | 7 -
+ arch/ia64/include/asm/topology.h | 3 +-
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/scatterlist.h | 6 -
+ arch/m68k/include/asm/signal.h | 9 -
+ arch/m68k/include/asm/unistd.h | 1 -
+ arch/m68k/kernel/sys_m68k.c | 18 +-
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/scatterlist.h | 1 -
+ arch/microblaze/include/asm/unistd.h | 1 -
+ arch/mips/dec/Makefile | 2 +-
+ arch/mips/dec/platform.c | 44 +++
+ arch/mips/include/asm/unistd.h | 1 -
+ arch/mips/kernel/traps.c | 2 +
+ arch/mips/mm/c-octeon.c | 2 +
+ arch/mn10300/include/asm/Kbuild | 1 +
+ arch/mn10300/include/asm/scatterlist.h | 16 -
+ arch/mn10300/include/asm/unistd.h | 1 -
+ arch/parisc/include/asm/unistd.h | 1 -
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/pgtable.h | 6 +
+ arch/powerpc/include/asm/scatterlist.h | 17 -
+ arch/powerpc/include/asm/topology.h | 8 +-
+ arch/powerpc/include/asm/unistd.h | 1 -
+ arch/powerpc/mm/dma-noncoherent.c | 1 +
+ arch/powerpc/mm/subpage-prot.c | 6 +-
+ arch/powerpc/platforms/44x/warp.c | 1 +
+ arch/powerpc/platforms/52xx/efika.c | 1 +
+ arch/powerpc/platforms/amigaone/setup.c | 1 +
+ arch/s390/Kconfig | 1 +
+ arch/s390/include/asm/Kbuild | 1 +
+ arch/s390/include/asm/scatterlist.h | 3 -
+ arch/score/include/asm/Kbuild | 1 +
+ arch/score/include/asm/scatterlist.h | 6 -
+ arch/sh/include/asm/unistd.h | 1 -
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/irq_64.h | 2 +-
+ arch/sparc/include/asm/scatterlist.h | 8 -
+ arch/sparc/include/asm/unistd.h | 1 -
+ arch/sparc/kernel/process_64.c | 18 +-
+ arch/um/include/asm/Kbuild | 1 +
+ arch/x86/Kconfig | 5 +-
+ arch/x86/include/asm/Kbuild | 3 +-
+ arch/x86/include/asm/irq.h | 2 +-
+ arch/x86/include/asm/pgtable.h | 15 +-
+ arch/x86/include/asm/pgtable_64.h | 8 +
+ arch/x86/include/asm/pgtable_types.h | 66 ++--
+ arch/x86/include/asm/scatterlist.h | 8 -
+ arch/x86/include/asm/signal.h | 6 -
+ arch/x86/include/asm/swiotlb.h | 7 +
+ arch/x86/include/asm/unistd.h | 1 -
+ arch/x86/kernel/amd_gart_64.c | 2 +-
+ arch/x86/kernel/apic/hw_nmi.c | 17 +-
+ arch/x86/kernel/pci-dma.c | 11 +-
+ arch/x86/kernel/pci-swiotlb.c | 9 +-
+ arch/x86/kernel/setup.c | 2 +-
+ arch/x86/mm/init_64.c | 34 +-
+ arch/x86/mm/pageattr-test.c | 2 +-
+ arch/x86/pci/sta2x11-fixup.c | 6 +-
+ block/genhd.c | 2 +-
+ drivers/base/dma-contiguous.c | 42 +-
+ drivers/base/memory.c | 12 -
+ drivers/block/brd.c | 16 +-
+ drivers/block/zram/zram_drv.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 6 +
+ drivers/input/Kconfig | 9 +
+ drivers/input/Makefile | 3 +
+ drivers/input/input.c | 6 +
+ drivers/input/leds.c | 249 ++++++++++++
+ drivers/iommu/intel-iommu.c | 33 +-
+ drivers/leds/Kconfig | 3 -
+ drivers/misc/ti-st/st_core.c | 2 +-
+ drivers/net/irda/donauboe.c | 15 +-
+ drivers/rtc/Kconfig | 13 +-
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/interface.c | 15 +-
+ drivers/rtc/rtc-88pm860x.c | 3 +-
+ drivers/rtc/rtc-cmos.c | 85 ++--
+ drivers/rtc/rtc-efi.c | 2 +-
+ drivers/rtc/rtc-m41t80.c | 104 +++--
+ drivers/rtc/rtc-pcf8523.c | 4 +-
+ drivers/rtc/rtc-xgene.c | 278 +++++++++++++
+ drivers/tty/Kconfig | 4 +
+ drivers/tty/sysrq.c | 21 +-
+ drivers/tty/vt/keyboard.c | 110 ++++--
+ drivers/video/backlight/backlight.c | 2 -
+ fs/9p/v9fs.c | 2 +-
+ fs/9p/vfs_dir.c | 1 -
+ fs/9p/vfs_file.c | 4 +-
+ fs/9p/vfs_inode.c | 6 +-
+ fs/9p/vfs_inode_dotl.c | 7 +-
+ fs/affs/affs.h | 16 +-
+ fs/affs/amigaffs.c | 15 +-
+ fs/affs/bitmap.c | 21 +-
+ fs/affs/dir.c | 8 +-
+ fs/affs/file.c | 46 ++-
+ fs/affs/inode.c | 14 +-
+ fs/affs/namei.c | 39 +-
+ fs/affs/super.c | 43 +-
+ fs/affs/symlink.c | 2 +-
+ fs/autofs4/dev-ioctl.c | 2 +-
+ fs/autofs4/root.c | 4 +-
+ fs/befs/btree.c | 11 +-
+ fs/befs/datastream.c | 2 +-
+ fs/befs/linuxvfs.c | 29 +-
+ fs/binfmt_elf.c | 25 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/bio.c | 48 +--
+ fs/block_dev.c | 63 +++
+ fs/buffer.c | 21 +-
+ fs/ceph/addr.c | 2 +-
+ fs/ceph/inode.c | 2 +-
+ fs/ceph/mds_client.c | 6 +-
+ fs/ceph/mdsmap.c | 2 +-
+ fs/configfs/item.c | 58 ++-
+ fs/ext4/page-io.c | 2 +-
+ fs/fat/cache.c | 70 +++-
+ fs/fat/fat.h | 9 +-
+ fs/fat/file.c | 78 +++-
+ fs/fat/inode.c | 429 ++++++++++++++++----
+ fs/hfsplus/attributes.c | 36 +-
+ fs/hfsplus/catalog.c | 89 +++--
+ fs/hfsplus/dir.c | 22 +-
+ fs/hfsplus/hfsplus_fs.h | 7 +-
+ fs/hfsplus/super.c | 4 +-
+ fs/hfsplus/xattr.c | 51 ++-
+ fs/hfsplus/xattr_security.c | 49 ++-
+ fs/hfsplus/xattr_trusted.c | 32 +-
+ fs/hfsplus/xattr_user.c | 32 +-
+ fs/hugetlbfs/inode.c | 21 +-
+ fs/isofs/Makefile | 2 +
+ fs/isofs/compress.c | 17 +-
+ fs/isofs/export.c | 11 +-
+ fs/isofs/inode.c | 88 ++---
+ fs/isofs/namei.c | 5 +-
+ fs/isofs/rock.c | 44 +--
+ fs/jffs2/background.c | 12 +-
+ fs/jfs/jfs_logmgr.c | 2 +-
+ fs/jfs/super.c | 45 +--
+ fs/mpage.c | 107 ++---
+ fs/notify/fanotify/fanotify_user.c | 17 +-
+ fs/notify/mark.c | 2 +-
+ fs/ntfs/compress.c | 2 +-
+ fs/ntfs/super.c | 4 +-
+ fs/ntfs/sysctl.c | 2 +-
+ fs/ocfs2/cluster/tcp.c | 33 +-
+ fs/ocfs2/dlm/dlmdebug.c | 2 +-
+ fs/ocfs2/dlm/dlmlock.c | 2 +-
+ fs/ocfs2/dlm/dlmmaster.c | 20 +-
+ fs/ocfs2/file.c | 2 +-
+ fs/ocfs2/journal.c | 17 +-
+ fs/ocfs2/namei.c | 145 ++++++-
+ fs/ocfs2/stackglue.c | 2 +-
+ fs/ocfs2/super.c | 8 +-
+ fs/ocfs2/uptodate.c | 2 +-
+ fs/proc/task_mmu.c | 287 ++++++--------
+ fs/pstore/platform.c | 19 +-
+ fs/pstore/ram_core.c | 36 +-
+ fs/readdir.c | 2 +
+ fs/reiserfs/bitmap.c | 13 +-
+ fs/squashfs/squashfs.h | 2 +-
+ fs/ufs/balloc.c | 6 +-
+ include/asm-generic/pgtable.h | 8 +-
+ include/linux/blkdev.h | 4 +
+ include/linux/bootmem.h | 6 +-
+ include/linux/buffer_head.h | 2 -
+ include/linux/crc64_ecma.h | 56 +++
+ include/linux/dma-contiguous.h | 9 +-
+ include/linux/gfp.h | 10 +-
+ include/linux/hugetlb.h | 22 +-
+ include/linux/hugetlb_inline.h | 7 +
+ include/linux/idr.h | 13 +-
+ include/linux/input.h | 21 +
+ include/linux/interrupt.h | 4 +-
+ include/linux/mc146818rtc.h | 4 +
+ include/linux/memblock.h | 2 +
+ include/linux/memcontrol.h | 37 +-
+ include/linux/memory_hotplug.h | 14 +-
+ include/linux/mm.h | 72 +++-
+ include/linux/mm_types.h | 2 +-
+ include/linux/mmdebug.h | 15 +-
+ include/linux/mmzone.h | 9 +-
+ include/linux/nmi.h | 12 +-
+ include/linux/page-flags.h | 3 +
+ include/linux/pagemap.h | 30 ++
+ include/linux/ptrace.h | 32 ++
+ include/linux/rcupdate.h | 12 +
+ include/linux/res_counter.h | 40 ++
+ include/linux/scatterlist.h | 2 +-
+ include/linux/sched.h | 13 +-
+ include/linux/shm.h | 3 +-
+ include/linux/signal.h | 21 +-
+ include/linux/slab.h | 19 +-
+ include/linux/slub_def.h | 9 +
+ include/linux/string.h | 1 +
+ include/linux/swap.h | 19 +-
+ include/linux/swapops.h | 2 +-
+ include/linux/swiotlb.h | 2 +
+ include/linux/syscalls.h | 4 +-
+ include/linux/thread_info.h | 2 -
+ include/linux/topology.h | 3 +-
+ include/linux/vm_event_item.h | 4 +
+ include/linux/vmstat.h | 6 +
+ include/linux/zbud.h | 2 +-
+ include/scsi/scsi.h | 2 +-
+ include/trace/events/gfpflags.h | 1 -
+ include/trace/events/vmscan.h | 19 +-
+ include/uapi/linux/shm.h | 8 +-
+ init/Kconfig | 23 +-
+ init/main.c | 75 +++-
+ ipc/compat.c | 2 +-
+ ipc/compat_mq.c | 2 +-
+ ipc/msg.c | 42 +-
+ ipc/sem.c | 22 +-
+ ipc/shm.c | 23 +-
+ ipc/util.c | 12 +-
+ ipc/util.h | 10 +-
+ kernel/acct.c | 6 +-
+ kernel/audit.c | 2 +-
+ kernel/exit.c | 61 +--
+ kernel/fork.c | 20 +-
+ kernel/kexec.c | 1 +
+ kernel/kmod.c | 5 +-
+ kernel/panic.c | 23 +-
+ kernel/printk/printk.c | 317 ++++++++++-----
+ kernel/rcu/update.c | 12 +
+ kernel/res_counter.c | 2 +
+ kernel/signal.c | 94 +++--
+ kernel/sys_ni.c | 2 +
+ kernel/sysctl.c | 11 +
+ kernel/time/sched_clock.c | 4 +
+ kernel/watchdog.c | 49 ++-
+ lib/Kconfig | 14 +
+ lib/Kconfig.debug | 10 +
+ lib/Makefile | 1 +
+ lib/crc64_ecma.c | 341 ++++++++++++++++
+ lib/idr.c | 40 +-
+ lib/libcrc32c.c | 5 +-
+ lib/radix-tree.c | 6 +-
+ lib/scatterlist.c | 4 +-
+ lib/string.c | 8 +-
+ lib/swiotlb.c | 2 +-
+ lib/vsprintf.c | 24 +-
+ lib/xz/Kconfig | 24 +-
+ lib/xz/xz_dec_lzma2.c | 4 +
+ mm/bounce.c | 7 +-
+ mm/compaction.c | 67 ++--
+ mm/dmapool.c | 24 +-
+ mm/filemap.c | 74 +++-
+ mm/fremap.c | 7 +-
+ mm/huge_memory.c | 34 +-
+ mm/hugetlb.c | 355 ++++++++++++-----
+ mm/kmemleak.c | 4 +-
+ mm/memblock.c | 26 +-
+ mm/memcontrol.c | 433 +++++++++------------
+ mm/memory-failure.c | 16 +-
+ mm/memory.c | 25 +-
+ mm/memory_hotplug.c | 146 +++++--
+ mm/mempolicy.c | 268 ++++++-------
+ mm/mempool.c | 2 +
+ mm/migrate.c | 6 +-
+ mm/mmap.c | 30 +-
+ mm/nommu.c | 5 +-
+ mm/page-writeback.c | 10 +-
+ mm/page_alloc.c | 106 ++---
+ mm/page_io.c | 21 +-
+ mm/pagewalk.c | 375 +++++++++++-------
+ mm/rmap.c | 12 +-
+ mm/slab.c | 39 +-
+ mm/slab.h | 49 ++-
+ mm/slab_common.c | 89 ++++-
+ mm/slob.c | 3 +-
+ mm/slub.c | 229 +++++------
+ mm/swap.c | 223 ++++++-----
+ mm/truncate.c | 8 -
+ mm/util.c | 30 ++
+ mm/vmacache.c | 22 +-
+ mm/vmalloc.c | 12 +-
+ mm/vmscan.c | 189 +++++++--
+ mm/vmstat.c | 8 +-
+ mm/zbud.c | 4 +-
+ mm/zsmalloc.c | 2 +-
+ scripts/checkpatch.pl | 46 ++-
+ usr/Kconfig | 77 ----
+ 315 files changed, 6022 insertions(+), 3194 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/xgene-rtc.txt
+ delete mode 100644 arch/alpha/include/asm/scatterlist.h
+ delete mode 100644 arch/arm/include/asm/scatterlist.h
+ delete mode 100644 arch/cris/include/asm/scatterlist.h
+ delete mode 100644 arch/frv/include/asm/scatterlist.h
+ delete mode 100644 arch/ia64/include/asm/scatterlist.h
+ delete mode 100644 arch/m32r/include/asm/scatterlist.h
+ delete mode 100644 arch/microblaze/include/asm/scatterlist.h
+ create mode 100644 arch/mips/dec/platform.c
+ delete mode 100644 arch/mn10300/include/asm/scatterlist.h
+ delete mode 100644 arch/powerpc/include/asm/scatterlist.h
+ delete mode 100644 arch/s390/include/asm/scatterlist.h
+ delete mode 100644 arch/score/include/asm/scatterlist.h
+ delete mode 100644 arch/sparc/include/asm/scatterlist.h
+ delete mode 100644 arch/x86/include/asm/scatterlist.h
+ create mode 100644 drivers/input/leds.c
+ create mode 100644 drivers/rtc/rtc-xgene.c
+ create mode 100644 include/linux/crc64_ecma.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: drivers/gpio/gpio-zevio.c: fix build
+Applying: mm/page_io.c: work around gcc bug
+Applying: arm: convert use of typedef ctl_table to struct ctl_table
+Applying: ia64: convert use of typedef ctl_table to struct ctl_table
+Applying: tile: convert use of typedef ctl_table to struct ctl_table
+Applying: cdrom: convert use of typedef ctl_table to struct ctl_table
+Applying: random: convert use of typedef ctl_table to struct ctl_table
+Applying: parport: convert use of typedef ctl_table to struct ctl_table
+Applying: scsi: convert use of typedef ctl_table to struct ctl_table
+Applying: coda: convert use of typedef ctl_table to struct ctl_table
+Applying: fscache: convert use of typedef ctl_table to struct ctl_table
+Applying: lockd: convert use of typedef ctl_table to struct ctl_table
+Applying: nfs: convert use of typedef ctl_table to struct ctl_table
+Applying: inotify: convert use of typedef ctl_table to struct ctl_table
+Applying: ntfs: convert use of typedef ctl_table to struct ctl_table
+Applying: fs: convert use of typedef ctl_table to struct ctl_table
+Applying: key: convert use of typedef ctl_table to struct ctl_table
+Applying: ipc: convert use of typedef ctl_table to struct ctl_table
+Applying: sysctl: convert use of typedef ctl_table to struct ctl_table
+Applying: mm: convert use of typedef ctl_table to struct ctl_table
+Applying: mfd/rtc: sec/s5m: rename SEC* symbols to S5M
+Applying: rtc: s5m: remove undocumented time init on first boot
+Applying: rtc: s5m: use shorter time of register update
+Applying: rtc: s5m: support different register layout
+Applying: rtc: s5m: add support for S2MPS14 RTC
+Applying: rtc: s5m: consolidate two device type switch statements
+Applying: blackfin/ptrace: call find_vma with the mmap_sem held
+Applying: drivers/w1/w1_int.c: call put_device if device_register fails
+Applying: arm: move arm_dma_limit to setup_dma_zone
+Applying: ufs: sb mutex merge + mutex_destroy
+Applying: mm: add strictlimit knob
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + fae017f6bf6f...ab92c7e64489 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (ab92c7e64489 mm: add strictlimit knob)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-bdi | 8 +
+ arch/arm/kernel/isa.c | 6 +-
+ arch/arm/mm/init.c | 6 +-
+ arch/arm/mm/mm.h | 2 -
+ arch/blackfin/kernel/ptrace.c | 8 +-
+ arch/ia64/kernel/crash.c | 4 +-
+ arch/ia64/kernel/perfmon.c | 6 +-
+ arch/tile/kernel/proc.c | 4 +-
+ drivers/cdrom/cdrom.c | 10 +-
+ drivers/char/random.c | 4 +-
+ drivers/gpio/gpio-zevio.c | 4 +
+ drivers/parport/procfs.c | 58 +++---
+ drivers/rtc/Kconfig | 4 +-
+ drivers/rtc/rtc-s5m.c | 310 +++++++++++++++++++-----------
+ drivers/scsi/scsi_sysctl.c | 6 +-
+ drivers/w1/w1_int.c | 5 +-
+ fs/coda/sysctl.c | 4 +-
+ fs/dcache.c | 2 +-
+ fs/drop_caches.c | 2 +-
+ fs/eventpoll.c | 2 +-
+ fs/file_table.c | 4 +-
+ fs/fscache/main.c | 4 +-
+ fs/inode.c | 2 +-
+ fs/lockd/svc.c | 6 +-
+ fs/nfs/nfs4sysctl.c | 6 +-
+ fs/nfs/sysctl.c | 6 +-
+ fs/notify/inotify/inotify_user.c | 2 +-
+ fs/ntfs/sysctl.c | 4 +-
+ fs/ufs/balloc.c | 30 +--
+ fs/ufs/ialloc.c | 17 +-
+ fs/ufs/super.c | 28 +--
+ fs/ufs/ufs.h | 1 -
+ include/linux/key.h | 2 +-
+ include/linux/mfd/samsung/rtc.h | 86 +++++----
+ ipc/ipc_sysctl.c | 14 +-
+ ipc/mq_sysctl.c | 12 +-
+ kernel/sysctl.c | 2 +-
+ kernel/utsname_sysctl.c | 6 +-
+ mm/backing-dev.c | 35 ++++
+ mm/page-writeback.c | 2 +-
+ mm/page_alloc.c | 12 +-
+ mm/page_io.c | 4 +-
+ 42 files changed, 443 insertions(+), 297 deletions(-)
projects / karo-tx-linux.git / commitdiff