--- /dev/null
+$ date
+Monday 19 May 10:17:44 EST 2014
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 14186fea0cb0 Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux
+Merging origin/master (14186fea0cb0 Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux)
+$ git merge origin/master
+Already up-to-date.
+Merging fixes/master (0be9d8b61c0c powerpc/ppc64: Allow allmodconfig to build (finally !))
+$ git merge fixes/master
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kernel/exceptions-64s.S | 421 ++++++++++++++++-------------------
+ 1 file changed, 186 insertions(+), 235 deletions(-)
+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 (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
+$ git merge metag-fixes/fixes
+Removing arch/metag/include/uapi/asm/resource.h
+Merge made by the 'recursive' strategy.
+ arch/metag/include/asm/barrier.h | 3 +++
+ arch/metag/include/asm/processor.h | 2 ++
+ arch/metag/include/uapi/asm/Kbuild | 2 +-
+ arch/metag/include/uapi/asm/resource.h | 7 -------
+ arch/parisc/include/asm/processor.h | 5 +++++
+ arch/parisc/kernel/sys_parisc.c | 6 +++---
+ fs/exec.c | 6 +++---
+ include/asm-generic/resource.h | 2 +-
+ include/uapi/asm-generic/resource.h | 7 -------
+ mm/Kconfig | 15 +++++++++++++++
+ 10 files changed, 33 insertions(+), 22 deletions(-)
+ delete mode 100644 arch/metag/include/uapi/asm/resource.h
+Merging powerpc-merge/merge (8050936caf12 powerpc: irq work racing with timer interrupt can result in timer interrupt hang)
+$ git merge powerpc-merge/merge
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kernel/time.c | 3 ---
+ arch/powerpc/platforms/powernv/eeh-ioda.c | 3 ++-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+Merging sparc/master (5aa4ecfd0ddb sparc64: Add membar to Niagara2 memcpy code.)
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/pgtable_64.h | 6 ++++--
+ arch/sparc/lib/NG2memcpy.S | 1 +
+ arch/sparc/mm/fault_64.c | 16 +---------------
+ arch/sparc/mm/tsb.c | 14 +++++++++++++-
+ 4 files changed, 19 insertions(+), 18 deletions(-)
+Merging net/master (6bd64ac0f9c2 Merge branch 'stacked_netdevice_locking')
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/net/mdio-gpio.txt | 2 +-
+ arch/s390/net/bpf_jit_comp.c | 2 +-
+ arch/x86/net/bpf_jit_comp.c | 2 +-
+ drivers/infiniband/hw/mlx4/main.c | 67 +-
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 3 +
+ drivers/infiniband/hw/mlx4/qp.c | 8 +
+ drivers/net/bonding/bond_options.c | 1 +
+ drivers/net/ethernet/Kconfig | 12 +
+ drivers/net/ethernet/Makefile | 1 +
+ drivers/net/ethernet/altera/Makefile | 1 +
+ drivers/net/ethernet/altera/altera_msgdma.c | 110 ++--
+ drivers/net/ethernet/altera/altera_msgdmahw.h | 13 +-
+ drivers/net/ethernet/altera/altera_sgdma.c | 181 +++---
+ drivers/net/ethernet/altera/altera_sgdmahw.h | 26 +-
+ drivers/net/ethernet/altera/altera_tse.h | 47 ++
+ drivers/net/ethernet/altera/altera_tse_ethtool.c | 108 ++--
+ drivers/net/ethernet/altera/altera_tse_main.c | 133 ++--
+ drivers/net/ethernet/altera/altera_utils.c | 20 +-
+ drivers/net/ethernet/altera/altera_utils.h | 8 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 10 +-
+ drivers/net/ethernet/ec_bhf.c | 706 +++++++++++++++++++++
+ drivers/net/ethernet/emulex/benet/be_main.c | 6 +
+ drivers/net/ethernet/jme.c | 53 +-
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 6 +
+ drivers/net/ethernet/mellanox/mlx4/qp.c | 35 +
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 54 ++
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 16 -
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 57 +-
+ drivers/net/ethernet/sfc/nic.c | 14 +-
+ drivers/net/ethernet/sun/cassini.c | 2 +-
+ drivers/net/ethernet/ti/cpsw.c | 17 +-
+ drivers/net/macvlan.c | 18 +-
+ drivers/net/phy/mdio-gpio.c | 4 +
+ drivers/net/phy/phy.c | 16 +-
+ drivers/net/phy/phy_device.c | 4 +-
+ drivers/net/usb/cdc_mbim.c | 57 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 5 +-
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/coex.c | 6 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 8 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 9 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 3 +
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 55 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 19 +
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 10 +-
+ drivers/net/xen-netback/common.h | 2 +-
+ drivers/net/xen-netback/interface.c | 30 +-
+ drivers/net/xen-netback/netback.c | 102 ++-
+ drivers/ptp/Kconfig | 3 +-
+ include/linux/if_macvlan.h | 1 +
+ include/linux/if_vlan.h | 3 +-
+ include/linux/mlx4/qp.h | 11 +
+ include/linux/net.h | 15 +-
+ include/linux/netdevice.h | 25 +-
+ include/linux/of_mdio.h | 7 +-
+ include/linux/rtnetlink.h | 5 +
+ include/net/cfg80211.h | 12 +
+ include/net/ip6_route.h | 1 +
+ include/net/netns/ipv4.h | 9 +-
+ include/uapi/linux/nl80211.h | 4 +-
+ net/8021q/vlan.c | 1 +
+ net/8021q/vlan_dev.c | 52 +-
+ net/batman-adv/bat_iv_ogm.c | 2 +
+ net/batman-adv/distributed-arp-table.c | 3 +-
+ net/batman-adv/fragmentation.c | 11 +-
+ net/batman-adv/gateway_client.c | 11 +-
+ net/batman-adv/originator.c | 62 +-
+ net/bridge/br_netfilter.c | 4 +-
+ net/core/dev.c | 76 ++-
+ net/core/neighbour.c | 4 +-
+ net/core/net_namespace.c | 2 +-
+ net/core/rtnetlink.c | 33 +-
+ net/core/skbuff.c | 4 +-
+ net/core/utils.c | 8 +-
+ net/dsa/dsa.c | 3 +-
+ net/ipv4/af_inet.c | 36 ++
+ net/ipv4/fib_semantics.c | 2 +-
+ net/ipv4/inet_connection_sock.c | 8 +-
+ net/ipv4/ip_forward.c | 54 +-
+ net/ipv4/ip_fragment.c | 5 +-
+ net/ipv4/ip_output.c | 51 +-
+ net/ipv4/ip_tunnel.c | 3 +-
+ net/ipv4/ip_vti.c | 5 +-
+ net/ipv4/netfilter/nf_defrag_ipv4.c | 5 +-
+ net/ipv4/ping.c | 6 +-
+ net/ipv4/sysctl_net_ipv4.c | 42 +-
+ net/ipv4/xfrm4_output.c | 32 +-
+ net/ipv4/xfrm4_protocol.c | 19 +-
+ net/ipv6/ip6_output.c | 8 +-
+ net/ipv6/ip6_tunnel.c | 2 +-
+ net/ipv6/ip6_vti.c | 8 +-
+ net/ipv6/ndisc.c | 7 +-
+ net/ipv6/netfilter.c | 6 +-
+ net/ipv6/route.c | 24 +
+ net/ipv6/xfrm6_output.c | 22 +-
+ net/ipv6/xfrm6_protocol.c | 11 +-
+ net/iucv/af_iucv.c | 2 +-
+ net/mac80211/ieee80211_i.h | 1 +
+ net/mac80211/mlme.c | 20 +-
+ net/mac80211/offchannel.c | 27 +-
+ net/mac80211/rx.c | 3 +-
+ net/mac80211/sta_info.c | 3 +-
+ net/mac80211/status.c | 5 +-
+ net/mac80211/trace.h | 4 +-
+ net/mac80211/util.c | 2 +-
+ net/mac80211/vht.c | 9 +-
+ net/netfilter/nf_conntrack_netlink.c | 3 +
+ net/netfilter/nfnetlink.c | 8 +-
+ net/rxrpc/ar-key.c | 2 +-
+ net/wireless/scan.c | 12 +-
+ net/wireless/sme.c | 2 +-
+ 113 files changed, 2166 insertions(+), 742 deletions(-)
+ create mode 100644 drivers/net/ethernet/ec_bhf.c
+Merging ipsec/master (6d004d6cc739 vti: Use the tunnel mark for lookup in the error handlers.)
+$ git merge ipsec/master
+Already up-to-date.
+Merging sound-current/for-linus (665ebe926e7b ALSA: sb_mixer: missing return statement)
+$ git merge sound-current/for-linus
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 ---
+ sound/isa/sb/sb_mixer.c | 14 ++---
+ sound/pci/hda/hda_intel.c | 6 +++
+ sound/pci/hda/patch_hdmi.c | 2 +
+ sound/pci/hda/patch_realtek.c | 3 ++
+ sound/soc/codecs/tlv320aic31xx.c | 2 +-
+ sound/soc/codecs/wm8962.c | 15 ++++--
+ sound/soc/codecs/wm8962.h | 4 ++
+ sound/soc/fsl/fsl_esai.c | 22 +++++---
+ sound/soc/fsl/imx-audmux.c | 2 +-
+ sound/soc/intel/sst-acpi.c | 1 +
+ sound/soc/intel/sst-baytrail-dsp.c | 2 +-
+ sound/soc/intel/sst-baytrail-ipc.c | 8 +++
+ sound/soc/intel/sst-dsp-priv.h | 1 +
+ sound/soc/intel/sst-dsp.c | 1 +
+ sound/soc/intel/sst-dsp.h | 1 +
+ sound/soc/intel/sst-firmware.c | 25 +++------
+ sound/soc/intel/sst-haswell-dsp.c | 4 +-
+ sound/soc/intel/sst-haswell-ipc.c | 31 ++++++++++-
+ sound/soc/intel/sst-haswell-ipc.h | 4 +-
+ sound/soc/intel/sst-haswell-pcm.c | 107 ++++++++++++++++++++++++-------------
+ sound/soc/sh/rcar/core.c | 5 +-
+ sound/soc/soc-dapm.c | 14 +++--
+ sound/soc/soc-pcm.c | 2 +-
+ 24 files changed, 190 insertions(+), 92 deletions(-)
+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 (faf1dc64e345 ath9k_htc: Stop ANI before doing hw_reset)
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (555724a831b4 kernfs, sysfs, cgroup: restrict extra perm check on open to sysfs)
+$ git merge driver-core.current/driver-core-linus
+Merge made by the 'recursive' strategy.
+ fs/kernfs/file.c | 17 ++++++++++-------
+ fs/sysfs/mount.c | 3 ++-
+ include/linux/kernfs.h | 19 ++++++++++++++++++-
+ 3 files changed, 30 insertions(+), 9 deletions(-)
+Merging tty.current/tty-linus (62a0d8d7c2b2 tty: Fix lockless tty buffer race)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (6ed07d45d09b USB: Nokia 5300 should be treated as unusual dev)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+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 (bb4e506565cf staging: rtl8723au: Do not reset wdev->iftype in netdev_close())
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/imx53-mba53.dts | 2 +-
+ drivers/staging/imx-drm/imx-drm-core.c | 7 ++++++-
+ drivers/staging/imx-drm/imx-tve.c | 2 +-
+ drivers/staging/rtl8723au/os_dep/os_intfs.c | 2 --
+ drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 2 +-
+ 5 files changed, 9 insertions(+), 6 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 (0b5fe736fe92 Input: synaptics - add min/max quirk for the ThinkPad W540)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/keyboard/Kconfig | 2 +-
+ drivers/input/keyboard/pxa27x_keypad.c | 7 ++++++-
+ drivers/input/mouse/Kconfig | 2 +-
+ drivers/input/mouse/synaptics.c | 8 ++++++++
+ drivers/input/serio/ambakmi.c | 3 ++-
+ drivers/input/touchscreen/Kconfig | 2 +-
+ 6 files changed, 19 insertions(+), 5 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 (3901c1124ec5 crypto: s390 - fix aes,des ctr mode concurrency finding.)
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ arch/s390/crypto/aes_s390.c | 3 +++
+ arch/s390/crypto/des_s390.c | 3 +++
+ drivers/crypto/caam/error.c | 10 +++++++---
+ 3 files changed, 13 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 (e7a23fea64f1 mips: dts: Fix missing device_type="memory" property in memory nodes)
+$ git merge devicetree-current/devicetree/merge
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/ste-ccu8540.dts | 1 +
+ arch/mips/lantiq/dts/easy50712.dts | 1 +
+ arch/mips/ralink/dts/mt7620a_eval.dts | 1 +
+ arch/mips/ralink/dts/rt2880_eval.dts | 1 +
+ arch/mips/ralink/dts/rt3052_eval.dts | 1 +
+ arch/mips/ralink/dts/rt3883_eval.dts | 1 +
+ drivers/of/base.c | 4 ++++
+ include/linux/of.h | 2 +-
+ 8 files changed, 11 insertions(+), 1 deletion(-)
+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 (9bbfd20abe50 drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up-to-date.
+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 (d18135c126e8 ARM: perf: add support for the Cortex-A17 PMU)
+$ git merge arm-perf/for-next/perf
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/pmu.txt | 1 +
+ arch/arm/kernel/perf_event_cpu.c | 1 +
+ arch/arm/kernel/perf_event_v7.c | 12 ++++++++++++
+ 3 files changed, 14 insertions(+)
+Merging arm-soc/for-next (dc58adae36c6 arm-soc: document new merges)
+$ git merge arm-soc/for-next
+Auto-merging drivers/leds/leds-versatile.c
+Removing drivers/input/touchscreen/atmel_tsadcc.c
+Auto-merging drivers/input/touchscreen/Kconfig
+Removing arch/arm/mach-shmobile/include/mach/emev2.h
+Removing arch/arm/mach-shmobile/clock-emev2.c
+Removing arch/arm/mach-at91/include/mach/at91_adc.h
+Auto-merging arch/arm/mach-at91/gpio.h
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/reset/socfpga-reset.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/altr_socfpga.txt | 4 +-
+ .../devicetree/bindings/clock/at91-clock.txt | 128 ++++-
+ .../{arm/altera => reset}/socfpga-reset.txt | 2 +
+ MAINTAINERS | 6 -
+ arch/arm/Kconfig | 1 -
+ arch/arm/arm-soc-for-next-contents.txt | 51 ++
+ arch/arm/boot/dts/Makefile | 5 +-
+ arch/arm/boot/dts/at91-cosino_mega2560.dts | 5 -
+ arch/arm/boot/dts/at91-sama5d3_xplained.dts | 8 +
+ arch/arm/boot/dts/at91sam9261.dtsi | 23 +-
+ arch/arm/boot/dts/at91sam9261ek.dts | 4 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 33 +-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 20 +-
+ arch/arm/boot/dts/at91sam9rl.dtsi | 311 ++++++++++-
+ arch/arm/boot/dts/at91sam9rlek.dts | 99 +++-
+ .../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/sama5d3.dtsi | 67 ++-
+ arch/arm/boot/dts/sama5d3xcm.dtsi | 8 +
+ arch/arm/boot/dts/sama5d3xmb.dtsi | 9 +-
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 15 +-
+ arch/arm/boot/dts/socfpga.dtsi | 118 ++++-
+ arch/arm/boot/dts/socfpga_arria5.dtsi | 26 +-
+ arch/arm/boot/dts/socfpga_arria5_socdk.dts | 21 +-
+ arch/arm/boot/dts/socfpga_cyclone5.dtsi | 26 +-
+ arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 21 +-
+ arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 6 +-
+ arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 50 ++
+ arch/arm/boot/dts/socfpga_vt.dts | 2 +-
+ arch/arm/configs/at91sam9g45_defconfig | 3 +-
+ arch/arm/configs/at91sam9rl_defconfig | 3 +-
+ arch/arm/configs/multi_v7_defconfig | 5 +
+ arch/arm/configs/realview-smp_defconfig | 2 +
+ arch/arm/configs/realview_defconfig | 2 +
+ arch/arm/configs/sama5_defconfig | 1 -
+ arch/arm/configs/shmobile_defconfig | 14 +
+ arch/arm/configs/versatile_defconfig | 3 +
+ arch/arm/mach-at91/at91rm9200_devices.c | 1 +
+ arch/arm/mach-at91/at91sam9260_devices.c | 12 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 1 +
+ arch/arm/mach-at91/at91sam9g45.c | 2 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c | 64 +--
+ arch/arm/mach-at91/at91sam9rl.c | 7 +
+ arch/arm/mach-at91/at91sam9rl_devices.c | 84 ++-
+ arch/arm/mach-at91/board-1arm.c | 2 +-
+ arch/arm/mach-at91/board-afeb-9260v1.c | 1 +
+ arch/arm/mach-at91/board-cam60.c | 1 +
+ arch/arm/mach-at91/board-carmeva.c | 1 +
+ arch/arm/mach-at91/board-cpu9krea.c | 1 +
+ arch/arm/mach-at91/board-cpuat91.c | 2 +
+ arch/arm/mach-at91/board-csb337.c | 2 +-
+ arch/arm/mach-at91/board-csb637.c | 1 +
+ arch/arm/mach-at91/board-eb9200.c | 1 +
+ arch/arm/mach-at91/board-ecbat91.c | 1 +
+ arch/arm/mach-at91/board-eco920.c | 2 +
+ arch/arm/mach-at91/board-flexibity.c | 1 +
+ arch/arm/mach-at91/board-foxg20.c | 1 +
+ arch/arm/mach-at91/board-gsia18s.c | 1 +
+ arch/arm/mach-at91/board-kafa.c | 1 +
+ arch/arm/mach-at91/board-kb9202.c | 1 +
+ arch/arm/mach-at91/board-pcontrol-g20.c | 1 +
+ arch/arm/mach-at91/board-picotux200.c | 1 +
+ arch/arm/mach-at91/board-rm9200ek.c | 1 +
+ arch/arm/mach-at91/board-rsi-ews.c | 1 +
+ arch/arm/mach-at91/board-sam9-l9260.c | 1 +
+ arch/arm/mach-at91/board-sam9260ek.c | 1 +
+ arch/arm/mach-at91/board-sam9261ek.c | 1 +
+ arch/arm/mach-at91/board-sam9263ek.c | 1 +
+ arch/arm/mach-at91/board-sam9g20ek.c | 1 +
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 17 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 17 +-
+ arch/arm/mach-at91/board-snapper9260.c | 1 +
+ arch/arm/mach-at91/board-stamp9g20.c | 1 +
+ arch/arm/mach-at91/board-yl-9200.c | 1 +
+ arch/arm/mach-at91/board.h | 3 -
+ arch/arm/mach-at91/gpio.c | 1 +
+ arch/arm/mach-at91/{include/mach => }/gpio.h | 8 -
+ arch/arm/mach-at91/include/mach/at91_adc.h | 107 ----
+ arch/arm/mach-at91/include/mach/hardware.h | 15 +
+ arch/arm/mach-at91/leds.c | 1 +
+ arch/arm/mach-at91/pm.c | 1 +
+ arch/arm/mach-bcm/Kconfig | 8 -
+ arch/arm/mach-mvebu/Kconfig | 6 -
+ arch/arm/mach-qcom/Kconfig | 2 -
+ arch/arm/mach-realview/core.c | 15 +
+ arch/arm/mach-realview/core.h | 1 +
+ arch/arm/mach-realview/realview_eb.c | 1 +
+ arch/arm/mach-realview/realview_pb1176.c | 1 +
+ arch/arm/mach-realview/realview_pb11mp.c | 1 +
+ arch/arm/mach-realview/realview_pba8.c | 1 +
+ arch/arm/mach-realview/realview_pbx.c | 1 +
+ 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 +
+ arch/arm/mach-versatile/core.c | 16 +
+ arch/arm/plat-versatile/Kconfig | 6 -
+ arch/arm/plat-versatile/Makefile | 1 -
+ drivers/clk/at91/Makefile | 4 +-
+ drivers/clk/at91/clk-main.c | 577 ++++++++++++++++++---
+ drivers/clk/at91/clk-slow.c | 467 +++++++++++++++++
+ drivers/clk/at91/pmc.c | 17 +
+ drivers/clk/at91/pmc.h | 9 +
+ drivers/clk/at91/sckc.c | 57 ++
+ drivers/clk/at91/sckc.h | 22 +
+ drivers/iio/adc/at91_adc.c | 340 ++++++++++--
+ drivers/input/touchscreen/Kconfig | 12 -
+ drivers/input/touchscreen/Makefile | 1 -
+ drivers/input/touchscreen/atmel_tsadcc.c | 358 -------------
+ drivers/leds/Kconfig | 8 +
+ drivers/leds/Makefile | 1 +
+ .../leds.c => drivers/leds/leds-versatile.c | 51 +-
+ drivers/reset/Makefile | 1 +
+ drivers/reset/reset-socfpga.c | 146 ++++++
+ include/dt-bindings/clock/r8a7790-clock.h | 7 +-
+ include/dt-bindings/clock/r8a7791-clock.h | 5 +-
+ include/dt-bindings/reset/altr,rst-mgr.h | 90 ++++
+ include/linux/clk/at91_pmc.h | 1 +
+ include/linux/platform_data/at91_adc.h | 27 +-
+ include/linux/platform_data/atmel.h | 7 -
+ sound/soc/atmel/sam9g20_wm8731.c | 1 -
+ 151 files changed, 3578 insertions(+), 1488 deletions(-)
+ rename Documentation/devicetree/bindings/{arm/altera => reset}/socfpga-reset.txt (85%)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/r8a7791-henninger.dts
+ create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_socrates.dts
+ rename arch/arm/mach-at91/{include/mach => }/gpio.h (96%)
+ delete mode 100644 arch/arm/mach-at91/include/mach/at91_adc.h
+ delete mode 100644 arch/arm/mach-shmobile/clock-emev2.c
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/emev2.h
+ create mode 100644 drivers/clk/at91/clk-slow.c
+ create mode 100644 drivers/clk/at91/sckc.c
+ create mode 100644 drivers/clk/at91/sckc.h
+ delete mode 100644 drivers/input/touchscreen/atmel_tsadcc.c
+ rename arch/arm/plat-versatile/leds.c => drivers/leds/leds-versatile.c (68%)
+ create mode 100644 drivers/reset/reset-socfpga.c
+ create mode 100644 include/dt-bindings/reset/altr,rst-mgr.h
+Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging berlin/berlin/for-next (95e39d776f69 Merge branch 'topic/clk-driver' 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 +
+ .../devicetree/bindings/clock/berlin2-clock.txt | 169 +++++++
+ arch/arm/boot/dts/Makefile | 3 +-
+ arch/arm/boot/dts/berlin2.dtsi | 322 +++++++++++--
+ arch/arm/boot/dts/berlin2cd.dtsi | 307 +++++++++++--
+ arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 39 ++
+ arch/arm/boot/dts/berlin2q.dtsi | 384 ++++++++++++++++
+ arch/arm/mach-berlin/Kconfig | 6 +
+ drivers/clk/Makefile | 1 +
+ drivers/clk/berlin/Makefile | 3 +
+ drivers/clk/berlin/berlin2-avpll.c | 368 +++++++++++++++
+ drivers/clk/berlin/berlin2-div.c | 324 +++++++++++++
+ drivers/clk/berlin/berlin2-div.h | 80 ++++
+ drivers/clk/berlin/berlin2-pll.c | 168 +++++++
+ drivers/clk/berlin/bg2.c | 509 +++++++++++++++++++++
+ include/dt-bindings/clock/berlin2.h | 35 ++
+ 17 files changed, 2666 insertions(+), 58 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/berlin2-clock.txt
+ create mode 100644 arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+ create mode 100644 arch/arm/boot/dts/berlin2q.dtsi
+ create mode 100644 drivers/clk/berlin/Makefile
+ create mode 100644 drivers/clk/berlin/berlin2-avpll.c
+ create mode 100644 drivers/clk/berlin/berlin2-div.c
+ create mode 100644 drivers/clk/berlin/berlin2-div.h
+ create mode 100644 drivers/clk/berlin/berlin2-pll.c
+ create mode 100644 drivers/clk/berlin/bg2.c
+ create mode 100644 include/dt-bindings/clock/berlin2.h
+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 (931c18d1ce61 Merge branch 'imx/dt' into for-next)
+$ git merge imx-mxs/for-next
+Removing arch/arm/mach-imx/mach-mx51_babbage.c
+Removing arch/arm/mach-imx/mach-cpuimx51sd.c
+Removing arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
+Auto-merging arch/arm/boot/dts/imx53.dtsi
+Auto-merging arch/arm/boot/dts/imx53-mba53.dts
+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/clock/imx6sx-clock.txt | 13 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm/Kconfig.debug | 22 +-
+ arch/arm/boot/dts/Makefile | 5 +
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 13 +
+ arch/arm/boot/dts/imx25-karo-tx25.dts | 77 +++
+ arch/arm/boot/dts/imx25-pdk.dts | 217 ++++++++-
+ arch/arm/boot/dts/imx25.dtsi | 46 +-
+ arch/arm/boot/dts/imx27-pdk.dts | 170 ++++++-
+ arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 4 +
+ arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 116 ++++-
+ 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 | 68 +++
+ arch/arm/boot/dts/imx35.dtsi | 25 +-
+ arch/arm/boot/dts/imx50.dtsi | 1 +
+ arch/arm/boot/dts/imx51-babbage.dts | 374 +++++++++-----
+ 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 | 120 +++++
+ arch/arm/boot/dts/imx51.dtsi | 3 +
+ arch/arm/boot/dts/imx53-mba53.dts | 4 +
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 21 +
+ arch/arm/boot/dts/imx53.dtsi | 3 +-
+ arch/arm/boot/dts/imx6dl-hummingboard.dts | 31 ++
+ arch/arm/boot/dts/imx6dl-phytec-pbab01.dts | 19 +
+ arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi | 22 +
+ arch/arm/boot/dts/imx6dl-riotboard.dts | 539 +++++++++++++++++++++
+ arch/arm/boot/dts/imx6dl.dtsi | 3 +-
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 40 +-
+ arch/arm/boot/dts/imx6q-gk802.dts | 7 +-
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 5 +
+ arch/arm/boot/dts/imx6q-phytec-pbab01.dts | 33 +-
+ arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 307 +-----------
+ arch/arm/boot/dts/imx6q-udoo.dts | 23 +
+ arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 27 ++
+ arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 5 +
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 45 ++
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 24 +
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 24 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 4 +
+ arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 102 ++++
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 356 ++++++++++++++
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 4 +
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 65 +++
+ 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 | 7 +-
+ arch/arm/include/debug/imx-uart.h | 11 +
+ arch/arm/include/debug/vf.S | 15 +-
+ arch/arm/mach-imx/Kconfig | 69 +--
+ arch/arm/mach-imx/Makefile | 6 +-
+ arch/arm/mach-imx/avic.c | 4 +-
+ arch/arm/mach-imx/clk-gate2.c | 47 +-
+ arch/arm/mach-imx/clk-imx1.c | 41 +-
+ 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-imx6sx.c | 524 ++++++++++++++++++++
+ arch/arm/mach-imx/clk.h | 13 +-
+ arch/arm/mach-imx/common.h | 15 +-
+ arch/arm/mach-imx/cpu.c | 3 +
+ arch/arm/mach-imx/devices/platform-mx2-emma.c | 2 +-
+ arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 231 ---------
+ arch/arm/mach-imx/imx25-dt.c | 1 -
+ arch/arm/mach-imx/imx27-dt.c | 1 -
+ arch/arm/mach-imx/imx31-dt.c | 1 -
+ arch/arm/mach-imx/imx35-dt.c | 1 -
+ arch/arm/mach-imx/imx51-dt.c | 1 -
+ arch/arm/mach-imx/mach-apf9328.c | 1 -
+ arch/arm/mach-imx/mach-armadillo5x0.c | 1 -
+ arch/arm/mach-imx/mach-bug.c | 1 -
+ arch/arm/mach-imx/mach-cpuimx27.c | 1 -
+ arch/arm/mach-imx/mach-cpuimx35.c | 1 -
+ arch/arm/mach-imx/mach-cpuimx51sd.c | 364 --------------
+ arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 -
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 -
+ arch/arm/mach-imx/mach-imx27ipcam.c | 1 -
+ arch/arm/mach-imx/mach-imx27lite.c | 1 -
+ arch/arm/mach-imx/mach-imx50.c | 1 -
+ arch/arm/mach-imx/mach-imx53.c | 1 -
+ arch/arm/mach-imx/mach-imx6sx.c | 51 ++
+ arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 -
+ arch/arm/mach-imx/mach-mx1ads.c | 2 -
+ arch/arm/mach-imx/mach-mx21ads.c | 174 +++----
+ arch/arm/mach-imx/mach-mx25_3ds.c | 1 -
+ arch/arm/mach-imx/mach-mx27_3ds.c | 1 -
+ arch/arm/mach-imx/mach-mx27ads.c | 1 -
+ arch/arm/mach-imx/mach-mx31_3ds.c | 1 -
+ arch/arm/mach-imx/mach-mx31ads.c | 1 -
+ arch/arm/mach-imx/mach-mx31lilly.c | 1 -
+ arch/arm/mach-imx/mach-mx31lite.c | 1 -
+ arch/arm/mach-imx/mach-mx31moboard.c | 1 -
+ arch/arm/mach-imx/mach-mx35_3ds.c | 1 -
+ arch/arm/mach-imx/mach-mx51_babbage.c | 428 ----------------
+ arch/arm/mach-imx/mach-mxt_td60.c | 1 -
+ arch/arm/mach-imx/mach-pca100.c | 4 +-
+ arch/arm/mach-imx/mach-pcm037.c | 1 -
+ arch/arm/mach-imx/mach-pcm038.c | 1 -
+ arch/arm/mach-imx/mach-pcm043.c | 1 -
+ arch/arm/mach-imx/mach-qong.c | 1 -
+ arch/arm/mach-imx/mach-scb9328.c | 1 -
+ arch/arm/mach-imx/mach-vpr200.c | 1 -
+ arch/arm/mach-imx/mxc.h | 6 +
+ arch/arm/mach-imx/time.c | 15 +
+ arch/arm/mach-imx/tzic.c | 4 +-
+ include/dt-bindings/clock/imx6sx-clock.h | 256 ++++++++++
+ 125 files changed, 4409 insertions(+), 1877 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/imx6sx-clock.txt
+ 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/imx6dl-riotboard.dts
+ 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
+ create mode 100644 arch/arm/mach-imx/clk-imx6sx.c
+ delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
+ delete mode 100644 arch/arm/mach-imx/mach-cpuimx51sd.c
+ create mode 100644 arch/arm/mach-imx/mach-imx6sx.c
+ delete mode 100644 arch/arm/mach-imx/mach-mx51_babbage.c
+ create mode 100644 include/dt-bindings/clock/imx6sx-clock.h
+Merging ixp4xx/next (19f949f52599 Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+Merging keystone/next (b17191583568 Merge branch 'for_3.16/dts' into next)
+$ git merge keystone/next
+Auto-merging include/linux/device.h
+Auto-merging drivers/of/platform.c
+Auto-merging arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/configs/sunxi_defconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/k2e-evm.dts | 81 +++++++++++++++++++++++
+ arch/arm/boot/dts/k2hk-evm.dts | 29 +++++++++
+ arch/arm/boot/dts/k2l-evm.dts | 81 +++++++++++++++++++++++
+ arch/arm/boot/dts/keystone.dtsi | 20 ++++--
+ arch/arm/configs/integrator_defconfig | 1 -
+ arch/arm/configs/keystone_defconfig | 2 +-
+ arch/arm/configs/sunxi_defconfig | 1 -
+ arch/arm/configs/vt8500_v6_v7_defconfig | 1 -
+ arch/arm/include/asm/dma-mapping.h | 25 +++++++-
+ arch/arm/mach-keystone/keystone.c | 74 +++++++++++++++++++++
+ arch/arm/mach-keystone/memory.h | 24 +++++++
+ arch/arm/mach-keystone/platsmp.c | 18 +++++-
+ arch/arm/mm/dma-mapping.c | 4 +-
+ drivers/of/address.c | 110 ++++++++++++++++++++++++++++++++
+ drivers/of/platform.c | 65 +++++++++++++++++--
+ include/linux/device.h | 2 +
+ include/linux/dma-mapping.h | 7 ++
+ include/linux/of_address.h | 14 ++++
+ 18 files changed, 538 insertions(+), 21 deletions(-)
+ create mode 100644 arch/arm/mach-keystone/memory.h
+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 (74be6be684a8 Merge branch 'mvebu/dt' into for-next)
+$ git merge mvebu/for-next
+Resolved 'arch/arm/mach-mvebu/Kconfig' using previous resolution.
+Auto-merging drivers/irqchip/irq-armada-370-xp.c
+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
+Removing arch/arm/mach-mvebu/board-t5325.c
+Auto-merging arch/arm/mach-mvebu/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/Kconfig
+Auto-merging arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a7f397a45a91] Merge remote-tracking branch 'mvebu/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../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 | 8 +-
+ arch/arm/boot/dts/armada-370-db.dts | 1 -
+ 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 | 9 +-
+ arch/arm/boot/dts/armada-375.dtsi | 55 ++++
+ arch/arm/boot/dts/armada-380.dtsi | 2 +
+ arch/arm/boot/dts/armada-385-db.dts | 29 +-
+ arch/arm/boot/dts/armada-385-rd.dts | 5 +-
+ arch/arm/boot/dts/armada-385.dtsi | 2 +
+ arch/arm/boot/dts/armada-38x.dtsi | 84 +++++
+ arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 -
+ arch/arm/boot/dts/armada-xp-db.dts | 4 -
+ arch/arm/boot/dts/armada-xp-gp.dts | 4 -
+ 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 | 2 -
+ arch/arm/boot/dts/armada-xp.dtsi | 8 +-
+ arch/arm/boot/dts/kirkwood-6192.dtsi | 35 +-
+ arch/arm/boot/dts/kirkwood-6281.dtsi | 35 +-
+ arch/arm/boot/dts/kirkwood-6282.dtsi | 48 +--
+ arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 68 ++--
+ arch/arm/boot/dts/kirkwood-b3.dts | 7 +-
+ arch/arm/boot/dts/kirkwood-cloudbox.dts | 8 +-
+ arch/arm/boot/dts/kirkwood-db.dtsi | 10 +-
+ arch/arm/boot/dts/kirkwood-dns320.dts | 3 +-
+ arch/arm/boot/dts/kirkwood-dns325.dts | 1 +
+ arch/arm/boot/dts/kirkwood-dnskw.dtsi | 4 +-
+ arch/arm/boot/dts/kirkwood-dockstar.dts | 3 +-
+ arch/arm/boot/dts/kirkwood-dreamplug.dts | 5 +-
+ arch/arm/boot/dts/kirkwood-ds109.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds110jv10.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds111.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds112.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds209.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds210.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds212.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds212j.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds409.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds409slim.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds411.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds411j.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds411slim.dts | 1 +
+ arch/arm/boot/dts/kirkwood-goflexnet.dts | 3 +-
+ .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 14 +-
+ arch/arm/boot/dts/kirkwood-ib62x0.dts | 5 +-
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 3 +-
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 3 +-
+ arch/arm/boot/dts/kirkwood-km_common.dtsi | 48 +++
+ arch/arm/boot/dts/kirkwood-km_fixedeth.dts | 23 ++
+ arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 39 +--
+ arch/arm/boot/dts/kirkwood-laplug.dts | 8 +-
+ arch/arm/boot/dts/kirkwood-lsxl.dtsi | 3 +-
+ arch/arm/boot/dts/kirkwood-mplcec4.dts | 19 +-
+ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 10 +-
+ .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 5 +-
+ .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 5 +-
+ arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 9 +-
+ arch/arm/boot/dts/kirkwood-nsa310.dts | 53 +--
+ arch/arm/boot/dts/kirkwood-nsa310a.dts | 57 +---
+ arch/arm/boot/dts/kirkwood-nsa320.dts | 215 ++++++++++++
+ ...310-common.dtsi => kirkwood-nsa3x0-common.dtsi} | 60 +++-
+ arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 15 +-
+ arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 24 +-
+ arch/arm/boot/dts/kirkwood-openrd-base.dts | 42 +++
+ arch/arm/boot/dts/kirkwood-openrd-client.dts | 73 +++++
+ arch/arm/boot/dts/kirkwood-openrd-ultimate.dts | 58 ++++
+ arch/arm/boot/dts/kirkwood-openrd.dtsi | 90 +++++
+ arch/arm/boot/dts/kirkwood-rd88f6192.dts | 5 +-
+ arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 3 +-
+ arch/arm/boot/dts/kirkwood-rs212.dts | 1 +
+ arch/arm/boot/dts/kirkwood-rs409.dts | 1 +
+ arch/arm/boot/dts/kirkwood-rs411.dts | 1 +
+ arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 7 +-
+ arch/arm/boot/dts/kirkwood-synology.dtsi | 10 +-
+ arch/arm/boot/dts/kirkwood-t5325.dts | 42 ++-
+ arch/arm/boot/dts/kirkwood-topkick.dts | 13 +-
+ arch/arm/boot/dts/kirkwood-ts219-6281.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-ts219-6282.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-ts219.dtsi | 11 +-
+ arch/arm/boot/dts/kirkwood-ts419.dtsi | 2 +-
+ arch/arm/boot/dts/kirkwood.dtsi | 75 ++++-
+ 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/dove_defconfig | 2 +-
+ arch/arm/configs/kirkwood_defconfig | 1 +
+ arch/arm/configs/multi_v5_defconfig | 3 +-
+ arch/arm/configs/mvebu_v5_defconfig | 5 +-
+ arch/arm/configs/mvebu_v7_defconfig | 10 +
+ 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 | 16 +-
+ arch/arm/mach-mvebu/Makefile | 13 +-
+ arch/arm/mach-mvebu/armada-370-xp.h | 2 -
+ arch/arm/mach-mvebu/board-t5325.c | 41 ---
+ arch/arm/mach-mvebu/board-v7.c | 82 ++++-
+ arch/arm/mach-mvebu/board.h | 6 -
+ arch/arm/mach-mvebu/coherency.c | 338 +++++++++++++++++--
+ 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 | 5 +-
+ arch/arm/mach-mvebu/mvebu-soc-id.c | 45 ++-
+ arch/arm/mach-mvebu/mvebu-soc-id.h | 4 +
+ arch/arm/mach-mvebu/platsmp-a9.c | 102 ++++++
+ 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 | 13 +-
+ 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 | 11 +-
+ 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 | 24 +-
+ drivers/irqchip/irq-orion.c | 4 +-
+ drivers/memory/mvebu-devbus.c | 229 ++++++++-----
+ include/linux/mbus.h | 2 +-
+ 156 files changed, 4143 insertions(+), 1849 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/armada-cpu-reset.txt
+ create mode 100644 arch/arm/boot/dts/kirkwood-km_common.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-km_fixedeth.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-nsa320.dts
+ rename arch/arm/boot/dts/{kirkwood-nsa310-common.dtsi => kirkwood-nsa3x0-common.dtsi} (58%)
+ create mode 100644 arch/arm/boot/dts/kirkwood-openrd-base.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-openrd-client.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-openrd.dtsi
+ 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
+ delete mode 100644 arch/arm/mach-mvebu/board-t5325.c
+ 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 (d1b3562bcdfe Merge branch 'heads/r7s72100-ccf-for-v3.16' into next)
+$ git merge renesas/next
+Auto-merging drivers/Makefile
+Auto-merging arch/arm/mach-shmobile/clock-r8a7778.c
+Removing arch/arm/boot/dts/r7s72100-genmai-reference.dts
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 +
+ arch/arm/boot/dts/Makefile | 3 +-
+ arch/arm/boot/dts/r7s72100-genmai-reference.dts | 42 -
+ arch/arm/boot/dts/r7s72100-genmai.dts | 30 +-
+ arch/arm/boot/dts/r7s72100.dtsi | 215 ++++-
+ arch/arm/boot/dts/r8a73a4.dtsi | 18 -
+ .../boot/dts/r8a7740-armadillo800eva-reference.dts | 17 +
+ arch/arm/boot/dts/r8a7740.dtsi | 25 +-
+ arch/arm/boot/dts/r8a7778.dtsi | 18 +-
+ arch/arm/boot/dts/r8a7779-marzen-reference.dts | 1 +
+ arch/arm/boot/dts/r8a7779.dtsi | 21 +-
+ arch/arm/boot/dts/r8a7790-lager.dts | 20 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 13 +-
+ arch/arm/boot/dts/r8a7791-henninger.dts | 139 +++
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 21 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 22 +-
+ arch/arm/mach-shmobile/Kconfig | 11 -
+ arch/arm/mach-shmobile/Makefile | 1 -
+ arch/arm/mach-shmobile/Makefile.boot | 1 -
+ .../board-armadillo800eva-reference.c | 2 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +-
+ arch/arm/mach-shmobile/board-genmai-reference.c | 18 +-
+ arch/arm/mach-shmobile/board-genmai.c | 44 +
+ arch/arm/mach-shmobile/board-koelsch-reference.c | 19 +-
+ arch/arm/mach-shmobile/board-koelsch.c | 2 +-
+ arch/arm/mach-shmobile/board-lager-reference.c | 12 +-
+ arch/arm/mach-shmobile/clock-r7s72100.c | 11 +-
+ arch/arm/mach-shmobile/clock-r8a73a4.c | 2 +-
+ arch/arm/mach-shmobile/clock-r8a7740.c | 12 +-
+ arch/arm/mach-shmobile/clock-r8a7778.c | 4 +-
+ arch/arm/mach-shmobile/clock-r8a7779.c | 4 +-
+ arch/arm/mach-shmobile/clock-r8a7790.c | 2 +-
+ arch/arm/mach-shmobile/clock-r8a7791.c | 2 +-
+ arch/arm/mach-shmobile/clock-sh7372.c | 9 +-
+ arch/arm/mach-shmobile/clock-sh73a0.c | 5 +-
+ arch/arm/mach-shmobile/include/mach/clock.h | 1 +
+ arch/arm/mach-shmobile/include/mach/r8a7740.h | 1 -
+ arch/arm/mach-shmobile/include/mach/r8a7791.h | 1 -
+ arch/arm/mach-shmobile/setup-r7s72100.c | 69 +-
+ arch/arm/mach-shmobile/setup-r8a73a4.c | 17 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c | 141 +--
+ arch/arm/mach-shmobile/setup-r8a7778.c | 28 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 66 +-
+ arch/arm/mach-shmobile/setup-r8a7790.c | 25 +-
+ arch/arm/mach-shmobile/setup-r8a7791.c | 34 +-
+ arch/arm/mach-shmobile/setup-sh7372.c | 89 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c | 92 +-
+ arch/arm/mach-shmobile/timer.c | 23 +-
+ arch/sh/kernel/cpu/clock-cpg.c | 10 +-
+ arch/sh/kernel/cpu/sh2/setup-sh7619.c | 66 +-
+ arch/sh/kernel/cpu/sh2a/clock-sh7264.c | 4 +-
+ arch/sh/kernel/cpu/sh2a/clock-sh7269.c | 4 +-
+ arch/sh/kernel/cpu/sh2a/setup-mxg.c | 98 +--
+ arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 98 +--
+ arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 133 +--
+ arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 164 +---
+ arch/sh/kernel/cpu/sh2a/setup-sh7264.c | 140 +--
+ arch/sh/kernel/cpu/sh2a/setup-sh7269.c | 133 +--
+ arch/sh/kernel/cpu/sh3/setup-sh7705.c | 78 +-
+ arch/sh/kernel/cpu/sh3/setup-sh770x.c | 78 +-
+ arch/sh/kernel/cpu/sh3/setup-sh7710.c | 78 +-
+ arch/sh/kernel/cpu/sh3/setup-sh7720.c | 228 +----
+ arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 78 +-
+ arch/sh/kernel/cpu/sh4/setup-sh7750.c | 138 +--
+ arch/sh/kernel/cpu/sh4/setup-sh7760.c | 78 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 2 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 2 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 6 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 10 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 10 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 12 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 4 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 8 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 16 +-
+ arch/sh/kernel/cpu/sh4a/clock-shx3.c | 8 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 96 +--
+ arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 96 +--
+ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 96 +--
+ arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 172 +---
+ arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 173 +---
+ arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 235 +----
+ arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 48 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 154 +---
+ arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 230 +----
+ arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 154 +---
+ arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 154 +---
+ arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 299 +------
+ arch/sh/kernel/cpu/sh4a/setup-shx3.c | 150 +---
+ arch/sh/kernel/cpu/sh5/setup-sh5.c | 79 +-
+ drivers/Makefile | 2 +-
+ drivers/clocksource/sh_cmt.c | 956 ++++++++++++++-------
+ drivers/clocksource/sh_mtu2.c | 488 +++++++----
+ drivers/clocksource/sh_tmu.c | 541 +++++++-----
+ drivers/sh/Makefile | 14 +-
+ drivers/sh/pm_runtime.c | 20 +-
+ include/dt-bindings/clock/r7s72100-clock.h | 41 +
+ include/dt-bindings/clock/r8a7791-clock.h | 3 +-
+ include/linux/sh_timer.h | 1 +
+ 98 files changed, 2507 insertions(+), 4740 deletions(-)
+ delete mode 100644 arch/arm/boot/dts/r7s72100-genmai-reference.dts
+ create mode 100644 include/dt-bindings/clock/r7s72100-clock.h
+Merging samsung/for-next (16e6ec7ba1b5 Merge branch 'v3.16-next/mcpm-exynos' into for-next)
+$ git merge samsung/for-next
+Auto-merging drivers/clk/Makefile
+Removing arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+Removing arch/arm/mach-s3c24xx/common-s3c2443.c
+Removing arch/arm/mach-s3c24xx/clock-s3c244x.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2443.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2440.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2416.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2412.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2410.c
+Removing arch/arm/mach-s3c24xx/clock-dclk.c
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/exynos/smp-sysram.txt | 38 +
+ .../devicetree/bindings/clock/exynos3250-clock.txt | 41 +
+ .../devicetree/bindings/clock/exynos5260-clock.txt | 190 ++
+ .../bindings/clock/samsung,s3c2410-clock.txt | 50 +
+ .../bindings/clock/samsung,s3c2412-clock.txt | 50 +
+ .../bindings/clock/samsung,s3c2443-clock.txt | 56 +
+ arch/arm/Kconfig | 5 +-
+ arch/arm/Kconfig.debug | 54 +-
+ arch/arm/boot/compressed/head.S | 5 -
+ arch/arm/boot/dts/Makefile | 5 +-
+ arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 475 +++++
+ arch/arm/boot/dts/exynos3250.dtsi | 439 +++++
+ arch/arm/boot/dts/exynos4.dtsi | 18 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 15 +
+ arch/arm/boot/dts/exynos4210.dtsi | 18 +
+ arch/arm/boot/dts/exynos4412-trats2.dts | 79 +-
+ arch/arm/boot/dts/exynos4x12.dtsi | 18 +
+ arch/arm/boot/dts/exynos5250-cros-common.dtsi | 6 +-
+ arch/arm/boot/dts/exynos5250-snow.dts | 159 ++
+ arch/arm/boot/dts/exynos5250.dtsi | 38 +-
+ arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 574 ++++++
+ arch/arm/boot/dts/exynos5260-xyref5260.dts | 103 +
+ arch/arm/boot/dts/exynos5260.dtsi | 304 +++
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 12 -
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 200 ++
+ arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 28 +
+ arch/arm/boot/dts/exynos5420.dtsi | 165 +-
+ arch/arm/boot/dts/exynos5800-peach-pi.dts | 207 ++
+ arch/arm/boot/dts/exynos5800.dtsi | 24 +
+ arch/arm/boot/dts/s3c2416-smdk2416.dts | 13 +
+ arch/arm/boot/dts/s3c2416.dtsi | 42 +
+ arch/arm/configs/exynos_defconfig | 1 +
+ arch/arm/include/debug/s3c24xx.S | 46 +
+ arch/arm/mach-exynos/Kconfig | 8 +
+ arch/arm/mach-exynos/Makefile | 9 +-
+ arch/arm/mach-exynos/common.h | 79 +
+ arch/arm/mach-exynos/cpuidle.c | 1 -
+ arch/arm/mach-exynos/exynos.c | 77 -
+ arch/arm/mach-exynos/firmware.c | 19 +-
+ arch/arm/mach-exynos/hotplug.c | 67 +-
+ arch/arm/mach-exynos/include/mach/map.h | 7 -
+ arch/arm/mach-exynos/mcpm-exynos.c | 351 ++++
+ arch/arm/mach-exynos/platsmp.c | 67 +-
+ arch/arm/mach-exynos/pm.c | 67 +-
+ arch/arm/mach-exynos/pmu.c | 2 -
+ arch/arm/mach-exynos/regs-pmu.h | 16 +-
+ arch/arm/mach-s3c24xx/Kconfig | 68 +-
+ arch/arm/mach-s3c24xx/Makefile | 13 +-
+ arch/arm/mach-s3c24xx/clock-dclk.c | 195 --
+ arch/arm/mach-s3c24xx/clock-s3c2410.c | 284 ---
+ arch/arm/mach-s3c24xx/clock-s3c2412.c | 760 --------
+ arch/arm/mach-s3c24xx/clock-s3c2416.c | 171 --
+ arch/arm/mach-s3c24xx/clock-s3c2440.c | 217 ---
+ arch/arm/mach-s3c24xx/clock-s3c2443.c | 212 ---
+ arch/arm/mach-s3c24xx/clock-s3c244x.c | 141 --
+ arch/arm/mach-s3c24xx/common-s3c2443.c | 675 -------
+ arch/arm/mach-s3c24xx/common.c | 85 +-
+ arch/arm/mach-s3c24xx/common.h | 21 +-
+ arch/arm/mach-s3c24xx/cpufreq-utils.c | 4 +-
+ arch/arm/mach-s3c24xx/include/mach/debug-macro.S | 101 -
+ arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 18 -
+ arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 3 -
+ arch/arm/mach-s3c24xx/mach-amlm5900.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-anubis.c | 34 +-
+ arch/arm/mach-s3c24xx/mach-at2440evb.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-bast.c | 34 +-
+ arch/arm/mach-s3c24xx/mach-gta02.c | 8 +-
+ arch/arm/mach-s3c24xx/mach-h1940.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-jive.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-n30.c | 12 +-
+ arch/arm/mach-s3c24xx/mach-nexcoder.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-osiris.c | 34 +-
+ arch/arm/mach-s3c24xx/mach-otom.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-qt2410.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-rx1950.c | 21 +-
+ arch/arm/mach-s3c24xx/mach-rx3715.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 38 +-
+ arch/arm/mach-s3c24xx/mach-smdk2410.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-smdk2413.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-smdk2440.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-tct_hammer.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-vr1000.c | 34 +-
+ arch/arm/mach-s3c24xx/mach-vstms.c | 9 +-
+ arch/arm/mach-s3c24xx/pm.c | 17 -
+ arch/arm/mach-s3c24xx/s3c2410.c | 56 -
+ arch/arm/mach-s3c24xx/s3c2412.c | 43 -
+ arch/arm/mach-s3c24xx/s3c2442.c | 111 --
+ arch/arm/mach-s3c24xx/s3c244x.c | 59 +-
+ arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 1 +
+ arch/arm/plat-samsung/include/plat/cpu.h | 61 -
+ drivers/clk/Kconfig | 2 +
+ drivers/clk/Makefile | 2 +-
+ drivers/clk/samsung/Kconfig | 26 +
+ drivers/clk/samsung/Makefile | 6 +
+ drivers/clk/samsung/clk-exynos3250.c | 780 ++++++++
+ drivers/clk/samsung/clk-exynos4.c | 51 +-
+ drivers/clk/samsung/clk-exynos5250.c | 41 +-
+ drivers/clk/samsung/clk-exynos5260.c | 1980 ++++++++++++++++++++
+ drivers/clk/samsung/clk-exynos5260.h | 459 +++++
+ drivers/clk/samsung/clk-exynos5420.c | 878 +++++----
+ drivers/clk/samsung/clk-exynos5440.c | 18 +-
+ drivers/clk/samsung/clk-pll.c | 489 ++++-
+ drivers/clk/samsung/clk-pll.h | 8 +
+ drivers/clk/samsung/clk-s3c2410-dclk.c | 440 +++++
+ drivers/clk/samsung/clk-s3c2410.c | 482 +++++
+ drivers/clk/samsung/clk-s3c2412.c | 274 +++
+ drivers/clk/samsung/clk-s3c2443.c | 466 +++++
+ drivers/clk/samsung/clk-s3c64xx.c | 44 +-
+ drivers/clk/samsung/clk.c | 123 +-
+ drivers/clk/samsung/clk.h | 72 +-
+ drivers/clocksource/exynos_mct.c | 8 +
+ drivers/cpufreq/exynos-cpufreq.c | 19 +-
+ drivers/cpufreq/exynos-cpufreq.h | 8 +
+ drivers/cpufreq/exynos4x12-cpufreq.c | 11 +-
+ drivers/cpufreq/s3c24xx-cpufreq.c | 1 +
+ include/dt-bindings/clock/exynos3250.h | 258 +++
+ include/dt-bindings/clock/exynos4.h | 2 +-
+ include/dt-bindings/clock/exynos5250.h | 5 +-
+ include/dt-bindings/clock/exynos5260-clk.h | 469 +++++
+ include/dt-bindings/clock/exynos5420.h | 39 +-
+ include/dt-bindings/clock/s3c2410.h | 62 +
+ include/dt-bindings/clock/s3c2412.h | 73 +
+ include/dt-bindings/clock/s3c2443.h | 92 +
+ 126 files changed, 11461 insertions(+), 4157 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/exynos/smp-sysram.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/exynos3250-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/exynos5260-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2412-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2443-clock.txt
+ create mode 100644 arch/arm/boot/dts/exynos3250-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos3250.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5260-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5260-xyref5260.dts
+ create mode 100644 arch/arm/boot/dts/exynos5260.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5420-peach-pit.dts
+ create mode 100644 arch/arm/boot/dts/exynos5800-peach-pi.dts
+ create mode 100644 arch/arm/boot/dts/exynos5800.dtsi
+ create mode 100644 arch/arm/include/debug/s3c24xx.S
+ create mode 100644 arch/arm/mach-exynos/mcpm-exynos.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-dclk.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2410.c
+ 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-s3c2440.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2443.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c244x.c
+ delete mode 100644 arch/arm/mach-s3c24xx/common-s3c2443.c
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+ create mode 100644 drivers/clk/samsung/Kconfig
+ create mode 100644 drivers/clk/samsung/clk-exynos3250.c
+ create mode 100644 drivers/clk/samsung/clk-exynos5260.c
+ create mode 100644 drivers/clk/samsung/clk-exynos5260.h
+ create mode 100644 drivers/clk/samsung/clk-s3c2410-dclk.c
+ create mode 100644 drivers/clk/samsung/clk-s3c2410.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/exynos3250.h
+ create mode 100644 include/dt-bindings/clock/exynos5260-clk.h
+ create mode 100644 include/dt-bindings/clock/s3c2410.h
+ create mode 100644 include/dt-bindings/clock/s3c2412.h
+ create mode 100644 include/dt-bindings/clock/s3c2443.h
+Merging tegra/for-next (ae3caacb703d 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 | 4 +
+ arch/arm/boot/dts/tegra114-dalmore.dts | 21 +-
+ arch/arm/boot/dts/tegra114-roth.dts | 1113 +++++++++++++++
+ arch/arm/boot/dts/tegra114-tn7.dts | 348 +++++
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 1827 +++++++++++++++++++++++++
+ arch/arm/boot/dts/tegra124-venice2.dts | 42 +-
+ 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/boot/dts/tegra30-colibri-eval-v3.dts | 205 +++
+ arch/arm/boot/dts/tegra30-colibri.dtsi | 377 +++++
+ arch/arm/configs/tegra_defconfig | 10 +
+ arch/arm/mach-tegra/pmc.c | 24 +
+ 13 files changed, 3999 insertions(+), 8 deletions(-)
+ create mode 100644 arch/arm/boot/dts/tegra114-roth.dts
+ create mode 100644 arch/arm/boot/dts/tegra114-tn7.dts
+ create mode 100644 arch/arm/boot/dts/tegra124-jetson-tk1.dts
+ create mode 100644 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+ create mode 100644 arch/arm/boot/dts/tegra30-colibri.dtsi
+Merging arm64/for-next/core (b9acc49ee946 arm64: Fix deadlock scenario with smp_send_stop())
+$ git merge arm64/for-next/core
+Removing arch/arm64/mm/tlb.S
+Removing arch/arm64/include/asm/sigcontext.h
+Merge made by the 'recursive' strategy.
+ arch/arm64/Kconfig | 6 +
+ arch/arm64/Makefile | 1 +
+ arch/arm64/crypto/Kconfig | 53 +++
+ arch/arm64/crypto/Makefile | 38 +++
+ arch/arm64/crypto/aes-ce-ccm-core.S | 222 +++++++++++++
+ arch/arm64/crypto/aes-ce-ccm-glue.c | 297 +++++++++++++++++
+ arch/arm64/crypto/aes-ce-cipher.c | 155 +++++++++
+ arch/arm64/crypto/aes-ce.S | 133 ++++++++
+ arch/arm64/crypto/aes-glue.c | 446 ++++++++++++++++++++++++++
+ arch/arm64/crypto/aes-modes.S | 532 +++++++++++++++++++++++++++++++
+ arch/arm64/crypto/aes-neon.S | 382 ++++++++++++++++++++++
+ arch/arm64/crypto/ghash-ce-core.S | 95 ++++++
+ arch/arm64/crypto/ghash-ce-glue.c | 155 +++++++++
+ arch/arm64/crypto/sha1-ce-core.S | 153 +++++++++
+ arch/arm64/crypto/sha1-ce-glue.c | 174 ++++++++++
+ arch/arm64/crypto/sha2-ce-core.S | 156 +++++++++
+ arch/arm64/crypto/sha2-ce-glue.c | 255 +++++++++++++++
+ arch/arm64/include/asm/Kbuild | 1 +
+ arch/arm64/include/asm/assembler.h | 23 +-
+ arch/arm64/include/asm/atomic.h | 2 +-
+ arch/arm64/include/asm/barrier.h | 20 +-
+ arch/arm64/include/asm/cache.h | 13 +-
+ arch/arm64/include/asm/cacheflush.h | 4 +-
+ arch/arm64/include/asm/cachetype.h | 11 +
+ arch/arm64/include/asm/cmpxchg.h | 7 +-
+ arch/arm64/include/asm/compat.h | 5 -
+ arch/arm64/include/asm/esr.h | 6 +-
+ arch/arm64/include/asm/fpsimd.h | 23 ++
+ arch/arm64/include/asm/fpsimdmacros.h | 35 ++
+ arch/arm64/include/asm/hardirq.h | 2 +-
+ arch/arm64/include/asm/io.h | 8 -
+ arch/arm64/include/asm/neon.h | 6 +-
+ arch/arm64/include/asm/pgtable-hwdef.h | 2 +
+ arch/arm64/include/asm/pgtable.h | 107 ++++---
+ arch/arm64/include/asm/processor.h | 1 +
+ arch/arm64/include/asm/ptrace.h | 5 +
+ arch/arm64/include/asm/sigcontext.h | 31 --
+ arch/arm64/include/asm/thread_info.h | 17 +-
+ arch/arm64/include/asm/tlbflush.h | 44 ++-
+ arch/arm64/include/asm/topology.h | 3 -
+ arch/arm64/include/uapi/asm/sigcontext.h | 7 +
+ arch/arm64/kernel/entry-fpsimd.S | 24 ++
+ arch/arm64/kernel/entry.S | 90 ++----
+ arch/arm64/kernel/fpsimd.c | 186 +++++++++--
+ arch/arm64/kernel/head.S | 8 +-
+ arch/arm64/kernel/hw_breakpoint.c | 2 +-
+ arch/arm64/kernel/process.c | 49 ++-
+ arch/arm64/kernel/ptrace.c | 53 +--
+ arch/arm64/kernel/setup.c | 16 +-
+ arch/arm64/kernel/signal.c | 52 ++-
+ arch/arm64/kernel/signal32.c | 16 +-
+ arch/arm64/kernel/smp.c | 19 ++
+ arch/arm64/kernel/smp_spin_table.c | 39 +--
+ arch/arm64/kernel/topology.c | 212 +++++++++++-
+ arch/arm64/kernel/traps.c | 7 +-
+ arch/arm64/kvm/hyp.S | 12 +-
+ arch/arm64/kvm/sys_regs.c | 4 +-
+ arch/arm64/mm/Makefile | 2 +-
+ arch/arm64/mm/cache.S | 6 +-
+ arch/arm64/mm/dma-mapping.c | 2 +-
+ arch/arm64/mm/fault.c | 8 +-
+ arch/arm64/mm/mmu.c | 64 ++--
+ arch/arm64/mm/proc.S | 2 +-
+ arch/arm64/mm/tlb.S | 71 -----
+ include/asm-generic/unaligned.h | 21 +-
+ 65 files changed, 4146 insertions(+), 455 deletions(-)
+ create mode 100644 arch/arm64/crypto/Kconfig
+ create mode 100644 arch/arm64/crypto/Makefile
+ create mode 100644 arch/arm64/crypto/aes-ce-ccm-core.S
+ create mode 100644 arch/arm64/crypto/aes-ce-ccm-glue.c
+ create mode 100644 arch/arm64/crypto/aes-ce-cipher.c
+ create mode 100644 arch/arm64/crypto/aes-ce.S
+ create mode 100644 arch/arm64/crypto/aes-glue.c
+ create mode 100644 arch/arm64/crypto/aes-modes.S
+ create mode 100644 arch/arm64/crypto/aes-neon.S
+ create mode 100644 arch/arm64/crypto/ghash-ce-core.S
+ create mode 100644 arch/arm64/crypto/ghash-ce-glue.c
+ create mode 100644 arch/arm64/crypto/sha1-ce-core.S
+ create mode 100644 arch/arm64/crypto/sha1-ce-glue.c
+ create mode 100644 arch/arm64/crypto/sha2-ce-core.S
+ create mode 100644 arch/arm64/crypto/sha2-ce-glue.c
+ delete mode 100644 arch/arm64/include/asm/sigcontext.h
+ delete mode 100644 arch/arm64/mm/tlb.S
+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 (e0f96da1182c m68knommu: qspi declutter.)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/include/asm/m525xsim.h | 2 +-
+ arch/m68k/kernel/setup_no.c | 13 ++++++-------
+ arch/m68k/platform/68000/m68EZ328.c | 3 ++-
+ arch/m68k/platform/68000/m68VZ328.c | 1 +
+ arch/m68k/platform/coldfire/m520x.c | 8 ++------
+ arch/m68k/platform/coldfire/m523x.c | 10 ++++------
+ arch/m68k/platform/coldfire/m5249.c | 10 ++++------
+ arch/m68k/platform/coldfire/m525x.c | 2 ++
+ arch/m68k/platform/coldfire/m5272.c | 2 ++
+ arch/m68k/platform/coldfire/m527x.c | 10 ++++------
+ arch/m68k/platform/coldfire/m528x.c | 10 ++++------
+ arch/m68k/platform/coldfire/m53xx.c | 8 ++------
+ 12 files changed, 34 insertions(+), 45 deletions(-)
+Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (14186fea0cb0 Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (b9c9c8964f84 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 | 16 +
+ .../include/asm/mach-ip22/cpu-feature-overrides.h | 4 +
+ arch/mips/include/asm/mipsregs.h | 9 +-
+ arch/mips/include/asm/rm9k-ocd.h | 56 --
+ arch/mips/include/asm/syscall.h | 2 +
+ 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/include/uapi/asm/unistd.h | 9 +-
+ arch/mips/kernel/branch.c | 196 +++++
+ arch/mips/kernel/proc.c | 9 +-
+ arch/mips/kernel/scall32-o32.S | 1 +
+ arch/mips/kernel/scall64-64.S | 1 +
+ arch/mips/kernel/scall64-n32.S | 1 +
+ arch/mips/kernel/scall64-o32.S | 1 +
+ 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 | 16 +-
+ arch/mips/math-emu/cp1emu.c | 889 +++++++--------------
+ 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/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 +-
+ arch/mips/mm/tlb-funcs.S | 4 +-
+ arch/mips/mm/tlbex.c | 7 +-
+ drivers/cpufreq/loongson2_cpufreq.c | 4 +-
+ include/uapi/linux/audit.h | 12 +
+ 86 files changed, 2047 insertions(+), 3191 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
+ 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 (455c6fdbd219 Linux 3.14)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (f6869e7fe657 Merge remote-tracking branch 'anton/abiv2' into next)
+$ git merge powerpc/next
+Resolved 'arch/powerpc/kernel/exceptions-64s.S' using previous resolution.
+Auto-merging arch/powerpc/platforms/powernv/eeh-ioda.c
+Auto-merging arch/powerpc/platforms/44x/ppc476.c
+Auto-merging arch/powerpc/kernel/exceptions-64s.S
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/exceptions-64s.S
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 662b6a118d86] Merge remote-tracking branch 'powerpc/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/powerpc/4xx/akebono.txt | 54 +++
+ .../devicetree/bindings/powerpc/4xx/hsta.txt | 19 +
+ arch/powerpc/Makefile | 16 +-
+ 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/util.S | 4 +-
+ arch/powerpc/boot/wrapper | 20 +-
+ arch/powerpc/boot/zImage.lds.S | 25 +-
+ arch/powerpc/configs/44x/akebono_defconfig | 148 ++++++++
+ arch/powerpc/include/asm/code-patching.h | 40 +-
+ arch/powerpc/include/asm/context_tracking.h | 4 +-
+ arch/powerpc/include/asm/eeh.h | 47 ++-
+ arch/powerpc/include/asm/exception-64e.h | 6 +-
+ arch/powerpc/include/asm/exception-64s.h | 2 +-
+ arch/powerpc/include/asm/ftrace.h | 2 +
+ arch/powerpc/include/asm/irqflags.h | 8 +-
+ arch/powerpc/include/asm/kprobes.h | 5 +-
+ arch/powerpc/include/asm/linkage.h | 2 +
+ arch/powerpc/include/asm/machdep.h | 5 +
+ arch/powerpc/include/asm/module.h | 4 +
+ arch/powerpc/include/asm/opal.h | 1 +
+ arch/powerpc/include/asm/ppc-pci.h | 1 +
+ arch/powerpc/include/asm/ppc_asm.h | 72 ++--
+ arch/powerpc/include/asm/reg.h | 1 +
+ arch/powerpc/include/asm/sections.h | 2 +
+ arch/powerpc/include/asm/string.h | 4 -
+ arch/powerpc/include/asm/systbl.h | 6 +-
+ arch/powerpc/include/uapi/asm/elf.h | 10 +-
+ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 28 +-
+ arch/powerpc/kernel/eeh.c | 211 +++++++----
+ arch/powerpc/kernel/eeh_driver.c | 118 +++++-
+ arch/powerpc/kernel/eeh_pe.c | 47 ++-
+ arch/powerpc/kernel/entry_64.S | 117 +++---
+ arch/powerpc/kernel/exceptions-64e.S | 140 +++----
+ arch/powerpc/kernel/exceptions-64s.S | 200 +++++-----
+ arch/powerpc/kernel/fadump.c | 5 +-
+ arch/powerpc/kernel/ftrace.c | 137 ++-----
+ arch/powerpc/kernel/head_64.S | 117 +++---
+ arch/powerpc/kernel/idle_book3e.S | 2 +-
+ arch/powerpc/kernel/idle_power4.S | 2 +-
+ arch/powerpc/kernel/idle_power7.S | 4 +-
+ arch/powerpc/kernel/legacy_serial.c | 21 +-
+ arch/powerpc/kernel/misc_64.S | 46 ++-
+ arch/powerpc/kernel/module_64.c | 279 +++++++++++---
+ 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/process.c | 17 +-
+ arch/powerpc/kernel/prom_init_check.sh | 2 +-
+ arch/powerpc/kernel/rtas_pci.c | 66 +++-
+ arch/powerpc/kernel/setup-common.c | 16 +-
+ arch/powerpc/kernel/setup_64.c | 2 +-
+ arch/powerpc/kernel/systbl.S | 18 +-
+ arch/powerpc/kernel/tm.S | 53 ++-
+ arch/powerpc/kvm/book3s_hv_interrupts.S | 2 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 34 +-
+ arch/powerpc/lib/Makefile | 2 -
+ arch/powerpc/lib/copypage_64.S | 2 +-
+ arch/powerpc/lib/copypage_power7.S | 12 +-
+ arch/powerpc/lib/copyuser_64.S | 2 +-
+ arch/powerpc/lib/copyuser_power7.S | 32 +-
+ arch/powerpc/lib/hweight_64.S | 8 +-
+ arch/powerpc/lib/mem_64.S | 4 +-
+ arch/powerpc/lib/memcpy_64.S | 26 +-
+ arch/powerpc/lib/memcpy_power7.S | 26 +-
+ arch/powerpc/mm/hash_low_64.S | 44 ++-
+ arch/powerpc/mm/hash_utils_64.c | 61 +--
+ arch/powerpc/mm/slb.c | 12 +-
+ arch/powerpc/mm/slb_low.S | 14 +-
+ 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/85xx/smp.c | 3 +-
+ arch/powerpc/platforms/Kconfig.cputype | 5 +
+ arch/powerpc/platforms/cell/smp.c | 5 +-
+ arch/powerpc/platforms/embedded6xx/Kconfig | 1 +
+ arch/powerpc/platforms/pasemi/powersave.S | 2 +-
+ arch/powerpc/platforms/powernv/eeh-ioda.c | 346 ++++++++++-------
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 4 +
+ arch/powerpc/platforms/powernv/opal-flash.c | 47 ++-
+ arch/powerpc/platforms/powernv/opal-takeover.S | 2 +
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 4 +-
+ 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/powernv/smp.c | 5 +-
+ arch/powerpc/platforms/pseries/eeh_pseries.c | 43 ++-
+ arch/powerpc/platforms/pseries/hvCall.S | 4 +-
+ arch/powerpc/platforms/pseries/setup.c | 4 +
+ arch/powerpc/platforms/pseries/smp.c | 5 +-
+ arch/powerpc/platforms/wsp/scom_smp.c | 3 +-
+ 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 +-
+ .../selftests/powerpc/copyloops/asm/ppc_asm.h | 5 +-
+ 112 files changed, 3593 insertions(+), 1282 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 fsl/next (f9eb581c63b2 powerpc: fix build of epapr_paravirt on 64-bit book3s)
+$ git merge fsl/next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/devicetree/bindings/clock/qoriq-clock.txt
+Merge made by the 'recursive' strategy.
+ .../clock/{corenet-clock.txt => qoriq-clock.txt} | 10 +-
+ Documentation/devicetree/bindings/mfd/bfticu.txt | 25 +++
+ Documentation/devicetree/bindings/mfd/qriox.txt | 17 ++
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/powerpc/boot/dts/kmcoge4.dts | 152 +++++++++++++
+ arch/powerpc/boot/dts/oca4080.dts | 118 ++++++++++
+ arch/powerpc/configs/85xx/kmp204x_defconfig | 225 +++++++++++++++++++
+ arch/powerpc/configs/corenet32_smp_defconfig | 2 +
+ arch/powerpc/configs/corenet64_smp_defconfig | 1 +
+ arch/powerpc/kernel/epapr_paravirt.c | 14 +-
+ arch/powerpc/mm/tlb_nohash.c | 7 +-
+ arch/powerpc/platforms/85xx/Kconfig | 2 +-
+ arch/powerpc/platforms/85xx/corenet_generic.c | 5 +-
+ arch/powerpc/sysdev/fsl_pci.c | 3 +-
+ arch/powerpc/sysdev/fsl_rio.c | 10 +-
+ arch/powerpc/sysdev/fsl_rmu.c | 6 +-
+ drivers/memory/Kconfig | 10 +
+ drivers/memory/Makefile | 1 +
+ drivers/memory/fsl-corenet-cf.c | 246 +++++++++++++++++++++
+ 19 files changed, 844 insertions(+), 11 deletions(-)
+ rename Documentation/devicetree/bindings/clock/{corenet-clock.txt => qoriq-clock.txt} (95%)
+ create mode 100644 Documentation/devicetree/bindings/mfd/bfticu.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/qriox.txt
+ create mode 100644 arch/powerpc/boot/dts/kmcoge4.dts
+ create mode 100644 arch/powerpc/boot/dts/oca4080.dts
+ create mode 100644 arch/powerpc/configs/85xx/kmp204x_defconfig
+ create mode 100644 drivers/memory/fsl-corenet-cf.c
+Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging s390/features (88140456967a s390/spinlock: fix system hang with spin_retry <= 0)
+$ git merge s390/features
+Auto-merging mm/Kconfig
+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/appldata/appldata_mem.c | 1 +
+ 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/include/asm/uaccess.h | 30 +++
+ 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 | 161 +++++++++---
+ 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 +---
+ include/linux/memblock.h | 79 +++++-
+ mm/Kconfig | 3 +
+ mm/memblock.c | 205 ++++++++++-----
+ 50 files changed, 1082 insertions(+), 1009 deletions(-)
+Merging sparc-next/master (bf6569988a48 Merge branch 'sparc32_generic_io_h')
+$ 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/io_32.h | 287 ++++++-----------------------------
+ arch/sparc/include/asm/io_64.h | 1 -
+ arch/sparc/include/asm/irq_32.h | 1 +
+ arch/sparc/include/asm/page.h | 3 +
+ 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.c | 79 ----------
+ arch/sparc/kernel/leon_pci_grpci1.c | 16 +-
+ arch/sparc/kernel/leon_pci_grpci2.c | 22 +--
+ 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/pcic.c | 80 +---------
+ 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/lib/Makefile | 2 +-
+ 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 -
+ 48 files changed, 278 insertions(+), 524 deletions(-)
+ create mode 100644 arch/sparc/mm/mm_32.h
+ delete mode 100644 arch/sparc/mm/srmmu.h
+Merging tile/master (e540e835f89c tile: cleanup the comment in init_pgprot)
+$ git merge tile/master
+Merge made by the 'recursive' strategy.
+ arch/tile/kernel/setup.c | 5 +++--
+ arch/tile/mm/init.c | 6 +++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+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 c277beb6c5df] 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 (55b441be5cd6 xtensa: ISS: don't depend on CONFIG_TTY)
+$ git merge xtensa/for_next
+Already up-to-date.
+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 (0042cf22e164 [CIFS] Clarify SMB2/SMB3 create context and add missing ones)
+$ git merge cifs/for-next
+Auto-merging fs/cifs/inode.c
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsfs.c | 112 +++++++++++++++++++++++++++--------------------------
+ fs/cifs/cifsfs.h | 22 ++++++++---
+ fs/cifs/cifsglob.h | 8 ++--
+ fs/cifs/connect.c | 3 ++
+ fs/cifs/file.c | 16 ++++----
+ fs/cifs/inode.c | 71 +++++++++++++++++++++++++--------
+ fs/cifs/ioctl.c | 2 +-
+ fs/cifs/netmisc.c | 9 +++--
+ fs/cifs/smb2ops.c | 2 +
+ fs/cifs/smb2pdu.c | 12 +++++-
+ fs/cifs/smb2pdu.h | 8 ++--
+ 11 files changed, 167 insertions(+), 98 deletions(-)
+Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (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 (0a9efd1f76c0 ext4: use EXT_MAX_BLOCKS in ext4_es_can_be_merged())
+$ git merge ext4/dev
+Auto-merging mm/page-writeback.c
+Merge made by the 'recursive' strategy.
+ fs/ext4/balloc.c | 66 +++++++------
+ fs/ext4/ext4.h | 59 ++++--------
+ fs/ext4/ext4_extents.h | 22 ++---
+ fs/ext4/ext4_jbd2.c | 7 +-
+ fs/ext4/ext4_jbd2.h | 4 -
+ fs/ext4/extents.c | 229 ++++++++++++++++++++++----------------------
+ fs/ext4/extents_status.c | 10 +-
+ fs/ext4/file.c | 153 ++++++++++++++---------------
+ fs/ext4/inline.c | 15 ++-
+ fs/ext4/inode.c | 87 +++++++++--------
+ fs/ext4/mballoc.c | 6 +-
+ fs/ext4/migrate.c | 2 +-
+ fs/ext4/mmp.c | 4 +-
+ fs/ext4/move_extent.c | 39 ++++----
+ fs/ext4/namei.c | 5 +-
+ fs/ext4/page-io.c | 8 +-
+ fs/ext4/resize.c | 13 +++
+ fs/ext4/super.c | 20 +++-
+ fs/ext4/xattr.c | 9 +-
+ include/linux/page-flags.h | 12 ++-
+ include/trace/events/ext4.h | 9 +-
+ mm/page-writeback.c | 11 ++-
+ 22 files changed, 419 insertions(+), 371 deletions(-)
+Merging f2fs/dev (70ff5dfeb691 f2fs: use inode_init_owner() to simplify codes)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/acl.c | 2 +-
+ fs/f2fs/checkpoint.c | 73 ++++++++--------------
+ fs/f2fs/data.c | 54 +++++++++++-----
+ 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/namei.c | 11 +---
+ fs/f2fs/node.c | 90 ++++++++++++++-------------
+ fs/f2fs/node.h | 19 ++++--
+ fs/f2fs/recovery.c | 26 ++++----
+ fs/f2fs/segment.c | 134 ++++++++++++++++++++++++----------------
+ fs/f2fs/super.c | 32 ++++++++--
+ fs/f2fs/xattr.c | 108 ++++++++++++++++++--------------
+ fs/f2fs/xattr.h | 8 +--
+ include/linux/f2fs_fs.h | 3 +
+ include/trace/events/f2fs.h | 146 +++++++++++++++++++++++++++++++++++++++++++-
+ 18 files changed, 676 insertions(+), 267 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
+Already up-to-date.
+Merging gfs2/master (9dd868e1c009 GFS2: fs/gfs2/file.c: kernel-doc warning fixes)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 2 +-
+ fs/gfs2/bmap.c | 8 ++--
+ fs/gfs2/file.c | 12 +++---
+ fs/gfs2/glops.c | 51 ++++++++++++++--------
+ fs/gfs2/glops.h | 2 +-
+ fs/gfs2/incore.h | 12 ++++--
+ fs/gfs2/inode.c | 40 ++++++++++++-----
+ fs/gfs2/log.c | 93 +++++++++++++++++++++++++++-------------
+ fs/gfs2/log.h | 11 ++++-
+ fs/gfs2/lops.c | 2 +-
+ fs/gfs2/ops_fstype.c | 22 +++++++---
+ fs/gfs2/quota.c | 3 +-
+ fs/gfs2/recovery.c | 22 +++++-----
+ fs/gfs2/rgrp.c | 2 +-
+ fs/gfs2/super.c | 69 ++++++++++++++++++-----------
+ fs/gfs2/sys.c | 4 +-
+ fs/gfs2/trans.c | 44 +++----------------
+ include/uapi/linux/gfs2_ondisk.h | 2 +-
+ 18 files changed, 238 insertions(+), 163 deletions(-)
+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 (baa597b70a45 nfsd4: fill in some missing op_name's)
+$ git merge nfsd/nfsd-next
+Removing include/linux/nfsd/nfsfh.h
+Removing include/linux/nfsd/debug.h
+Auto-merging fs/nfsd/stats.h
+Auto-merging fs/nfsd/export.h
+Merge made by the 'recursive' strategy.
+ fs/lockd/clnt4xdr.c | 2 ++
+ fs/lockd/clntxdr.c | 2 ++
+ fs/lockd/svc.c | 2 +-
+ fs/lockd/svcsubs.c | 3 +-
+ fs/lockd/xdr.c | 2 ++
+ {include/linux => fs}/nfsd/export.h | 11 +++----
+ fs/nfsd/fault_inject.c | 15 ++-------
+ fs/nfsd/nfs4acl.c | 1 -
+ fs/nfsd/nfs4proc.c | 22 ++-----------
+ fs/nfsd/nfs4state.c | 52 +++++++++++++++---------------
+ fs/nfsd/nfsctl.c | 1 -
+ fs/nfsd/nfsd.h | 17 +++++++---
+ fs/nfsd/nfsfh.c | 20 ++++++------
+ fs/nfsd/nfsfh.h | 59 +++++++++++++++++++++++++++++++---
+ fs/nfsd/state.h | 5 +--
+ fs/nfsd/stats.c | 1 -
+ {include/linux => fs}/nfsd/stats.h | 8 ++---
+ include/linux/lockd/lockd.h | 2 +-
+ include/linux/nfsd/debug.h | 19 -----------
+ include/linux/nfsd/nfsfh.h | 63 -------------------------------------
+ include/uapi/linux/nfsd/nfsfh.h | 32 +++++--------------
+ net/sunrpc/cache.c | 2 +-
+ 22 files changed, 132 insertions(+), 209 deletions(-)
+ rename {include/linux => fs}/nfsd/export.h (94%)
+ rename {include/linux => fs}/nfsd/stats.h (91%)
+ delete mode 100644 include/linux/nfsd/debug.h
+ delete mode 100644 include/linux/nfsd/nfsfh.h
+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 (604b592e6fd3 UBI: fix rb_tree node comparison in add_map)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/cdev.c | 2 +-
+ drivers/mtd/ubi/fastmap.c | 4 ++--
+ fs/ubifs/budget.c | 1 -
+ fs/ubifs/file.c | 3 +--
+ 4 files changed, 4 insertions(+), 6 deletions(-)
+Merging xfs/for-next (2d6dcc6d7e95 Merge branch 'xfs-attr-cleanup' into for-next)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/quota/quota.c | 14 +-
+ fs/xfs/xfs_ag.h | 36 ++-
+ fs/xfs/xfs_alloc_btree.c | 1 -
+ fs/xfs/xfs_attr.c | 328 ++++++++-------------
+ 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 | 17 +-
+ fs/xfs/xfs_dir2_sf.c | 21 +-
+ fs/xfs/xfs_dquot.c | 53 +---
+ fs/xfs/xfs_dquot.h | 2 -
+ fs/xfs/xfs_dquot_buf.c | 5 +-
+ fs/xfs/xfs_export.c | 2 +-
+ fs/xfs/xfs_file.c | 10 +-
+ 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_ioctl.c | 5 +-
+ fs/xfs/xfs_ioctl32.c | 5 +-
+ fs/xfs/xfs_iomap.c | 2 +-
+ fs/xfs/xfs_iops.c | 32 +-
+ fs/xfs/xfs_itable.c | 6 +-
+ fs/xfs/xfs_log.c | 9 +-
+ fs/xfs/xfs_log_cil.c | 50 +++-
+ 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 | 243 +++-------------
+ fs/xfs/xfs_qm_syscalls.c | 6 +-
+ fs/xfs/xfs_quota_defs.h | 2 +-
+ fs/xfs/xfs_quotaops.c | 29 +-
+ 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 | 26 +-
+ 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 +-
+ include/linux/quota.h | 1 +
+ 75 files changed, 1654 insertions(+), 1613 deletions(-)
+Merging file-private-locks/linux-next (9f234be73db8 locks: add some tracepoints in the lease handling code)
+$ git merge file-private-locks/linux-next
+Auto-merging fs/locks.c
+Merge made by the 'recursive' strategy.
+ 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 | 37 ++++++++----
+ fs/nfs/file.c | 4 --
+ include/trace/events/filelock.h | 96 ++++++++++++++++++++++++++++++
+ 8 files changed, 129 insertions(+), 43 deletions(-)
+ create mode 100644 include/trace/events/filelock.h
+Merging vfs/for-next (9bd0bc947d95 kill generic_file_splice_write())
+$ git merge vfs/for-next
+Resolved 'fs/cifs/cifsfs.c' using previous resolution.
+Resolved 'fs/f2fs/file.c' using previous resolution.
+Auto-merging fs/xfs/xfs_trace.h
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/ubifs/file.c
+Auto-merging fs/nfs/file.c
+Auto-merging fs/gfs2/file.c
+Auto-merging fs/gfs2/aops.c
+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/file.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ecryptfs/file.c
+Auto-merging fs/cifs/file.c
+Auto-merging fs/cifs/cifsfs.h
+Auto-merging fs/cifs/cifsfs.c
+CONFLICT (content): Merge conflict in fs/cifs/cifsfs.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 027cfb72a3a7] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking | 5 +-
+ Documentation/filesystems/vfs.txt | 13 +-
+ 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 | 69 +--
+ 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/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 +-
+ 101 files changed, 1793 insertions(+), 2042 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 (7d9f168fde18 Merge branch 'for-3.16/rmi4' into for-next)
+$ git merge hid/for-next
+Auto-merging drivers/leds/Kconfig
+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 | 921 ++++++++++++++++++++++
+ drivers/hid/hid-sony.c | 434 +++++++---
+ drivers/hid/hid-thingm.c | 361 +++++----
+ drivers/hid/i2c-hid/i2c-hid.c | 45 +-
+ drivers/leds/Kconfig | 2 +
+ include/linux/hid.h | 2 +
+ include/uapi/linux/input.h | 17 +-
+ 13 files changed, 1530 insertions(+), 310 deletions(-)
+ delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-thingm
+ create mode 100644 drivers/hid/hid-rmi.c
+Merging i2c/i2c/for-next (d7653964c590 i2c: rcar: bail out on zero length transfers)
+$ git merge i2c/i2c/for-next
+Merge made by the 'recursive' strategy.
+ drivers/i2c/busses/i2c-designware-core.c | 3 +++
+ drivers/i2c/busses/i2c-nomadik.c | 2 +-
+ drivers/i2c/busses/i2c-qup.c | 2 +-
+ drivers/i2c/busses/i2c-rcar.c | 9 ++++++++-
+ drivers/i2c/busses/i2c-s3c2410.c | 2 +-
+ 5 files changed, 14 insertions(+), 4 deletions(-)
+Merging jdelvare-hwmon/master (c9eaa447e77e Linux 3.15-rc1)
+$ git merge jdelvare-hwmon/master
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (41c405b35491 hwmon: (emc1403) Add support for emc14x2)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/lm77 | 20 ++-
+ MAINTAINERS | 2 +-
+ drivers/hwmon/adm1029.c | 4 +-
+ drivers/hwmon/emc1403.c | 58 +++++--
+ drivers/hwmon/f71805f.c | 4 +-
+ drivers/hwmon/g762.c | 2 +-
+ drivers/hwmon/gpio-fan.c | 2 +-
+ drivers/hwmon/ibmpex.c | 4 +-
+ drivers/hwmon/iio_hwmon.c | 2 +-
+ 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/ltc2945.c | 2 +-
+ 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 +-
+ 22 files changed, 397 insertions(+), 547 deletions(-)
+Merging v4l-dvb/master (89e2d4278eb8 Merge branch 'patchwork' into to_next)
+$ git merge v4l-dvb/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/media/v4l/io.xml | 13 +-
+ Documentation/DocBook/media/v4l/subdev-formats.xml | 760 +++++++++++++++++++++
+ Documentation/video4linux/CARDLIST.bttv | 1 +
+ Documentation/video4linux/CARDLIST.em28xx | 1 +
+ Documentation/video4linux/v4l2-pci-skeleton.c | 42 +-
+ MAINTAINERS | 20 +
+ drivers/media/dvb-core/dvb-usb-ids.h | 2 +
+ drivers/media/dvb-frontends/Kconfig | 7 +
+ drivers/media/dvb-frontends/Makefile | 1 +
+ drivers/media/dvb-frontends/si2168.c | 760 +++++++++++++++++++++
+ drivers/media/dvb-frontends/si2168.h | 39 ++
+ drivers/media/dvb-frontends/si2168_priv.h | 46 ++
+ drivers/media/i2c/adv7842.c | 10 +-
+ drivers/media/i2c/ov7670.c | 2 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
+ drivers/media/i2c/smiapp-pll.h | 2 +-
+ drivers/media/i2c/smiapp/smiapp-core.c | 12 +-
+ drivers/media/i2c/smiapp/smiapp-quirk.c | 55 +-
+ drivers/media/i2c/smiapp/smiapp-quirk.h | 24 +-
+ drivers/media/i2c/smiapp/smiapp-reg-defs.h | 8 +-
+ drivers/media/i2c/smiapp/smiapp-regs.c | 89 ++-
+ drivers/media/i2c/smiapp/smiapp-regs.h | 19 +-
+ drivers/media/i2c/soc_camera/tw9910.c | 7 +
+ drivers/media/media-device.c | 8 +-
+ drivers/media/media-devnode.c | 5 +-
+ drivers/media/pci/bt8xx/bttv-cards.c | 110 +++
+ drivers/media/pci/bt8xx/bttv.h | 1 +
+ drivers/media/pci/saa7134/saa7134-alsa.c | 107 ++-
+ drivers/media/pci/saa7134/saa7134-core.c | 50 +-
+ drivers/media/pci/saa7134/saa7134-dvb.c | 7 -
+ drivers/media/pci/saa7134/saa7134-empress.c | 43 +-
+ drivers/media/pci/saa7134/saa7134-i2c.c | 7 -
+ drivers/media/pci/saa7134/saa7134-reg.h | 7 -
+ drivers/media/pci/saa7134/saa7134-ts.c | 17 +-
+ drivers/media/pci/saa7134/saa7134-tvaudio.c | 7 -
+ drivers/media/pci/saa7134/saa7134-vbi.c | 67 +-
+ drivers/media/pci/saa7134/saa7134-video.c | 66 +-
+ drivers/media/pci/saa7134/saa7134.h | 9 +-
+ drivers/media/pci/sta2x11/sta2x11_vip.c | 3 +-
+ drivers/media/platform/blackfin/bfin_capture.c | 6 +-
+ drivers/media/platform/coda.c | 4 +-
+ drivers/media/platform/davinci/vpbe_display.c | 60 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 15 +-
+ drivers/media/platform/davinci/vpif_capture.c | 40 +-
+ drivers/media/platform/davinci/vpif_display.c | 41 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +-
+ drivers/media/platform/exynos4-is/fimc-capture.c | 6 +-
+ drivers/media/platform/exynos4-is/fimc-core.c | 8 +-
+ drivers/media/platform/exynos4-is/fimc-isp-video.c | 5 +-
+ drivers/media/platform/exynos4-is/fimc-lite.c | 6 +-
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 9 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 7 +-
+ drivers/media/platform/mem2mem_testdev.c | 5 +-
+ drivers/media/platform/s3c-camif/camif-capture.c | 4 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 122 ++--
+ drivers/media/platform/s5p-jpeg/jpeg-core.h | 6 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 3 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 3 +-
+ drivers/media/platform/s5p-tv/mixer_video.c | 3 +-
+ drivers/media/platform/soc_camera/atmel-isi.c | 6 +-
+ drivers/media/platform/soc_camera/mx2_camera.c | 4 +-
+ drivers/media/platform/soc_camera/mx3_camera.c | 4 +-
+ drivers/media/platform/soc_camera/rcar_vin.c | 4 +-
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 4 +-
+ drivers/media/platform/soc_camera/soc_camera.c | 8 +
+ drivers/media/platform/vivi.c | 3 +-
+ drivers/media/platform/vsp1/vsp1_video.c | 4 +-
+ drivers/media/tuners/Kconfig | 7 +
+ drivers/media/tuners/Makefile | 1 +
+ drivers/media/tuners/fc2580.c | 6 +-
+ drivers/media/tuners/fc2580_priv.h | 1 +
+ drivers/media/tuners/si2157.c | 260 +++++++
+ drivers/media/tuners/si2157.h | 34 +
+ drivers/media/tuners/si2157_priv.h | 37 +
+ drivers/media/usb/dvb-usb-v2/Makefile | 1 -
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 54 +-
+ drivers/media/usb/em28xx/Kconfig | 2 +
+ drivers/media/usb/em28xx/em28xx-cards.c | 25 +
+ drivers/media/usb/em28xx/em28xx-dvb.c | 89 +++
+ drivers/media/usb/em28xx/em28xx-v4l.h | 2 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 8 +-
+ drivers/media/usb/em28xx/em28xx.h | 1 +
+ drivers/media/usb/gspca/Kconfig | 10 +
+ drivers/media/usb/gspca/Makefile | 2 +
+ drivers/media/usb/gspca/dtcs033.c | 441 ++++++++++++
+ drivers/media/usb/gspca/gl860/gl860-mi2020.c | 464 +++++++------
+ drivers/media/usb/gspca/sonixb.c | 2 -
+ drivers/media/usb/pwc/pwc-if.c | 7 +-
+ drivers/media/usb/s2255/s2255drv.c | 5 +-
+ drivers/media/usb/stk1160/stk1160-v4l.c | 4 +-
+ drivers/media/usb/usbtv/usbtv-video.c | 9 +-
+ drivers/media/v4l2-core/Kconfig | 4 +
+ drivers/media/v4l2-core/Makefile | 1 +
+ drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 12 +-
+ drivers/media/v4l2-core/v4l2-device.c | 18 +-
+ drivers/media/v4l2-core/v4l2-dv-timings.c | 11 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 10 +-
+ drivers/media/v4l2-core/v4l2-subdev.c | 16 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 695 +++++++++++++------
+ drivers/media/v4l2-core/videobuf2-dvb.c | 336 +++++++++
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.h | 2 -
+ drivers/staging/media/davinci_vpfe/vpfe_video.c | 34 +-
+ drivers/staging/media/davinci_vpfe/vpfe_video.h | 2 -
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 3 +-
+ drivers/staging/media/go7007/go7007-v4l2.c | 3 +-
+ drivers/staging/media/msi3101/sdr-msi3101.c | 24 +-
+ drivers/staging/media/omap24xx/tcm825x.h | 4 +-
+ drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c | 7 +-
+ drivers/staging/media/sn9c102/sn9c102_devtable.h | 2 -
+ drivers/staging/media/sn9c102/sn9c102_hv7131r.c | 23 +-
+ drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 3 +-
+ drivers/staging/media/solo6x10/solo6x10-v4l2.c | 3 +-
+ include/media/davinci/vpbe_display.h | 6 +-
+ include/media/davinci/vpfe_capture.h | 6 +-
+ include/media/media-device.h | 4 +-
+ include/media/media-devnode.h | 3 +-
+ include/media/v4l2-device.h | 8 +
+ include/media/v4l2-subdev.h | 23 +-
+ include/media/videobuf2-core.h | 51 +-
+ include/media/videobuf2-dvb.h | 58 ++
+ include/uapi/linux/v4l2-common.h | 2 +-
+ include/uapi/linux/v4l2-dv-timings.h | 70 ++
+ include/uapi/linux/v4l2-mediabus.h | 14 +-
+ include/uapi/linux/videodev2.h | 1 -
+ 124 files changed, 4719 insertions(+), 1042 deletions(-)
+ create mode 100644 drivers/media/dvb-frontends/si2168.c
+ create mode 100644 drivers/media/dvb-frontends/si2168.h
+ create mode 100644 drivers/media/dvb-frontends/si2168_priv.h
+ create mode 100644 drivers/media/tuners/si2157.c
+ create mode 100644 drivers/media/tuners/si2157.h
+ create mode 100644 drivers/media/tuners/si2157_priv.h
+ create mode 100644 drivers/media/usb/gspca/dtcs033.c
+ create mode 100644 drivers/media/v4l2-core/videobuf2-dvb.c
+ create mode 100644 include/media/videobuf2-dvb.h
+Merging kbuild/for-next (5366c855e0d8 Merge branches 'kbuild/misc' and 'kbuild/kbuild' 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 | 96 ++++++++++++-------
+ arch/x86/Kconfig | 2 +-
+ firmware/Makefile | 34 ++-----
+ init/Kconfig | 73 +++++++++++++++
+ kernel/gcov/Kconfig | 2 +-
+ lib/Kconfig.debug | 2 +-
+ scripts/Makefile.build | 65 +------------
+ scripts/Makefile.extrawarn | 67 ++++++++++++++
+ scripts/Makefile.fwinst | 26 +++---
+ scripts/Makefile.host | 2 +-
+ scripts/Makefile.lib | 10 +-
+ scripts/Makefile.lto | 84 +++++++++++++++++
+ scripts/Makefile.modpost | 7 +-
+ scripts/conmakehash.c | 12 +--
+ scripts/kconfig/streamline_config.pl | 2 +-
+ scripts/link-vmlinux.sh | 2 +-
+ scripts/mkcompile_h | 4 +-
+ scripts/mkmakefile | 15 +--
+ scripts/package/builddeb | 10 +-
+ scripts/patch-kernel | 4 +-
+ scripts/tags.sh | 17 +++-
+ 23 files changed, 534 insertions(+), 179 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 (5d388f74d7cc Merge branch 'for-3.16' into for-next)
+$ git merge libata/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ata/ahci-platform.txt | 13 +-
+ drivers/ata/Kconfig | 11 +-
+ drivers/ata/Makefile | 1 +
+ drivers/ata/acard-ahci.c | 6 +-
+ drivers/ata/ahci.c | 15 ++
+ drivers/ata/ahci.h | 1 +
+ drivers/ata/ahci_imx.c | 177 ++++++++++++++++++++-
+ drivers/ata/ahci_mvebu.c | 127 +++++++++++++++
+ drivers/ata/ata_generic.c | 2 +-
+ drivers/ata/ata_piix.c | 4 +-
+ drivers/ata/libahci.c | 7 +
+ drivers/ata/libata-core.c | 9 ++
+ drivers/ata/libata-scsi.c | 6 +-
+ drivers/ata/libata-sff.c | 9 --
+ drivers/ata/pata_acpi.c | 2 +-
+ drivers/ata/pata_ali.c | 4 +-
+ drivers/ata/pata_amd.c | 4 +-
+ drivers/ata/pata_artop.c | 4 +-
+ drivers/ata/pata_atiixp.c | 2 +-
+ drivers/ata/pata_atp867x.c | 4 +-
+ drivers/ata/pata_bf54x.c | 2 +-
+ drivers/ata/pata_cmd640.c | 4 +-
+ drivers/ata/pata_cmd64x.c | 4 +-
+ drivers/ata/pata_cs5520.c | 6 +-
+ drivers/ata/pata_cs5530.c | 6 +-
+ drivers/ata/pata_cs5535.c | 2 +-
+ drivers/ata/pata_cs5536.c | 2 +-
+ drivers/ata/pata_cypress.c | 2 +-
+ drivers/ata/pata_efar.c | 2 +-
+ drivers/ata/pata_hpt366.c | 4 +-
+ drivers/ata/pata_hpt3x3.c | 4 +-
+ drivers/ata/pata_imx.c | 4 +-
+ drivers/ata/pata_it8213.c | 2 +-
+ drivers/ata/pata_it821x.c | 4 +-
+ drivers/ata/pata_jmicron.c | 2 +-
+ drivers/ata/pata_macio.c | 22 +--
+ drivers/ata/pata_marvell.c | 2 +-
+ drivers/ata/pata_mpc52xx.c | 8 +-
+ drivers/ata/pata_mpiix.c | 2 +-
+ drivers/ata/pata_netcell.c | 2 +-
+ drivers/ata/pata_ninja32.c | 5 +-
+ drivers/ata/pata_ns87410.c | 2 +-
+ drivers/ata/pata_ns87415.c | 4 +-
+ drivers/ata/pata_octeon_cf.c | 50 ++----
+ drivers/ata/pata_oldpiix.c | 2 +-
+ drivers/ata/pata_opti.c | 2 +-
+ drivers/ata/pata_optidma.c | 2 +-
+ drivers/ata/pata_pdc2027x.c | 6 +-
+ drivers/ata/pata_pdc202xx_old.c | 2 +-
+ drivers/ata/pata_piccolo.c | 2 +-
+ drivers/ata/pata_radisys.c | 2 +-
+ drivers/ata/pata_rdc.c | 2 +-
+ drivers/ata/pata_rz1000.c | 4 +-
+ drivers/ata/pata_samsung_cf.c | 4 +-
+ drivers/ata/pata_sc1200.c | 2 +-
+ drivers/ata/pata_scc.c | 2 +-
+ drivers/ata/pata_sch.c | 2 +-
+ drivers/ata/pata_serverworks.c | 4 +-
+ drivers/ata/pata_sil680.c | 4 +-
+ drivers/ata/pata_sis.c | 4 +-
+ drivers/ata/pata_sl82c105.c | 4 +-
+ drivers/ata/pata_triflex.c | 4 +-
+ drivers/ata/pata_via.c | 4 +-
+ drivers/ata/sata_fsl.c | 4 +-
+ drivers/ata/sata_inic162x.c | 4 +-
+ drivers/ata/sata_mv.c | 8 +-
+ drivers/ata/sata_nv.c | 6 +-
+ drivers/ata/sata_rcar.c | 4 +-
+ drivers/ata/sata_sil.c | 6 +-
+ drivers/ata/sata_sil24.c | 10 +-
+ drivers/ata/sata_sis.c | 2 +-
+ drivers/ata/sata_via.c | 2 +-
+ 72 files changed, 484 insertions(+), 175 deletions(-)
+ create mode 100644 drivers/ata/ahci_mvebu.c
+Merging pm/linux-next (07b9b1833cae Merge branch 'acpi-video' into linux-next)
+$ git merge pm/linux-next
+Recorded preimage for 'drivers/cpufreq/exynos-cpufreq.c'
+Recorded preimage for 'drivers/cpufreq/exynos-cpufreq.h'
+Resolved 'arch/mips/loongson/lemote-2f/clock.c' using previous resolution.
+Removing tools/power/acpi/tools/acpidump/acpidump.c
+Auto-merging drivers/cpufreq/exynos-cpufreq.h
+CONFLICT (content): Merge conflict in drivers/cpufreq/exynos-cpufreq.h
+Auto-merging drivers/cpufreq/exynos-cpufreq.c
+CONFLICT (content): Merge conflict in drivers/cpufreq/exynos-cpufreq.c
+Auto-merging arch/mips/loongson/lemote-2f/clock.c
+CONFLICT (content): Merge conflict in arch/mips/loongson/lemote-2f/clock.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/cpufreq/exynos-cpufreq.c'.
+Recorded resolution for 'drivers/cpufreq/exynos-cpufreq.h'.
+[master b1f9bd1e14ca] Merge remote-tracking branch 'pm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 4 +-
+ Documentation/cpu-freq/core.txt | 29 +
+ Documentation/cpu-freq/cpu-drivers.txt | 19 +
+ Documentation/cpu-freq/index.txt | 4 +-
+ Documentation/kernel-parameters.txt | 12 +-
+ Documentation/power/opp.txt | 40 +-
+ Documentation/power/swsusp.txt | 5 +-
+ MAINTAINERS | 2 -
+ arch/arm/mach-davinci/da850.c | 9 +-
+ arch/ia64/include/asm/acpi.h | 1 -
+ arch/mips/loongson/lemote-2f/clock.c | 16 +-
+ drivers/acpi/Kconfig | 17 +
+ drivers/acpi/Makefile | 1 +
+ drivers/acpi/ac.c | 117 +-
+ drivers/acpi/acpi_pad.c | 9 +-
+ drivers/acpi/acpi_platform.c | 1 -
+ drivers/acpi/acpi_processor.c | 1 -
+ drivers/acpi/acpica/Makefile | 1 +
+ drivers/acpi/acpica/acapps.h | 170 +++
+ drivers/acpi/acpica/acevents.h | 5 +-
+ drivers/acpi/acpica/acglobal.h | 142 +--
+ drivers/acpi/acpica/aclocal.h | 17 +-
+ drivers/acpi/acpica/acpredef.h | 4 +
+ drivers/acpi/acpica/actables.h | 60 +-
+ drivers/acpi/acpica/acutils.h | 10 +-
+ drivers/acpi/acpica/evgpe.c | 13 +-
+ drivers/acpi/acpica/evgpeblk.c | 34 +-
+ drivers/acpi/acpica/evgpeinit.c | 12 +-
+ drivers/acpi/acpica/evmisc.c | 3 +-
+ drivers/acpi/acpica/evsci.c | 2 +-
+ drivers/acpi/acpica/evxface.c | 61 +-
+ drivers/acpi/acpica/evxfgpe.c | 7 +-
+ drivers/acpi/acpica/exconfig.c | 82 +-
+ drivers/acpi/acpica/exdump.c | 4 +-
+ drivers/acpi/acpica/hwpci.c | 15 +-
+ drivers/acpi/acpica/rscreate.c | 13 +-
+ drivers/acpi/acpica/tbdata.c | 723 +++++++++++
+ drivers/acpi/acpica/tbfadt.c | 61 +-
+ drivers/acpi/acpica/tbfind.c | 4 +-
+ drivers/acpi/acpica/tbinstal.c | 837 +++++--------
+ drivers/acpi/acpica/tbutils.c | 280 +----
+ drivers/acpi/acpica/tbxface.c | 18 +-
+ drivers/acpi/acpica/tbxfload.c | 87 +-
+ drivers/acpi/acpica/utdecode.c | 74 +-
+ drivers/acpi/acpica/utglobal.c | 26 +-
+ drivers/acpi/acpica/utstring.c | 2 +-
+ drivers/acpi/acpica/utxferror.c | 2 +
+ drivers/acpi/battery.c | 329 ++++-
+ drivers/acpi/blacklist.c | 21 +
+ drivers/acpi/bus.c | 18 +-
+ drivers/acpi/cm_sbs.c | 105 ++
+ drivers/acpi/osl.c | 11 +-
+ drivers/acpi/scan.c | 16 +-
+ drivers/acpi/sleep.c | 1 +
+ drivers/acpi/video.c | 18 +-
+ drivers/base/power/opp.c | 91 --
+ drivers/char/tpm/tpm_ppi.c | 8 +-
+ drivers/cpufreq/Kconfig.arm | 4 +-
+ drivers/cpufreq/Kconfig.x86 | 4 +-
+ drivers/cpufreq/Makefile | 2 +
+ drivers/cpufreq/acpi-cpufreq.c | 9 +-
+ drivers/cpufreq/arm_big_little.c | 16 +-
+ drivers/cpufreq/cpufreq.c | 14 +
+ drivers/cpufreq/cpufreq_opp.c | 110 ++
+ drivers/cpufreq/cpufreq_stats.c | 24 +-
+ drivers/cpufreq/dbx500-cpufreq.c | 8 +-
+ drivers/cpufreq/elanfreq.c | 9 +-
+ drivers/cpufreq/exynos-cpufreq.c | 32 +-
+ drivers/cpufreq/exynos-cpufreq.h | 1 +
+ drivers/cpufreq/exynos5440-cpufreq.c | 30 +-
+ drivers/cpufreq/freq_table.c | 56 +-
+ drivers/cpufreq/intel_pstate.c | 48 +-
+ drivers/cpufreq/longhaul.c | 11 +-
+ drivers/cpufreq/pasemi-cpufreq.c | 10 +-
+ drivers/cpufreq/powernow-k6.c | 14 +-
+ drivers/cpufreq/ppc_cbe_cpufreq.c | 9 +-
+ drivers/cpufreq/s3c2416-cpufreq.c | 40 +-
+ drivers/cpufreq/s3c64xx-cpufreq.c | 15 +-
+ drivers/cpufreq/speedstep-centrino.c | 2 +-
+ drivers/cpuidle/cpuidle.c | 55 +-
+ drivers/cpuidle/governors/menu.c | 17 +-
+ drivers/mfd/db8500-prcmu.c | 19 +-
+ drivers/net/irda/sh_sir.c | 14 +-
+ drivers/pnp/resource.c | 4 +-
+ drivers/powercap/intel_rapl.c | 33 +-
+ drivers/sh/clk/core.c | 20 +-
+ drivers/thermal/cpu_cooling.c | 33 +-
+ include/acpi/acnames.h | 1 +
+ include/acpi/acpi_drivers.h | 5 +
+ include/acpi/acpixf.h | 831 ++++++++----
+ include/acpi/actbl.h | 11 +-
+ include/acpi/actbl1.h | 4 +-
+ include/acpi/actbl2.h | 71 +-
+ include/acpi/actypes.h | 21 +
+ include/acpi/platform/acgcc.h | 11 +
+ include/acpi/platform/aclinux.h | 36 +-
+ include/linux/cpufreq.h | 50 +
+ include/linux/cpuidle.h | 7 +-
+ include/linux/pm_opp.h | 20 -
+ kernel/power/hibernate.c | 25 +-
+ kernel/power/suspend.c | 2 +
+ kernel/sched/idle.c | 20 +-
+ 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 | 1325 ++++++++++++++++++++
+ .../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 | 130 ++
+ tools/power/acpi/tools/acpidump/apdump.c | 451 +++++++
+ tools/power/acpi/tools/acpidump/apfiles.c | 228 ++++
+ tools/power/acpi/tools/acpidump/apmain.c | 351 ++++++
+ tools/power/acpi/tools/ec/Makefile | 22 +
+ tools/power/acpi/tools/ec/ec_access.c | 238 ++++
+ tools/power/cpupower/Makefile | 2 +-
+ .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 2 +-
+ tools/power/cpupower/man/cpupower-frequency-info.1 | 3 +
+ tools/power/cpupower/utils/cpufreq-info.c | 110 +-
+ tools/power/x86/turbostat/turbostat.c | 4 +-
+ 121 files changed, 7070 insertions(+), 2615 deletions(-)
+ create mode 100644 drivers/acpi/acpica/acapps.h
+ create mode 100644 drivers/acpi/acpica/tbdata.c
+ create mode 100644 drivers/acpi/cm_sbs.c
+ create mode 100644 drivers/cpufreq/cpufreq_opp.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 (63745aa72ed1 Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel-soc-dts-thermal' and 'thermal-soc-fixes' of .git into next)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/thermal/armada-thermal.txt | 12 +-
+ .../devicetree/bindings/thermal/exynos-thermal.txt | 50 ++-
+ drivers/thermal/Kconfig | 14 +-
+ drivers/thermal/Makefile | 1 +
+ drivers/thermal/armada_thermal.c | 158 ++++++-
+ drivers/thermal/int3403_thermal.c | 8 +-
+ drivers/thermal/intel_powerclamp.c | 2 +
+ drivers/thermal/intel_soc_dts_thermal.c | 479 +++++++++++++++++++++
+ drivers/thermal/rcar_thermal.c | 9 +-
+ drivers/thermal/samsung/exynos_tmu.c | 86 +++-
+ drivers/thermal/samsung/exynos_tmu.h | 23 +-
+ drivers/thermal/samsung/exynos_tmu_data.c | 211 ++++++++-
+ drivers/thermal/samsung/exynos_tmu_data.h | 31 +-
+ drivers/thermal/spear_thermal.c | 4 +-
+ drivers/thermal/ti-soc-thermal/ti-bandgap.c | 2 +-
+ 15 files changed, 1015 insertions(+), 75 deletions(-)
+ create mode 100644 drivers/thermal/intel_soc_dts_thermal.c
+Merging ieee1394/for-next (b3d681a4fc10 firewire: Use COMPILE_TEST for build testing)
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ drivers/firewire/Kconfig | 2 +-
+ drivers/firewire/net.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+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 (4d340bcee675 Merge branch 'fixes' into next)
+$ git merge slave-dma/next
+Auto-merging arch/arm/common/edma.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/dma/mmp-dma.txt | 11 +-
+ .../devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 75 ++
+ arch/arm/common/edma.c | 28 +-
+ arch/powerpc/boot/dts/mpc8308_p1m.dts | 2 +-
+ arch/powerpc/boot/dts/mpc8308rdb.dts | 2 +-
+ drivers/dma/Kconfig | 14 +
+ drivers/dma/Makefile | 1 +
+ drivers/dma/dw/core.c | 11 +-
+ drivers/dma/dw/pci.c | 10 +-
+ drivers/dma/dw/platform.c | 18 +-
+ drivers/dma/edma.c | 335 +++--
+ drivers/dma/fsldma.c | 306 ++---
+ drivers/dma/mmp_pdma.c | 95 +-
+ drivers/dma/mpc512x_dma.c | 98 +-
+ drivers/dma/sh/shdma-base.c | 90 +-
+ drivers/dma/ste_dma40.c | 182 ++-
+ 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 +-
+ include/linux/shdma-base.h | 1 +
+ 21 files changed, 2280 insertions(+), 446 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 (d4f0e0958dba net: bridge: fix build)
+$ git merge net-next/master
+Resolved 'drivers/net/ethernet/altera/altera_msgdma.c' using previous resolution.
+Resolved 'drivers/net/ethernet/altera/altera_sgdma.c' using previous resolution.
+Resolved 'net/ipv6/xfrm6_output.c' using previous resolution.
+Removing net/tipc/handler.c
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/mac80211/ieee80211_i.h
+Auto-merging net/ipv6/xfrm6_output.c
+CONFLICT (content): Merge conflict in net/ipv6/xfrm6_output.c
+Auto-merging net/ipv6/route.c
+Auto-merging net/ipv6/ip6_vti.c
+Auto-merging net/ipv6/ip6_output.c
+Auto-merging net/ipv4/xfrm4_output.c
+Auto-merging net/ipv4/ip_tunnel.c
+Auto-merging net/core/skbuff.c
+Auto-merging net/core/net_namespace.c
+Auto-merging net/core/dev.c
+Auto-merging net/8021q/vlan_dev.c
+Auto-merging lib/Kconfig.debug
+Auto-merging include/uapi/linux/nl80211.h
+Auto-merging include/uapi/linux/audit.h
+Auto-merging include/net/ip6_route.h
+Auto-merging include/linux/netdevice.h
+Auto-merging include/linux/if_vlan.h
+Auto-merging drivers/net/xen-netback/interface.c
+Auto-merging drivers/net/wireless/iwlwifi/pcie/trans.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/utils.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/scan.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/rs.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/mvm.h
+Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+Auto-merging drivers/net/wireless/iwlwifi/mvm/coex.c
+Auto-merging drivers/net/phy/phy_device.c
+Auto-merging drivers/net/macvlan.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/mlx4.h
+Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
+Auto-merging drivers/net/ethernet/altera/altera_tse_ethtool.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
+CONFLICT (content): Merge conflict in drivers/net/ethernet/altera/altera_msgdma.c
+Auto-merging drivers/net/can/spi/mcp251x.c
+Auto-merging drivers/net/bonding/bond_options.c
+Auto-merging arch/x86/net/bpf_jit_comp.c
+Auto-merging arch/arm/boot/dts/armada-xp-matrix.dts
+Auto-merging arch/arm/boot/dts/am33xx.dtsi
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/net/micrel-ksz9021.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1f23d3822653] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/80211.tmpl | 1 +
+ .../bindings/net/broadcom-systemport.txt | 29 +
+ .../devicetree/bindings/net/cpsw-phy-sel.txt | 4 +-
+ .../devicetree/bindings/net/fixed-link.txt | 30 +
+ .../bindings/net/ieee802154/at86rf230.txt | 23 +
+ .../devicetree/bindings/net/micrel-ksz9021.txt | 49 -
+ .../devicetree/bindings/net/micrel-ksz90x1.txt | 83 +
+ .../devicetree/bindings/net/via-rhine.txt | 17 +
+ Documentation/driver-model/devres.txt | 5 +
+ Documentation/networking/bonding.txt | 44 +-
+ Documentation/networking/cdc_mbim.txt | 339 ++++
+ Documentation/networking/filter.txt | 171 +-
+ MAINTAINERS | 6 +
+ arch/arm/boot/dts/am33xx.dtsi | 2 +
+ arch/arm/boot/dts/am4372.dtsi | 2 +
+ arch/arm/boot/dts/armada-xp-matrix.dts | 4 +
+ arch/arm/boot/dts/vt8500.dtsi | 6 +
+ arch/arm/boot/dts/wm8650.dtsi | 6 +
+ arch/arm/boot/dts/wm8850.dtsi | 6 +
+ arch/sparc/include/asm/checksum_32.h | 12 +
+ arch/sparc/include/asm/checksum_64.h | 12 +
+ arch/x86/include/asm/checksum_64.h | 9 +-
+ arch/x86/net/bpf_jit.S | 77 +-
+ arch/x86/net/bpf_jit_comp.c | 1399 +++++++++--------
+ 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/clk/ti/clk-43xx.c | 16 +
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 2 +-
+ drivers/isdn/hisax/hfc4s8s_l1.c | 111 +-
+ drivers/net/bonding/bond_3ad.c | 62 +-
+ drivers/net/bonding/bond_alb.c | 132 +-
+ drivers/net/bonding/bond_alb.h | 1 +
+ drivers/net/bonding/bond_debugfs.c | 2 +-
+ drivers/net/bonding/bond_main.c | 205 +--
+ drivers/net/bonding/bond_netlink.c | 8 +-
+ drivers/net/bonding/bond_options.c | 66 +-
+ drivers/net/bonding/bond_options.h | 2 +
+ drivers/net/bonding/bond_procfs.c | 16 +-
+ drivers/net/bonding/bond_sysfs.c | 567 ++-----
+ drivers/net/bonding/bond_sysfs_slave.c | 4 +-
+ drivers/net/bonding/bonding.h | 117 +-
+ 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/3com/3c509.c | 2 +-
+ drivers/net/ethernet/3com/3c589_cs.c | 2 +-
+ drivers/net/ethernet/3com/typhoon.c | 2 +-
+ drivers/net/ethernet/adaptec/starfire.c | 2 +-
+ drivers/net/ethernet/alteon/acenic.c | 2 +-
+ drivers/net/ethernet/altera/altera_sgdma.c | 9 +-
+ drivers/net/ethernet/altera/altera_tse_ethtool.c | 2 +-
+ drivers/net/ethernet/amd/amd8111e.c | 2 +-
+ drivers/net/ethernet/amd/ariadne.c | 3 -
+ drivers/net/ethernet/amd/au1000_eth.c | 2 +-
+ drivers/net/ethernet/amd/nmclan_cs.c | 2 +-
+ drivers/net/ethernet/arc/emac_main.c | 49 +
+ drivers/net/ethernet/atheros/alx/main.c | 2 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 2 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 2 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
+ drivers/net/ethernet/broadcom/Kconfig | 11 +
+ drivers/net/ethernet/broadcom/Makefile | 1 +
+ drivers/net/ethernet/broadcom/b44.c | 2 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 1636 ++++++++++++++++++++
+ drivers/net/ethernet/broadcom/bcmsysport.h | 677 ++++++++
+ drivers/net/ethernet/broadcom/bgmac.c | 2 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
+ drivers/net/ethernet/broadcom/tg3.c | 51 +-
+ drivers/net/ethernet/broadcom/tg3.h | 2 +-
+ drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 2 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 19 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 7 +-
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 2 +-
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +-
+ drivers/net/ethernet/dlink/dl2k.c | 2 +-
+ drivers/net/ethernet/dlink/sundance.c | 2 +-
+ drivers/net/ethernet/ec_bhf.c | 20 +-
+ drivers/net/ethernet/emulex/benet/be.h | 14 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 370 ++---
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 4 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 193 ++-
+ drivers/net/ethernet/emulex/benet/be_main.c | 253 +--
+ drivers/net/ethernet/ethoc.c | 6 -
+ drivers/net/ethernet/faraday/ftgmac100.c | 2 +-
+ drivers/net/ethernet/faraday/ftmac100.c | 2 +-
+ drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 2 +-
+ drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 +-
+ drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 2 +-
+ drivers/net/ethernet/ibm/emac/core.c | 2 +-
+ drivers/net/ethernet/icplus/ipg.c | 2 +-
+ drivers/net/ethernet/intel/e100.c | 2 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 8 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 13 +-
+ 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 | 16 +-
+ 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 | 318 +++-
+ 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 | 114 +-
+ drivers/net/ethernet/intel/igb/igb_hwmon.c | 47 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 161 +-
+ drivers/net/ethernet/intel/igbvf/ethtool.c | 2 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 2 +-
+ 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_ethtool.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/ethtool.c | 2 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
+ drivers/net/ethernet/marvell/mvneta.c | 21 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 2 +-
+ drivers/net/ethernet/marvell/sky2.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 99 +-
+ drivers/net/ethernet/mellanox/mlx4/cq.c | 3 +
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx4/en_main.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 22 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 28 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 147 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 24 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 255 ++-
+ drivers/net/ethernet/mellanox/mlx4/mcg.c | 18 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 17 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 40 +-
+ drivers/net/ethernet/mellanox/mlx4/mr.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx4/port.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx4/profile.c | 13 +-
+ drivers/net/ethernet/mellanox/mlx4/qp.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/reset.c | 24 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 73 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 30 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c | 8 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c | 4 +-
+ drivers/net/ethernet/micrel/ks8695net.c | 6 +-
+ drivers/net/ethernet/micrel/ks8851.c | 2 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 3 +-
+ drivers/net/ethernet/microchip/enc28j60.c | 2 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 2 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 2 +-
+ drivers/net/ethernet/neterion/s2io.c | 11 +-
+ drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 2 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 2 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 2 +-
+ .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 6 +-
+ drivers/net/ethernet/packetengines/yellowfin.c | 2 +-
+ drivers/net/ethernet/qlogic/Kconfig | 11 +
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 33 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 44 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 4 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 14 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 13 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 32 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 31 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 66 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 37 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 4 +-
+ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 188 ++-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 119 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 68 +
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +-
+ drivers/net/ethernet/realtek/r8169.c | 2 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 6 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 2 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 50 +-
+ drivers/net/ethernet/sfc/efx.c | 2 +-
+ drivers/net/ethernet/sis/sis190.c | 2 +-
+ drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 7 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 2 +-
+ drivers/net/ethernet/ti/cpmac.c | 14 -
+ drivers/net/ethernet/ti/cpsw-phy-sel.c | 62 +-
+ drivers/net/ethernet/ti/cpsw.c | 114 +-
+ drivers/net/ethernet/ti/cpts.c | 11 +-
+ drivers/net/ethernet/ti/davinci_cpdma.c | 35 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 2 +-
+ drivers/net/ethernet/ti/davinci_mdio.c | 50 +-
+ drivers/net/ethernet/via/Kconfig | 2 +-
+ drivers/net/ethernet/via/via-rhine.c | 506 +++---
+ drivers/net/hyperv/hyperv_net.h | 159 +-
+ drivers/net/hyperv/netvsc.c | 529 ++++---
+ drivers/net/hyperv/netvsc_drv.c | 113 +-
+ drivers/net/hyperv/rndis_filter.c | 193 ++-
+ drivers/net/ieee802154/at86rf230.c | 133 +-
+ drivers/net/irda/Kconfig | 3 +-
+ drivers/net/irda/w83977af_ir.c | 33 +-
+ drivers/net/macvlan.c | 138 +-
+ drivers/net/ntb_netdev.c | 2 +-
+ drivers/net/phy/at803x.c | 39 +-
+ drivers/net/phy/fixed.c | 81 +-
+ drivers/net/phy/mdio_bus.c | 67 +
+ drivers/net/phy/micrel.c | 106 +-
+ drivers/net/phy/phy_device.c | 3 +-
+ drivers/net/phy/smsc.c | 3 +-
+ drivers/net/phy/vitesse.c | 3 +-
+ drivers/net/rionet.c | 2 +-
+ drivers/net/usb/catc.c | 2 +-
+ drivers/net/usb/cdc_mbim.c | 129 +-
+ drivers/net/usb/cdc_ncm.c | 617 +++++---
+ drivers/net/usb/hso.c | 2 +-
+ drivers/net/usb/huawei_cdc_ncm.c | 13 -
+ drivers/net/usb/ipheth.c | 2 +-
+ drivers/net/usb/kaweth.c | 2 +-
+ drivers/net/usb/pegasus.c | 2 +-
+ drivers/net/usb/r8152.c | 2 +-
+ drivers/net/usb/rtl8150.c | 2 +-
+ drivers/net/virtio_net.c | 9 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 +-
+ drivers/net/vxlan.c | 65 +-
+ drivers/net/wan/sdla.c | 4 -
+ 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/hostap/hostap_main.c | 2 +-
+ 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/net/xen-netback/interface.c | 2 +-
+ drivers/net/xen-netfront.c | 2 +-
+ drivers/of/of_mdio.c | 67 +
+ 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 | 18 +-
+ drivers/s390/net/qeth_l3_main.c | 19 +-
+ drivers/staging/et131x/et131x.c | 2 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 2 +-
+ drivers/staging/netlogic/xlr_net.c | 2 +-
+ drivers/staging/octeon/ethernet.c | 2 +-
+ drivers/staging/rtl8821ae/core.c | 14 +-
+ drivers/usb/gadget/u_ether.c | 4 +-
+ include/linux/ethtool.h | 13 +
+ include/linux/filter.h | 102 +-
+ include/linux/if_vlan.h | 4 +-
+ include/linux/mlx4/device.h | 3 +
+ include/linux/netdevice.h | 4 +-
+ include/linux/netlink.h | 3 +-
+ include/linux/nl802154.h | 31 +
+ include/linux/of_mdio.h | 15 +
+ include/linux/phy.h | 8 +
+ include/linux/phy_fixed.h | 11 +
+ include/linux/skbuff.h | 97 +-
+ include/linux/spi/at86rf230.h | 14 -
+ include/linux/tcp.h | 6 +-
+ include/linux/usb/cdc_ncm.h | 35 +-
+ include/net/6lowpan.h | 1 +
+ include/net/addrconf.h | 5 -
+ include/net/af_ieee802154.h | 10 +-
+ include/net/bluetooth/hci.h | 1 +
+ include/net/bluetooth/hci_core.h | 13 +-
+ include/net/cfg80211.h | 86 +-
+ include/net/checksum.h | 2 +
+ include/net/dsa.h | 5 +
+ include/net/ieee802154.h | 9 +
+ include/net/ieee802154_netdev.h | 187 ++-
+ include/net/inet_ecn.h | 2 +-
+ include/net/inet_hashtables.h | 8 +-
+ include/net/inet_sock.h | 10 +
+ include/net/ip.h | 47 +-
+ include/net/ip6_checksum.h | 7 +
+ include/net/ip6_route.h | 2 +-
+ include/net/ipv6.h | 22 +
+ include/net/mac80211.h | 31 +-
+ include/net/net_namespace.h | 8 +
+ include/net/netns/ipv4.h | 7 +
+ include/net/netns/ipv6.h | 1 +
+ include/net/pkt_cls.h | 2 +-
+ include/net/regulatory.h | 6 +
+ include/net/sch_generic.h | 2 +-
+ include/net/snmp.h | 32 +-
+ include/net/tcp.h | 40 +-
+ 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/nl80211.h | 42 +
+ include/uapi/linux/tipc.h | 23 +
+ include/uapi/linux/tipc_config.h | 10 +-
+ kernel/audit.c | 64 +-
+ kernel/seccomp.c | 29 +-
+ kernel/sysctl.c | 4 +-
+ lib/Kconfig.debug | 13 +
+ lib/Makefile | 1 +
+ lib/test_bpf.c | 1546 ++++++++++++++++++
+ net/8021q/vlan_core.c | 6 +-
+ net/8021q/vlan_dev.c | 58 +-
+ net/batman-adv/soft-interface.c | 2 +-
+ 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/bridge/br_device.c | 9 +-
+ net/bridge/br_fdb.c | 131 +-
+ net/bridge/br_if.c | 123 +-
+ net/bridge/br_netfilter.c | 2 +-
+ net/bridge/br_netlink.c | 3 +
+ net/bridge/br_private.h | 19 +
+ net/bridge/br_sysfs_if.c | 30 +-
+ net/bridge/br_vlan.c | 1 +
+ net/core/dev.c | 50 +-
+ net/core/ethtool.c | 223 ++-
+ net/core/filter.c | 640 ++++----
+ net/core/net_namespace.c | 2 +-
+ net/core/pktgen.c | 50 +-
+ net/core/ptp_classifier.c | 2 +-
+ net/core/skbuff.c | 4 +-
+ net/dccp/proto.c | 9 +-
+ net/dccp/sysctl.c | 3 +-
+ net/dsa/slave.c | 2 +-
+ net/ieee802154/6lowpan_rtnl.c | 207 +--
+ net/ieee802154/dgram.c | 104 +-
+ net/ieee802154/header_ops.c | 52 +-
+ net/ieee802154/ieee802154.h | 19 +
+ net/ieee802154/netlink.c | 20 +
+ net/ieee802154/nl-mac.c | 807 ++++++++++
+ net/ieee802154/nl_policy.c | 16 +
+ net/ieee802154/reassembly.c | 48 +-
+ net/ipv4/af_inet.c | 101 +-
+ net/ipv4/devinet.c | 7 +-
+ net/ipv4/gre_demux.c | 24 +-
+ net/ipv4/icmp.c | 23 +-
+ net/ipv4/igmp.c | 12 +-
+ net/ipv4/inet_connection_sock.c | 11 +-
+ net/ipv4/inet_hashtables.c | 6 +-
+ net/ipv4/inetpeer.c | 2 +-
+ net/ipv4/ip_forward.c | 2 +-
+ net/ipv4/ip_gre.c | 6 +-
+ net/ipv4/ip_options.c | 6 +-
+ net/ipv4/ip_output.c | 15 +-
+ net/ipv4/ip_tunnel.c | 9 +-
+ net/ipv4/netfilter/nf_defrag_ipv4.c | 2 +-
+ net/ipv4/proc.c | 24 +-
+ net/ipv4/route.c | 7 +
+ net/ipv4/syncookies.c | 3 +-
+ net/ipv4/sysctl_net_ipv4.c | 45 +-
+ net/ipv4/tcp.c | 8 +
+ net/ipv4/tcp_bic.c | 5 +-
+ net/ipv4/tcp_cong.c | 24 +-
+ net/ipv4/tcp_cubic.c | 5 +-
+ net/ipv4/tcp_fastopen.c | 219 ++-
+ net/ipv4/tcp_highspeed.c | 4 +-
+ net/ipv4/tcp_htcp.c | 4 +-
+ net/ipv4/tcp_hybla.c | 7 +-
+ net/ipv4/tcp_illinois.c | 5 +-
+ net/ipv4/tcp_input.c | 31 +-
+ net/ipv4/tcp_ipv4.c | 303 +---
+ net/ipv4/tcp_lp.c | 5 +-
+ net/ipv4/tcp_minisocks.c | 31 +
+ net/ipv4/tcp_output.c | 100 +-
+ net/ipv4/tcp_scalable.c | 5 +-
+ net/ipv4/tcp_vegas.c | 7 +-
+ net/ipv4/tcp_veno.c | 9 +-
+ net/ipv4/tcp_yeah.c | 5 +-
+ net/ipv4/udp.c | 27 +-
+ net/ipv4/xfrm4_output.c | 2 +-
+ net/ipv6/addrconf.c | 49 +-
+ net/ipv6/addrconf_core.c | 2 +-
+ net/ipv6/af_inet6.c | 42 +-
+ net/ipv6/icmp.c | 41 +-
+ net/ipv6/inet6_connection_sock.c | 2 +-
+ net/ipv6/ip6_checksum.c | 27 +-
+ net/ipv6/ip6_fib.c | 12 +-
+ net/ipv6/ip6_flowlabel.c | 1 -
+ net/ipv6/ip6_gre.c | 64 +-
+ net/ipv6/ip6_output.c | 12 +-
+ net/ipv6/ip6_vti.c | 3 -
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +-
+ net/ipv6/ping.c | 7 +-
+ net/ipv6/proc.c | 14 +-
+ net/ipv6/raw.c | 10 +-
+ net/ipv6/route.c | 2 +-
+ net/ipv6/syncookies.c | 4 +-
+ net/ipv6/sysctl_net_ipv6.c | 7 +
+ net/ipv6/tcp_ipv6.c | 85 +-
+ net/ipv6/udp.c | 48 +-
+ net/ipv6/xfrm6_output.c | 6 +-
+ net/l2tp/l2tp_core.c | 59 +-
+ net/l2tp/l2tp_ip6.c | 10 +-
+ 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/mac802154/Kconfig | 4 +
+ net/mac802154/Makefile | 3 +-
+ net/mac802154/llsec.c | 1067 +++++++++++++
+ net/mac802154/llsec.h | 108 ++
+ net/mac802154/mac802154.h | 44 +
+ net/mac802154/mac_cmd.c | 42 +-
+ net/mac802154/mib.c | 187 +++
+ net/mac802154/rx.c | 2 -
+ net/mac802154/wpan.c | 164 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 20 +-
+ net/netfilter/nfnetlink.c | 10 +-
+ net/netlink/af_netlink.c | 70 +-
+ net/netlink/af_netlink.h | 6 +-
+ net/openvswitch/actions.c | 4 +-
+ net/openvswitch/datapath.c | 11 +-
+ net/openvswitch/datapath.h | 8 +-
+ net/openvswitch/flow.c | 149 +-
+ net/openvswitch/flow.h | 18 +-
+ net/openvswitch/flow_netlink.c | 82 +-
+ net/openvswitch/flow_netlink.h | 1 -
+ net/openvswitch/flow_table.c | 75 +-
+ net/openvswitch/flow_table.h | 4 +-
+ net/openvswitch/vport-gre.c | 4 +-
+ net/openvswitch/vport-internal_dev.c | 2 +-
+ net/openvswitch/vport-vxlan.c | 5 +-
+ net/openvswitch/vport.h | 6 +-
+ net/rds/iw_sysctl.c | 3 +-
+ net/rds/sysctl.c | 3 +-
+ net/sched/cls_api.c | 26 +-
+ 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/sched/sch_api.c | 8 +-
+ net/sched/sch_hhf.c | 2 +-
+ net/sctp/ipv6.c | 2 +-
+ net/sctp/output.c | 2 +-
+ net/sctp/proc.c | 2 +-
+ net/sctp/protocol.c | 9 +-
+ net/sctp/socket.c | 10 +-
+ net/sctp/sysctl.c | 21 +-
+ net/sctp/ulpqueue.c | 4 +
+ net/tipc/Makefile | 2 +-
+ net/tipc/bcast.c | 192 ++-
+ net/tipc/bcast.h | 9 +-
+ net/tipc/bearer.c | 153 +-
+ net/tipc/bearer.h | 47 +-
+ net/tipc/config.c | 12 +-
+ net/tipc/core.c | 14 +-
+ net/tipc/core.h | 10 +-
+ net/tipc/discover.c | 281 ++--
+ net/tipc/discover.h | 1 +
+ net/tipc/eth_media.c | 51 +-
+ net/tipc/handler.c | 134 --
+ net/tipc/ib_media.c | 34 +-
+ net/tipc/link.c | 216 +--
+ net/tipc/link.h | 21 +-
+ net/tipc/msg.c | 55 +-
+ net/tipc/msg.h | 5 +-
+ net/tipc/name_distr.c | 78 +-
+ net/tipc/name_distr.h | 35 +-
+ net/tipc/name_table.c | 14 +-
+ net/tipc/net.c | 71 +-
+ net/tipc/net.h | 4 +-
+ net/tipc/node.c | 110 +-
+ net/tipc/node.h | 88 +-
+ net/tipc/node_subscr.c | 9 +-
+ net/tipc/node_subscr.h | 2 +-
+ net/tipc/port.c | 39 +-
+ net/tipc/port.h | 10 +-
+ net/tipc/socket.c | 114 +-
+ net/tipc/socket.h | 4 +-
+ net/unix/af_unix.c | 8 +-
+ 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 +-
+ net/xfrm/xfrm_policy.c | 10 +-
+ net/xfrm/xfrm_proc.c | 3 +-
+ security/selinux/include/classmap.h | 2 +-
+ tools/net/bpf_exp.l | 1 +
+ tools/net/bpf_exp.y | 11 +-
+ tools/net/bpf_jit_disasm.c | 20 +-
+ tools/testing/selftests/net/Makefile | 8 +-
+ 740 files changed, 24323 insertions(+), 11485 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/broadcom-systemport.txt
+ create mode 100644 Documentation/devicetree/bindings/net/fixed-link.txt
+ create mode 100644 Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt
+ delete mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt
+ create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz90x1.txt
+ create mode 100644 Documentation/devicetree/bindings/net/via-rhine.txt
+ create mode 100644 Documentation/networking/cdc_mbim.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
+ create mode 100644 lib/test_bpf.c
+ create mode 100644 net/mac802154/llsec.c
+ create mode 100644 net/mac802154/llsec.h
+ delete mode 100644 net/tipc/handler.c
+$ git reset --hard HEAD^
+HEAD is now at 11cef2c8c00a Merge remote-tracking branch 'dmaengine/next'
+Merging next-20140516 version of net-next
+$ git merge -m next-20140516/net-next dab531b4305bc2852ce6f934dc283464d46871a5
+Resolved 'drivers/net/ethernet/altera/altera_msgdma.c' using previous resolution.
+Resolved 'drivers/net/ethernet/altera/altera_sgdma.c' using previous resolution.
+Resolved 'net/ipv6/xfrm6_output.c' using previous resolution.
+Removing net/tipc/handler.c
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/mac80211/ieee80211_i.h
+Auto-merging net/ipv6/xfrm6_output.c
+CONFLICT (content): Merge conflict in net/ipv6/xfrm6_output.c
+Auto-merging net/ipv6/route.c
+Auto-merging net/ipv6/ip6_output.c
+Auto-merging net/ipv4/xfrm4_output.c
+Auto-merging net/core/skbuff.c
+Auto-merging net/core/net_namespace.c
+Auto-merging net/core/dev.c
+Auto-merging net/8021q/vlan_dev.c
+Auto-merging lib/Kconfig.debug
+Auto-merging include/uapi/linux/nl80211.h
+Auto-merging include/uapi/linux/audit.h
+Auto-merging include/net/ip6_route.h
+Auto-merging include/linux/netdevice.h
+Auto-merging include/linux/if_vlan.h
+Auto-merging drivers/net/xen-netback/interface.c
+Auto-merging drivers/net/wireless/iwlwifi/pcie/trans.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/utils.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/scan.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/rs.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/mvm.h
+Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
+Auto-merging drivers/net/wireless/iwlwifi/mvm/coex.c
+Auto-merging drivers/net/phy/phy_device.c
+Auto-merging drivers/net/macvlan.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/mlx4.h
+Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
+Auto-merging drivers/net/ethernet/altera/altera_tse_ethtool.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
+CONFLICT (content): Merge conflict in drivers/net/ethernet/altera/altera_msgdma.c
+Auto-merging drivers/net/can/spi/mcp251x.c
+Auto-merging drivers/net/bonding/bond_options.c
+Auto-merging arch/x86/net/bpf_jit_comp.c
+Auto-merging arch/arm/boot/dts/am33xx.dtsi
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/net/micrel-ksz9021.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master eeaf5807bc1d] next-20140516/net-next
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/80211.tmpl | 1 +
+ .../bindings/net/broadcom-systemport.txt | 29 +
+ .../devicetree/bindings/net/cpsw-phy-sel.txt | 4 +-
+ .../bindings/net/ieee802154/at86rf230.txt | 23 +
+ .../devicetree/bindings/net/micrel-ksz9021.txt | 49 -
+ .../devicetree/bindings/net/micrel-ksz90x1.txt | 83 +
+ .../devicetree/bindings/net/via-rhine.txt | 17 +
+ Documentation/driver-model/devres.txt | 5 +
+ Documentation/networking/bonding.txt | 44 +-
+ Documentation/networking/cdc_mbim.txt | 339 ++++
+ Documentation/networking/filter.txt | 171 +-
+ MAINTAINERS | 6 +
+ arch/arm/boot/dts/am33xx.dtsi | 2 +
+ arch/arm/boot/dts/am4372.dtsi | 2 +
+ arch/arm/boot/dts/vt8500.dtsi | 6 +
+ arch/arm/boot/dts/wm8650.dtsi | 6 +
+ arch/arm/boot/dts/wm8850.dtsi | 6 +
+ arch/sparc/include/asm/checksum_32.h | 12 +
+ arch/sparc/include/asm/checksum_64.h | 12 +
+ arch/x86/include/asm/checksum_64.h | 9 +-
+ arch/x86/net/bpf_jit.S | 77 +-
+ arch/x86/net/bpf_jit_comp.c | 1399 +++++++++--------
+ 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/clk/ti/clk-43xx.c | 16 +
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 2 +-
+ drivers/isdn/hisax/hfc4s8s_l1.c | 111 +-
+ drivers/net/bonding/bond_3ad.c | 56 +-
+ drivers/net/bonding/bond_alb.c | 116 +-
+ drivers/net/bonding/bond_alb.h | 1 +
+ drivers/net/bonding/bond_main.c | 66 +-
+ drivers/net/bonding/bond_netlink.c | 2 +-
+ drivers/net/bonding/bond_options.c | 56 +-
+ drivers/net/bonding/bond_options.h | 2 +
+ drivers/net/bonding/bond_procfs.c | 2 +-
+ drivers/net/bonding/bond_sysfs.c | 553 +------
+ drivers/net/bonding/bond_sysfs_slave.c | 2 +-
+ drivers/net/bonding/bonding.h | 28 +-
+ 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/3com/3c509.c | 2 +-
+ drivers/net/ethernet/3com/3c589_cs.c | 2 +-
+ drivers/net/ethernet/3com/typhoon.c | 2 +-
+ drivers/net/ethernet/adaptec/starfire.c | 2 +-
+ drivers/net/ethernet/alteon/acenic.c | 2 +-
+ drivers/net/ethernet/altera/altera_sgdma.c | 9 +-
+ drivers/net/ethernet/altera/altera_tse_ethtool.c | 2 +-
+ drivers/net/ethernet/amd/amd8111e.c | 2 +-
+ drivers/net/ethernet/amd/au1000_eth.c | 2 +-
+ drivers/net/ethernet/amd/nmclan_cs.c | 2 +-
+ drivers/net/ethernet/arc/emac_main.c | 49 +
+ drivers/net/ethernet/atheros/alx/main.c | 2 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 2 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 2 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
+ drivers/net/ethernet/broadcom/Kconfig | 11 +
+ drivers/net/ethernet/broadcom/Makefile | 1 +
+ drivers/net/ethernet/broadcom/b44.c | 2 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 1630 ++++++++++++++++++++
+ drivers/net/ethernet/broadcom/bcmsysport.h | 677 ++++++++
+ drivers/net/ethernet/broadcom/bgmac.c | 2 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
+ drivers/net/ethernet/broadcom/tg3.c | 51 +-
+ drivers/net/ethernet/broadcom/tg3.h | 2 +-
+ drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 2 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 19 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 7 +-
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 2 +-
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +-
+ drivers/net/ethernet/dlink/dl2k.c | 2 +-
+ drivers/net/ethernet/dlink/sundance.c | 2 +-
+ drivers/net/ethernet/ec_bhf.c | 20 +-
+ drivers/net/ethernet/emulex/benet/be.h | 14 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 370 ++---
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 4 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 193 ++-
+ drivers/net/ethernet/emulex/benet/be_main.c | 253 +--
+ drivers/net/ethernet/ethoc.c | 6 -
+ drivers/net/ethernet/faraday/ftgmac100.c | 2 +-
+ drivers/net/ethernet/faraday/ftmac100.c | 2 +-
+ drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 2 +-
+ drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 +-
+ drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 2 +-
+ drivers/net/ethernet/ibm/emac/core.c | 2 +-
+ drivers/net/ethernet/icplus/ipg.c | 2 +-
+ drivers/net/ethernet/intel/e100.c | 2 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 8 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 13 +-
+ 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 | 16 +-
+ 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 | 318 +++-
+ 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 | 114 +-
+ drivers/net/ethernet/intel/igb/igb_hwmon.c | 47 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 161 +-
+ drivers/net/ethernet/intel/igbvf/ethtool.c | 2 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 2 +-
+ 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_ethtool.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/ethtool.c | 2 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
+ drivers/net/ethernet/marvell/mvneta.c | 2 +-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 2 +-
+ drivers/net/ethernet/marvell/sky2.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 99 +-
+ drivers/net/ethernet/mellanox/mlx4/cq.c | 3 +
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx4/en_main.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 22 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 28 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 147 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 24 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 255 ++-
+ drivers/net/ethernet/mellanox/mlx4/mcg.c | 18 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 17 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 40 +-
+ drivers/net/ethernet/mellanox/mlx4/mr.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx4/port.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx4/profile.c | 13 +-
+ drivers/net/ethernet/mellanox/mlx4/qp.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/reset.c | 24 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 73 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 30 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c | 8 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c | 4 +-
+ drivers/net/ethernet/micrel/ks8695net.c | 6 +-
+ drivers/net/ethernet/micrel/ks8851.c | 2 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 3 +-
+ drivers/net/ethernet/microchip/enc28j60.c | 2 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 2 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 2 +-
+ drivers/net/ethernet/neterion/s2io.c | 11 +-
+ drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 2 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 2 +-
+ .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 6 +-
+ drivers/net/ethernet/packetengines/yellowfin.c | 2 +-
+ drivers/net/ethernet/qlogic/Kconfig | 11 +
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 33 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 44 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 4 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 14 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 13 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 32 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 31 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 66 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 37 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 4 +-
+ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 188 ++-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 119 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 68 +
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +-
+ drivers/net/ethernet/realtek/r8169.c | 2 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 6 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 2 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 50 +-
+ drivers/net/ethernet/sfc/efx.c | 2 +-
+ drivers/net/ethernet/sis/sis190.c | 2 +-
+ drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 7 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 2 +-
+ drivers/net/ethernet/ti/cpmac.c | 14 -
+ drivers/net/ethernet/ti/cpsw-phy-sel.c | 62 +-
+ drivers/net/ethernet/ti/cpsw.c | 114 +-
+ drivers/net/ethernet/ti/cpts.c | 11 +-
+ drivers/net/ethernet/ti/davinci_cpdma.c | 35 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 2 +-
+ drivers/net/ethernet/ti/davinci_mdio.c | 50 +-
+ drivers/net/ethernet/via/Kconfig | 2 +-
+ drivers/net/ethernet/via/via-rhine.c | 506 +++---
+ drivers/net/hyperv/hyperv_net.h | 159 +-
+ drivers/net/hyperv/netvsc.c | 529 ++++---
+ drivers/net/hyperv/netvsc_drv.c | 113 +-
+ drivers/net/hyperv/rndis_filter.c | 193 ++-
+ drivers/net/ieee802154/at86rf230.c | 133 +-
+ drivers/net/irda/Kconfig | 3 +-
+ drivers/net/irda/w83977af_ir.c | 33 +-
+ drivers/net/macvlan.c | 126 +-
+ drivers/net/ntb_netdev.c | 2 +-
+ drivers/net/phy/at803x.c | 39 +-
+ drivers/net/phy/mdio_bus.c | 67 +
+ drivers/net/phy/micrel.c | 106 +-
+ drivers/net/phy/phy_device.c | 3 +-
+ drivers/net/phy/smsc.c | 3 +-
+ drivers/net/phy/vitesse.c | 3 +-
+ drivers/net/rionet.c | 2 +-
+ drivers/net/usb/catc.c | 2 +-
+ drivers/net/usb/cdc_mbim.c | 123 +-
+ drivers/net/usb/cdc_ncm.c | 27 +-
+ drivers/net/usb/hso.c | 2 +-
+ drivers/net/usb/ipheth.c | 2 +-
+ drivers/net/usb/kaweth.c | 2 +-
+ drivers/net/usb/pegasus.c | 2 +-
+ drivers/net/usb/r8152.c | 2 +-
+ drivers/net/usb/rtl8150.c | 2 +-
+ drivers/net/virtio_net.c | 9 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 +-
+ drivers/net/vxlan.c | 65 +-
+ 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/hostap/hostap_main.c | 2 +-
+ 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/net/xen-netback/interface.c | 2 +-
+ drivers/net/xen-netfront.c | 2 +-
+ 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 | 18 +-
+ drivers/s390/net/qeth_l3_main.c | 19 +-
+ drivers/staging/et131x/et131x.c | 2 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 2 +-
+ drivers/staging/netlogic/xlr_net.c | 2 +-
+ drivers/staging/octeon/ethernet.c | 2 +-
+ drivers/staging/rtl8821ae/core.c | 14 +-
+ drivers/usb/gadget/u_ether.c | 4 +-
+ include/linux/ethtool.h | 13 +
+ include/linux/filter.h | 102 +-
+ include/linux/if_vlan.h | 4 +-
+ include/linux/mlx4/device.h | 3 +
+ include/linux/netdevice.h | 4 +-
+ include/linux/netlink.h | 3 +-
+ include/linux/phy.h | 8 +
+ include/linux/skbuff.h | 97 +-
+ include/linux/spi/at86rf230.h | 14 -
+ include/linux/tcp.h | 6 +-
+ include/linux/usb/cdc_ncm.h | 2 +-
+ include/net/6lowpan.h | 1 +
+ include/net/addrconf.h | 5 -
+ include/net/bluetooth/hci.h | 1 +
+ include/net/bluetooth/hci_core.h | 13 +-
+ include/net/cfg80211.h | 86 +-
+ include/net/checksum.h | 2 +
+ include/net/dsa.h | 5 +
+ include/net/ieee802154.h | 9 +
+ include/net/ieee802154_netdev.h | 54 +-
+ include/net/inet_ecn.h | 2 +-
+ include/net/inet_hashtables.h | 8 +-
+ include/net/inet_sock.h | 10 +
+ include/net/ip.h | 47 +-
+ include/net/ip6_checksum.h | 7 +
+ include/net/ip6_route.h | 2 +-
+ include/net/ipv6.h | 22 +
+ include/net/mac80211.h | 31 +-
+ include/net/net_namespace.h | 8 +
+ include/net/netns/ipv4.h | 7 +
+ include/net/netns/ipv6.h | 1 +
+ include/net/pkt_cls.h | 2 +-
+ include/net/regulatory.h | 6 +
+ include/net/sch_generic.h | 2 +-
+ include/net/snmp.h | 32 +-
+ include/net/tcp.h | 40 +-
+ 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/nl80211.h | 42 +
+ include/uapi/linux/tipc.h | 23 +
+ include/uapi/linux/tipc_config.h | 10 +-
+ kernel/audit.c | 64 +-
+ kernel/seccomp.c | 29 +-
+ kernel/sysctl.c | 4 +-
+ lib/Kconfig.debug | 13 +
+ lib/Makefile | 1 +
+ lib/test_bpf.c | 1546 +++++++++++++++++++
+ net/8021q/vlan_core.c | 6 +-
+ net/8021q/vlan_dev.c | 58 +-
+ net/batman-adv/soft-interface.c | 2 +-
+ 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/bridge/br_device.c | 2 +-
+ net/bridge/br_netfilter.c | 2 +-
+ net/core/dev.c | 50 +-
+ net/core/ethtool.c | 223 ++-
+ net/core/filter.c | 640 ++++----
+ net/core/net_namespace.c | 2 +-
+ net/core/ptp_classifier.c | 2 +-
+ net/core/skbuff.c | 4 +-
+ net/dccp/proto.c | 9 +-
+ net/dccp/sysctl.c | 3 +-
+ net/dsa/slave.c | 2 +-
+ net/ieee802154/6lowpan_rtnl.c | 207 +--
+ net/ieee802154/dgram.c | 38 +-
+ net/ieee802154/header_ops.c | 52 +-
+ net/ieee802154/reassembly.c | 48 +-
+ net/ipv4/af_inet.c | 101 +-
+ net/ipv4/devinet.c | 7 +-
+ net/ipv4/gre_demux.c | 24 +-
+ net/ipv4/icmp.c | 23 +-
+ net/ipv4/igmp.c | 12 +-
+ net/ipv4/inet_connection_sock.c | 11 +-
+ net/ipv4/inet_hashtables.c | 6 +-
+ net/ipv4/inetpeer.c | 2 +-
+ net/ipv4/ip_forward.c | 2 +-
+ net/ipv4/ip_gre.c | 6 +-
+ net/ipv4/ip_options.c | 6 +-
+ net/ipv4/ip_output.c | 15 +-
+ net/ipv4/netfilter/nf_defrag_ipv4.c | 2 +-
+ net/ipv4/proc.c | 24 +-
+ net/ipv4/route.c | 7 +
+ net/ipv4/syncookies.c | 3 +-
+ net/ipv4/sysctl_net_ipv4.c | 45 +-
+ net/ipv4/tcp.c | 8 +
+ net/ipv4/tcp_bic.c | 5 +-
+ net/ipv4/tcp_cong.c | 24 +-
+ net/ipv4/tcp_cubic.c | 5 +-
+ net/ipv4/tcp_fastopen.c | 219 ++-
+ net/ipv4/tcp_highspeed.c | 4 +-
+ net/ipv4/tcp_htcp.c | 4 +-
+ net/ipv4/tcp_hybla.c | 7 +-
+ net/ipv4/tcp_illinois.c | 5 +-
+ net/ipv4/tcp_input.c | 31 +-
+ net/ipv4/tcp_ipv4.c | 303 +---
+ net/ipv4/tcp_lp.c | 5 +-
+ net/ipv4/tcp_minisocks.c | 31 +
+ net/ipv4/tcp_output.c | 100 +-
+ net/ipv4/tcp_scalable.c | 5 +-
+ net/ipv4/tcp_vegas.c | 7 +-
+ net/ipv4/tcp_veno.c | 9 +-
+ net/ipv4/tcp_yeah.c | 5 +-
+ net/ipv4/udp.c | 27 +-
+ net/ipv4/xfrm4_output.c | 2 +-
+ net/ipv6/addrconf.c | 49 +-
+ net/ipv6/addrconf_core.c | 2 +-
+ net/ipv6/af_inet6.c | 42 +-
+ net/ipv6/icmp.c | 41 +-
+ net/ipv6/inet6_connection_sock.c | 2 +-
+ net/ipv6/ip6_checksum.c | 27 +-
+ net/ipv6/ip6_fib.c | 12 +-
+ net/ipv6/ip6_flowlabel.c | 1 -
+ net/ipv6/ip6_gre.c | 64 +-
+ net/ipv6/ip6_output.c | 12 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +-
+ net/ipv6/ping.c | 7 +-
+ net/ipv6/proc.c | 14 +-
+ net/ipv6/raw.c | 10 +-
+ net/ipv6/route.c | 2 +-
+ net/ipv6/syncookies.c | 4 +-
+ net/ipv6/sysctl_net_ipv6.c | 7 +
+ net/ipv6/tcp_ipv6.c | 85 +-
+ net/ipv6/udp.c | 48 +-
+ net/ipv6/xfrm6_output.c | 6 +-
+ net/l2tp/l2tp_core.c | 59 +-
+ net/l2tp/l2tp_ip6.c | 10 +-
+ 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/mac802154/rx.c | 2 -
+ net/mac802154/wpan.c | 30 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 20 +-
+ net/netfilter/nfnetlink.c | 10 +-
+ net/netlink/af_netlink.c | 70 +-
+ net/netlink/af_netlink.h | 6 +-
+ net/openvswitch/vport-gre.c | 2 +-
+ net/openvswitch/vport-internal_dev.c | 2 +-
+ net/openvswitch/vport-vxlan.c | 5 +-
+ net/rds/iw_sysctl.c | 3 +-
+ net/rds/sysctl.c | 3 +-
+ net/sched/cls_api.c | 26 +-
+ 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/sched/sch_api.c | 8 +-
+ net/sched/sch_hhf.c | 2 +-
+ net/sctp/ipv6.c | 2 +-
+ net/sctp/output.c | 2 +-
+ net/sctp/proc.c | 2 +-
+ net/sctp/protocol.c | 9 +-
+ net/sctp/socket.c | 10 +-
+ net/sctp/sysctl.c | 21 +-
+ net/sctp/ulpqueue.c | 4 +
+ net/tipc/Makefile | 2 +-
+ net/tipc/bcast.c | 192 ++-
+ net/tipc/bcast.h | 9 +-
+ net/tipc/bearer.c | 153 +-
+ net/tipc/bearer.h | 47 +-
+ net/tipc/config.c | 12 +-
+ net/tipc/core.c | 14 +-
+ net/tipc/core.h | 10 +-
+ net/tipc/discover.c | 281 ++--
+ net/tipc/discover.h | 1 +
+ net/tipc/eth_media.c | 51 +-
+ net/tipc/handler.c | 134 --
+ net/tipc/ib_media.c | 34 +-
+ net/tipc/link.c | 216 +--
+ net/tipc/link.h | 21 +-
+ net/tipc/msg.c | 55 +-
+ net/tipc/msg.h | 5 +-
+ net/tipc/name_distr.c | 78 +-
+ net/tipc/name_distr.h | 35 +-
+ net/tipc/name_table.c | 14 +-
+ net/tipc/net.c | 71 +-
+ net/tipc/net.h | 4 +-
+ net/tipc/node.c | 110 +-
+ net/tipc/node.h | 88 +-
+ net/tipc/node_subscr.c | 9 +-
+ net/tipc/node_subscr.h | 2 +-
+ net/tipc/port.c | 39 +-
+ net/tipc/port.h | 10 +-
+ net/tipc/socket.c | 114 +-
+ net/tipc/socket.h | 4 +-
+ 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 +-
+ net/xfrm/xfrm_policy.c | 10 +-
+ net/xfrm/xfrm_proc.c | 3 +-
+ security/selinux/include/classmap.h | 2 +-
+ tools/net/bpf_exp.l | 1 +
+ tools/net/bpf_exp.y | 11 +-
+ tools/testing/selftests/net/Makefile | 8 +-
+ 695 files changed, 20317 insertions(+), 10842 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/broadcom-systemport.txt
+ create mode 100644 Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt
+ delete mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt
+ create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz90x1.txt
+ create mode 100644 Documentation/devicetree/bindings/net/via-rhine.txt
+ create mode 100644 Documentation/networking/cdc_mbim.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
+ create mode 100644 lib/test_bpf.c
+ delete mode 100644 net/tipc/handler.c
+Merging ipsec-next/master (fc68086ce888 net/xfrm/xfrm_output.c: move EXPORT_SYMBOL)
+$ git merge ipsec-next/master
+Auto-merging net/xfrm/xfrm_user.c
+Auto-merging net/xfrm/xfrm_policy.c
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 57 +++++++++++++++++++-------------------------------
+ net/key/af_key.c | 32 +++++++---------------------
+ net/xfrm/xfrm_output.c | 5 ++---
+ net/xfrm/xfrm_policy.c | 46 +++++++++++++---------------------------
+ net/xfrm/xfrm_state.c | 37 +++++++++++---------------------
+ net/xfrm/xfrm_user.c | 53 +++++++---------------------------------------
+ 6 files changed, 65 insertions(+), 165 deletions(-)
+Merging wireless-next/master (f8b8a47e06a0 wlcore: Remove trailing semicolon from do {...} while (0) macro)
+$ git merge wireless-next/master
+Auto-merging drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-tegra/board-paz00.c | 4 +-
+ drivers/mmc/host/mmc_spi.c | 18 +-
+ drivers/net/wireless/ath/ath10k/core.c | 6 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 16 +
+ drivers/net/wireless/ath/ath10k/pci.c | 18 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 2 +
+ drivers/net/wireless/ath/ath9k/Makefile | 3 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 2 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 5 +-
+ drivers/net/wireless/ath/ath9k/common-debug.c | 253 ++++++++++
+ drivers/net/wireless/ath/ath9k/common-debug.h | 72 +++
+ drivers/net/wireless/ath/ath9k/common.h | 1 +
+ drivers/net/wireless/ath/ath9k/debug.c | 214 +-------
+ drivers/net/wireless/ath/ath9k/debug.h | 44 --
+ drivers/net/wireless/ath/ath9k/dfs.c | 6 +-
+ drivers/net/wireless/ath/ath9k/dfs_debug.h | 1 +
+ drivers/net/wireless/ath/ath9k/htc.h | 17 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 555 ++-------------------
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 3 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 3 +-
+ drivers/net/wireless/ath/ath9k/init.c | 5 +-
+ drivers/net/wireless/ath/ath9k/pci.c | 2 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 4 +-
+ drivers/net/wireless/ath/dfs_pattern_detector.c | 45 +-
+ drivers/net/wireless/b43/Kconfig | 38 +-
+ drivers/net/wireless/b43/bus.h | 10 +
+ drivers/net/wireless/b43/main.c | 19 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 1 +
+ .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 18 +
+ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 32 +-
+ .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 24 +
+ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 80 +--
+ drivers/net/wireless/brcm80211/brcmfmac/nvram.c | 220 ++++++--
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 1 +
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 200 +++++---
+ drivers/net/wireless/brcm80211/brcmutil/d11.c | 93 +++-
+ drivers/net/wireless/brcm80211/include/brcmu_d11.h | 14 +-
+ .../net/wireless/brcm80211/include/brcmu_wifi.h | 1 +
+ drivers/net/wireless/iwlwifi/Kconfig | 13 +-
+ drivers/net/wireless/iwlwifi/dvm/Makefile | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/calib.c | 1 -
+ drivers/net/wireless/iwlwifi/dvm/debugfs.c | 7 +-
+ drivers/net/wireless/iwlwifi/dvm/dev.h | 2 +
+ drivers/net/wireless/iwlwifi/dvm/devices.c | 2 -
+ drivers/net/wireless/iwlwifi/dvm/led.h | 12 +
+ drivers/net/wireless/iwlwifi/dvm/lib.c | 17 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c | 27 +-
+ drivers/net/wireless/iwlwifi/dvm/power.c | 4 +-
+ drivers/net/wireless/iwlwifi/dvm/rs.c | 10 +-
+ drivers/net/wireless/iwlwifi/dvm/rx.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/rxon.c | 18 +-
+ drivers/net/wireless/iwlwifi/dvm/scan.c | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/sta.c | 29 +-
+ drivers/net/wireless/iwlwifi/dvm/tt.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 24 +-
+ drivers/net/wireless/iwlwifi/dvm/ucode.c | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-8000.c | 5 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 7 +
+ drivers/net/wireless/iwlwifi/iwl-debug.c | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-debug.h | 41 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.c | 5 +
+ .../{mvm/fw-error-dump.h => iwl-fw-error-dump.h} | 26 +
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 10 +-
+ drivers/net/wireless/iwlwifi/iwl-io.c | 18 +
+ drivers/net/wireless/iwlwifi/iwl-io.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-modparams.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 50 +-
+ drivers/net/wireless/iwlwifi/iwl-phy-db.c | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 3 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 50 +-
+ drivers/net/wireless/iwlwifi/mvm/Makefile | 3 +-
+ drivers/net/wireless/iwlwifi/mvm/coex.c | 68 +--
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 27 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 11 +-
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 19 +-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 106 ++--
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 137 ++++-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 20 +-
+ drivers/net/wireless/iwlwifi/mvm/nvm.c | 102 ++--
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 43 +-
+ drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 24 +-
+ drivers/net/wireless/iwlwifi/mvm/power.c | 48 +-
+ drivers/net/wireless/iwlwifi/mvm/quota.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 179 +++----
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 13 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 18 +-
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/tt.c | 1 -
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 6 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 14 +-
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 24 +-
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 90 +++-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 139 +++---
+ drivers/net/wireless/mwifiex/11n.c | 42 ++
+ drivers/net/wireless/mwifiex/11n.h | 1 +
+ drivers/net/wireless/mwifiex/fw.h | 20 +
+ drivers/net/wireless/mwifiex/pcie.c | 1 +
+ drivers/net/wireless/mwifiex/sdio.c | 6 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c | 7 +
+ drivers/net/wireless/mwifiex/sta_event.c | 40 ++
+ drivers/net/wireless/mwifiex/sta_tx.c | 4 +-
+ drivers/net/wireless/mwifiex/tdls.c | 53 ++
+ drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 +
+ drivers/net/wireless/rtl818x/rtl8180/dev.c | 17 +-
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 11 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 4 +
+ drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 5 +-
+ drivers/net/wireless/rtlwifi/wifi.h | 4 +
+ drivers/net/wireless/ti/wl1251/acx.c | 1 -
+ drivers/net/wireless/ti/wl1251/cmd.c | 1 -
+ drivers/net/wireless/ti/wl1251/event.c | 5 +-
+ drivers/net/wireless/ti/wl1251/main.c | 68 +--
+ drivers/net/wireless/ti/wl1251/spi.c | 44 +-
+ drivers/net/wireless/ti/wlcore/debugfs.h | 4 +-
+ drivers/net/wireless/ti/wlcore/spi.c | 46 +-
+ include/linux/ath9k_platform.h | 2 +
+ include/linux/crc7.h | 8 +-
+ include/linux/rfkill-gpio.h | 10 -
+ lib/crc7.c | 84 ++--
+ net/rfkill/rfkill-gpio.c | 40 +-
+ 128 files changed, 2327 insertions(+), 1784 deletions(-)
+ create mode 100644 drivers/net/wireless/ath/ath9k/common-debug.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/common-debug.h
+ rename drivers/net/wireless/iwlwifi/{mvm/fw-error-dump.h => iwl-fw-error-dump.h} (84%)
+Merging bluetooth/master (f4e2dd53d5d8 Bluetooth: Add missing msecs to jiffies conversion)
+$ git merge bluetooth/master
+Resolved 'drivers/bluetooth/btusb.c' using previous resolution.
+Auto-merging net/bluetooth/rfcomm/core.c
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging net/bluetooth/hci_conn.c
+Auto-merging drivers/bluetooth/btusb.c
+CONFLICT (content): Merge conflict in drivers/bluetooth/btusb.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f8e441958531] Merge remote-tracking branch 'bluetooth/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/bluetooth/btusb.c | 155 +++++++++++++++++++++++++++-
+ include/net/bluetooth/hci.h | 21 ++++
+ include/net/bluetooth/hci_core.h | 11 ++
+ include/net/bluetooth/mgmt.h | 12 +++
+ include/net/bluetooth/rfcomm.h | 6 +-
+ net/bluetooth/hci_conn.c | 2 +
+ net/bluetooth/hci_core.c | 63 ++++++++++++
+ net/bluetooth/hci_event.c | 61 +++++++++++
+ net/bluetooth/mgmt.c | 216 ++++++++++++++++++++++++++++++++++++++-
+ net/bluetooth/rfcomm/core.c | 2 +-
+ net/bluetooth/rfcomm/tty.c | 20 ++--
+ net/bluetooth/smp.c | 20 ++--
+ net/bluetooth/smp.h | 1 +
+ 13 files changed, 564 insertions(+), 26 deletions(-)
+Merging infiniband/for-next (7d0a73a40c5c RDMA/cxgb4: Update Kconfig to include Chelsio T5 adapter)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging mtd/master (28c015a9daab mtd: davinci-nand: disable subpage write for keystone-nand)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (d64a117eaea8 Documentation: mtd: update the document for m25p80)
+$ git merge l2-mtd/master
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/fsl-quadspi.txt | 35 +
+ Documentation/devicetree/bindings/mtd/m25p80.txt | 4 +-
+ Documentation/mtd/spi-nor.txt | 62 +
+ drivers/mtd/Kconfig | 2 +
+ drivers/mtd/Makefile | 1 +
+ drivers/mtd/devices/Kconfig | 4 +-
+ drivers/mtd/devices/elm.c | 2 +
+ drivers/mtd/devices/m25p80.c | 1305 ++------------------
+ drivers/mtd/devices/serial_flash_cmds.h | 44 +-
+ drivers/mtd/devices/st_spi_fsm.c | 340 +++--
+ drivers/mtd/maps/Kconfig | 4 +-
+ drivers/mtd/mtd_blkdevs.c | 6 +
+ drivers/mtd/mtdchar.c | 20 +-
+ drivers/mtd/nand/denali.c | 7 +-
+ drivers/mtd/nand/docg4.c | 6 +-
+ drivers/mtd/nand/fsl_elbc_nand.c | 14 +
+ 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 | 19 +-
+ drivers/mtd/nand/nand_ecc.c | 2 +-
+ drivers/mtd/nand/omap2.c | 4 +-
+ drivers/mtd/nand/orion_nand.c | 2 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 2 +-
+ drivers/mtd/onenand/samsung.c | 8 +-
+ 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/nand.h | 5 +-
+ include/linux/mtd/spi-nor.h | 214 ++++
+ 32 files changed, 2846 insertions(+), 1504 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 (0118a5521375 hwrng: n2-drv - Introduce the use of the managed version of kzalloc)
+$ git merge crypto/master
+Resolved 'crypto/crypto_user.c' using previous resolution.
+Resolved 'drivers/char/hw_random/Kconfig' using previous resolution.
+Resolved 'drivers/crypto/caam/error.c' using previous resolution.
+Auto-merging drivers/crypto/caam/error.c
+CONFLICT (content): Merge conflict in drivers/crypto/caam/error.c
+CONFLICT (rename/delete): drivers/crypto/bfin_crc.h deleted in HEAD and renamed in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.h left in tree.
+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
+Auto-merging crypto/crypto_user.c
+CONFLICT (content): Merge conflict in crypto/crypto_user.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master adb864d93989] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/crypto/samsung-sss.txt | 34 +
+ arch/x86/crypto/ghash-clmulni-intel_asm.S | 4 +-
+ arch/x86/crypto/ghash-clmulni-intel_glue.c | 12 +-
+ crypto/crypto_user.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/n2-drv.c | 24 +-
+ drivers/char/hw_random/omap-rng.c | 4 +-
+ drivers/char/hw_random/picoxcell-rng.c | 181 -----
+ drivers/char/hw_random/timeriomem-rng.c | 4 +-
+ drivers/crypto/Kconfig | 6 +-
+ drivers/crypto/atmel-aes.c | 8 +-
+ drivers/crypto/bfin_crc.c | 103 +--
+ drivers/crypto/bfin_crc.h | 125 ++++
+ drivers/crypto/caam/caamalg.c | 31 +-
+ drivers/crypto/caam/caamhash.c | 32 +-
+ drivers/crypto/caam/caamrng.c | 7 +-
+ drivers/crypto/caam/error.c | 393 +++++------
+ drivers/crypto/caam/error.h | 2 +-
+ drivers/crypto/caam/key_gen.c | 7 +-
+ drivers/crypto/ccp/ccp-pci.c | 7 +-
+ drivers/crypto/nx/nx-842.c | 4 +-
+ drivers/crypto/omap-des.c | 33 +-
+ drivers/crypto/s5p-sss.c | 148 +++-
+ 26 files changed, 1427 insertions(+), 654 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/samsung-sss.txt
+ delete mode 100644 drivers/char/hw_random/picoxcell-rng.c
+ create mode 100644 drivers/crypto/bfin_crc.h
+Merging drm/drm-next (e5daa1ddc1b0 Merge tag 'drm-intel-next-2014-05-06' of git://anongit.freedesktop.org/drm-intel into drm-next)
+$ git merge drm/drm-next
+Resolved 'drivers/gpu/drm/i915/i915_gem_gtt.c' using previous resolution.
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging include/drm/i915_pciids.h
+Auto-merging drivers/staging/imx-drm/imx-tve.c
+Auto-merging drivers/staging/imx-drm/imx-drm-core.c
+Auto-merging drivers/gpu/drm/radeon/radeon_device.c
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2f598582c327] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/drm.tmpl | 21 +-
+ 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/ast/ast_mode.c | 7 -
+ drivers/gpu/drm/bochs/bochs_mm.c | 6 +-
+ drivers/gpu/drm/bridge/ptn3460.c | 7 -
+ drivers/gpu/drm/cirrus/cirrus_main.c | 6 +-
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 8 -
+ drivers/gpu/drm/drm_bufs.c | 34 +-
+ drivers/gpu/drm/drm_cache.c | 4 +-
+ drivers/gpu/drm/drm_crtc.c | 33 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 13 +-
+ drivers/gpu/drm/drm_dp_helper.c | 2 +-
+ drivers/gpu/drm/drm_edid.c | 161 +++--
+ drivers/gpu/drm/drm_fb_helper.c | 17 +-
+ drivers/gpu/drm/drm_fops.c | 9 +-
+ 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_plane_helper.c | 13 +-
+ drivers/gpu/drm/drm_platform.c | 25 -
+ drivers/gpu/drm/drm_probe_helper.c | 66 +-
+ drivers/gpu/drm/drm_stub.c | 13 +-
+ drivers/gpu/drm/drm_usb.c | 14 -
+ drivers/gpu/drm/exynos/exynos_dp_core.c | 7 -
+ drivers/gpu/drm/exynos/exynos_drm_dpi.c | 7 -
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c | 7 -
+ 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 | 620 ++++++++++++++++---
+ drivers/gpu/drm/i915/i915_debugfs.c | 91 ++-
+ drivers/gpu/drm/i915/i915_dma.c | 28 +-
+ drivers/gpu/drm/i915/i915_drv.c | 146 ++++-
+ drivers/gpu/drm/i915/i915_drv.h | 284 +++------
+ drivers/gpu/drm/i915/i915_gem.c | 193 +++---
+ 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 | 105 +++-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 91 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 283 +++++++++
+ drivers/gpu/drm/i915/i915_gpu_error.c | 41 +-
+ drivers/gpu/drm/i915/i915_irq.c | 673 ++++++++++-----------
+ drivers/gpu/drm/i915/i915_params.c | 8 +-
+ drivers/gpu/drm/i915/i915_reg.h | 130 +++-
+ drivers/gpu/drm/i915/i915_sysfs.c | 4 +
+ drivers/gpu/drm/i915/i915_trace.h | 75 +++
+ drivers/gpu/drm/i915/intel_bios.c | 318 +++++++++-
+ drivers/gpu/drm/i915/intel_bios.h | 60 ++
+ drivers/gpu/drm/i915/intel_crt.c | 76 +--
+ drivers/gpu/drm/i915/intel_display.c | 326 +++++-----
+ drivers/gpu/drm/i915/intel_dp.c | 206 ++++++-
+ drivers/gpu/drm/i915/intel_drv.h | 40 +-
+ 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_dvo.c | 4 +-
+ 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 | 507 +++++++++++-----
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 486 +++++++++------
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 36 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 8 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 8 +
+ drivers/gpu/drm/i915/intel_sprite.c | 231 +++++--
+ drivers/gpu/drm/i915/intel_tv.c | 214 ++++---
+ drivers/gpu/drm/i915/intel_uncore.c | 26 +-
+ 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/rcar-du/rcar_du_lvdscon.c | 7 -
+ drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 7 -
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 7 -
+ 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 +-
+ drivers/staging/imx-drm/imx-drm-core.c | 7 -
+ drivers/staging/imx-drm/imx-drm.h | 2 -
+ drivers/staging/imx-drm/imx-hdmi.c | 1 -
+ drivers/staging/imx-drm/imx-ldb.c | 1 -
+ drivers/staging/imx-drm/imx-tve.c | 4 -
+ drivers/staging/imx-drm/parallel-display.c | 1 -
+ include/drm/drmP.h | 35 +-
+ include/drm/drm_crtc.h | 2 +
+ include/drm/drm_crtc_helper.h | 6 +-
+ include/drm/drm_flip_work.h | 1 +
+ include/drm/drm_modes.h | 2 +-
+ include/drm/i915_pciids.h | 22 +-
+ include/uapi/drm/i915_drm.h | 1 +
+ 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
+ 118 files changed, 4206 insertions(+), 2287 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_gtt.h
+ rename lib/{interval_tree_test_main.c => interval_tree_test.c} (100%)
+Merging drm-panel/drm/panel/for-next (02dfc65dc905 drm/panel: add support for EDT ET057090DHU panel)
+$ git merge drm-panel/drm/panel/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/panel/edt,et057090dhu.txt | 7 +++
+ .../devicetree/bindings/panel/edt,et070080dh6.txt | 10 ++++
+ .../devicetree/bindings/panel/edt,etm0700g0dh6.txt | 10 ++++
+ drivers/gpu/drm/panel/panel-ld9040.c | 3 ++
+ drivers/gpu/drm/panel/panel-s6e8aa0.c | 1 +
+ drivers/gpu/drm/panel/panel-simple.c | 55 ++++++++++++++++++++++
+ 6 files changed, 86 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/panel/edt,et057090dhu.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/edt,et070080dh6.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/edt,etm0700g0dh6.txt
+Merging drm-intel/for-linux-next (d3b448d9917a drm/i915: Only unpin the default ctx object if it exists)
+$ git merge drm-intel/for-linux-next
+Auto-merging include/drm/i915_pciids.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/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging arch/x86/kernel/early-quirks.c
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/early-quirks.c | 46 +-
+ drivers/gpu/drm/i915/Kconfig | 1 +
+ drivers/gpu/drm/i915/Makefile | 7 +
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 158 ++++--
+ drivers/gpu/drm/i915/i915_debugfs.c | 124 +++--
+ drivers/gpu/drm/i915/i915_dma.c | 3 +-
+ drivers/gpu/drm/i915/i915_drv.c | 398 +++++++++++++-
+ drivers/gpu/drm/i915/i915_drv.h | 132 ++++-
+ drivers/gpu/drm/i915/i915_gem.c | 71 ++-
+ drivers/gpu/drm/i915/i915_gem_context.c | 9 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 +
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 5 +
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 95 +++-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 1 +
+ drivers/gpu/drm/i915/i915_gem_render_state.c | 194 +++++++
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 711 ++++++++++++++++++++++++++
+ drivers/gpu/drm/i915/i915_gpu_error.c | 2 +
+ drivers/gpu/drm/i915/i915_irq.c | 317 +++++++++++-
+ drivers/gpu/drm/i915/i915_reg.h | 213 +++++++-
+ drivers/gpu/drm/i915/intel_ddi.c | 99 ++--
+ drivers/gpu/drm/i915/intel_display.c | 626 ++++++++++++++++-------
+ drivers/gpu/drm/i915/intel_dp.c | 240 ++++++++-
+ drivers/gpu/drm/i915/intel_drv.h | 31 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 31 +-
+ drivers/gpu/drm/i915/intel_dsi.h | 13 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 30 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 144 +++++-
+ drivers/gpu/drm/i915/intel_lvds.c | 14 -
+ drivers/gpu/drm/i915/intel_pm.c | 78 ++-
+ drivers/gpu/drm/i915/intel_renderstate.h | 48 ++
+ drivers/gpu/drm/i915/intel_renderstate_gen6.c | 289 +++++++++++
+ drivers/gpu/drm/i915/intel_renderstate_gen7.c | 253 +++++++++
+ drivers/gpu/drm/i915/intel_renderstate_gen8.c | 479 +++++++++++++++++
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 70 +--
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 11 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 33 +-
+ include/drm/i915_pciids.h | 6 +
+ include/uapi/drm/i915_drm.h | 16 +
+ 38 files changed, 4451 insertions(+), 555 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.c
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_userptr.c
+ create mode 100644 drivers/gpu/drm/i915/intel_renderstate.h
+ create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen6.c
+ create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen7.c
+ create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen8.c
+Merging drm-tegra/drm/tegra/for-next (f00e104dc165 drm/tegra: gem - Make tegra_bo_import() static)
+$ 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/gem.c | 3 +-
+ 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 +
+ 13 files changed, 809 insertions(+), 472 deletions(-)
+Merging sound/for-next (d576422eda7f ALSA: hda - if statement not indented)
+$ git merge sound/for-next
+Auto-merging sound/pci/hda/patch_realtek.c
+Auto-merging sound/pci/hda/patch_hdmi.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ 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/hda_generic.c | 2 +-
+ sound/pci/hda/patch_hdmi.c | 4 -
+ sound/pci/hda/patch_realtek.c | 106 +++++++++-
+ 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 +-
+ 15 files changed, 712 insertions(+), 151 deletions(-)
+ create mode 100644 sound/usb/bcd2000/Makefile
+ create mode 100644 sound/usb/bcd2000/bcd2000.c
+Merging sound-asoc/for-next (4e5b5b812a7a Merge remote-tracking branches 'asoc/topic/wm8955' and 'asoc/topic/wm8985' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing sound/soc/sirf/sirf-audio-port.h
+Auto-merging sound/soc/intel/sst-mfld-platform-pcm.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/mc13xxx.txt | 3 +
+ Documentation/devicetree/bindings/sound/ak4104.txt | 3 +
+ .../devicetree/bindings/sound/cs42l56.txt | 63 +
+ .../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 | 131 ++
+ 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/cs42l56.h | 48 +
+ include/sound/rcar_snd.h | 32 +-
+ include/sound/rt5640.h | 4 +
+ include/sound/rt5645.h | 25 +
+ include/sound/rt5651.h | 21 +
+ include/sound/soc-dai.h | 2 -
+ include/sound/soc-dapm.h | 20 +-
+ include/sound/soc.h | 155 +-
+ include/sound/sta350.h | 57 +
+ include/trace/events/asoc.h | 92 -
+ sound/soc/atmel/Kconfig | 2 +-
+ sound/soc/atmel/atmel-pcm-pdc.c | 63 -
+ sound/soc/codecs/88pm860x-codec.c | 20 +-
+ sound/soc/codecs/Kconfig | 32 +-
+ sound/soc/codecs/Makefile | 10 +
+ 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/ak4642.c | 75 +-
+ 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/cs42l52.c | 12 -
+ sound/soc/codecs/cs42l56.c | 1427 +++++++++++
+ sound/soc/codecs/cs42l56.h | 175 ++
+ 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 | 87 +-
+ sound/soc/codecs/max98090.h | 1 +
+ 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 | 424 ++--
+ sound/soc/codecs/rt5640.h | 10 +-
+ sound/soc/codecs/rt5645.c | 2475 ++++++++++++++++++++
+ sound/soc/codecs/rt5645.h | 2188 +++++++++++++++++
+ 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 | 1311 +++++++++++
+ sound/soc/codecs/sta350.h | 238 ++
+ sound/soc/codecs/tas5086.c | 4 +-
+ sound/soc/codecs/tlv320aic23-i2c.c | 1 +
+ sound/soc/codecs/tlv320aic23.c | 4 +-
+ sound/soc/codecs/tlv320aic31xx.c | 1 +
+ 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 | 20 +-
+ 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 | 77 +-
+ sound/soc/fsl/fsl_esai.c | 32 +-
+ sound/soc/fsl/fsl_sai.c | 255 +-
+ sound/soc/fsl/fsl_sai.h | 16 +
+ sound/soc/fsl/fsl_spdif.c | 186 +-
+ sound/soc/fsl/fsl_spdif.h | 14 +-
+ sound/soc/fsl/fsl_ssi.c | 150 +-
+ sound/soc/fsl/imx-pcm-dma.c | 1 -
+ sound/soc/generic/simple-card.c | 250 +-
+ sound/soc/intel/Makefile | 2 +-
+ sound/soc/intel/byt-rt5640.c | 28 +-
+ sound/soc/intel/sst-baytrail-dsp.c | 14 +-
+ sound/soc/intel/sst-baytrail-ipc.c | 124 +-
+ sound/soc/intel/sst-baytrail-ipc.h | 7 +-
+ sound/soc/intel/sst-baytrail-pcm.c | 160 +-
+ sound/soc/intel/sst-dsp-priv.h | 2 +
+ sound/soc/intel/sst-firmware.c | 42 +-
+ sound/soc/intel/sst-haswell-pcm.c | 8 +-
+ sound/soc/intel/sst-mfld-dsp.h | 8 -
+ sound/soc/intel/sst-mfld-platform-compress.c | 237 ++
+ ...sst-mfld-platform.c => sst-mfld-platform-pcm.c} | 250 +-
+ sound/soc/intel/sst-mfld-platform.h | 11 +-
+ 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 | 4 +-
+ 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 | 22 +-
+ sound/soc/samsung/Makefile | 2 +
+ sound/soc/samsung/i2s.c | 4 +-
+ sound/soc/samsung/idma.c | 2 +-
+ sound/soc/samsung/snow.c | 123 +
+ sound/soc/sh/Kconfig | 2 +-
+ sound/soc/sh/rcar/Makefile | 2 +-
+ sound/soc/sh/rcar/adg.c | 57 +-
+ sound/soc/sh/rcar/core.c | 163 +-
+ sound/soc/sh/rcar/dvc.c | 273 +++
+ sound/soc/sh/rcar/gen.c | 25 +-
+ sound/soc/sh/rcar/rsnd.h | 68 +-
+ sound/soc/sh/rcar/src.c | 190 +-
+ sound/soc/sh/rcar/ssi.c | 85 +-
+ 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-compress.c | 6 +-
+ sound/soc/soc-core.c | 991 ++++----
+ sound/soc/soc-dapm.c | 259 +-
+ sound/soc/soc-devres.c | 35 +
+ sound/soc/soc-io.c | 296 ++-
+ sound/soc/soc-pcm.c | 27 +-
+ 185 files changed, 16660 insertions(+), 3215 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/cs42l56.txt
+ 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/cs42l56.h
+ create mode 100644 include/sound/rt5645.h
+ 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/cs42l56.c
+ create mode 100644 sound/soc/codecs/cs42l56.h
+ create mode 100644 sound/soc/codecs/rt5645.c
+ create mode 100644 sound/soc/codecs/rt5645.h
+ 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/intel/sst-mfld-platform-compress.c
+ rename sound/soc/intel/{sst-mfld-platform.c => sst-mfld-platform-pcm.c} (67%)
+ create mode 100644 sound/soc/omap/omap-pcm.h
+ create mode 100644 sound/soc/samsung/snow.c
+ create mode 100644 sound/soc/sh/rcar/dvc.c
+ delete mode 100644 sound/soc/sirf/sirf-audio-port.h
+Merging modules/modules-next (4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.)
+$ git merge modules/modules-next
+Auto-merging kernel/module.c
+Auto-merging init/main.c
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 40 +++++++++++++--------
+ drivers/hid/hid-lg4ff.c | 2 +-
+ drivers/hid/hid-picolcd_fb.c | 2 +-
+ drivers/mtd/devices/docg3.c | 4 +--
+ drivers/regulator/virtual.c | 10 +++---
+ drivers/scsi/pm8001/pm8001_ctl.c | 2 +-
+ drivers/staging/speakup/kobjects.c | 62 ++++++++++++++++----------------
+ drivers/staging/speakup/speakup_acntpc.c | 14 ++++----
+ drivers/staging/speakup/speakup_acntsa.c | 22 ++++++------
+ drivers/staging/speakup/speakup_apollo.c | 16 ++++-----
+ drivers/staging/speakup/speakup_audptr.c | 16 ++++-----
+ drivers/staging/speakup/speakup_bns.c | 14 ++++----
+ drivers/staging/speakup/speakup_decext.c | 16 ++++-----
+ drivers/staging/speakup/speakup_decpc.c | 16 ++++-----
+ drivers/staging/speakup/speakup_dectlk.c | 16 ++++-----
+ drivers/staging/speakup/speakup_dtlk.c | 20 +++++------
+ drivers/staging/speakup/speakup_dummy.c | 14 ++++----
+ drivers/staging/speakup/speakup_keypc.c | 10 +++---
+ drivers/staging/speakup/speakup_ltlk.c | 20 +++++------
+ drivers/staging/speakup/speakup_soft.c | 22 ++++++------
+ drivers/staging/speakup/speakup_spkout.c | 16 ++++-----
+ drivers/staging/speakup/speakup_txprt.c | 14 ++++----
+ drivers/video/fbdev/sm501fb.c | 2 +-
+ include/linux/cpumask.h | 2 +-
+ include/linux/moduleparam.h | 2 +-
+ init/main.c | 33 ++++++++++++++---
+ kernel/module.c | 44 +++++++++++++----------
+ kernel/params.c | 25 +++++++------
+ samples/kobject/kobject-example.c | 7 ++--
+ samples/kobject/kset-example.c | 7 ++--
+ scripts/mod/modpost.c | 2 ++
+ 31 files changed, 271 insertions(+), 221 deletions(-)
+Merging virtio/virtio-next (a17597d3b418 virtio-rng: fixes for device registration/unregistration)
+$ git merge virtio/virtio-next
+Merge made by the 'recursive' strategy.
+ drivers/char/hw_random/virtio-rng.c | 105 +++++++++++++++++++++++-------------
+ drivers/s390/kvm/virtio_ccw.c | 49 ++++++++++++-----
+ drivers/virtio/virtio_ring.c | 15 ++++++
+ include/linux/virtio.h | 2 +
+ 4 files changed, 121 insertions(+), 50 deletions(-)
+Merging input/next (90550e6fb19f Input: gpio-keys - move the gpio-keys bindings documentation)
+$ git merge input/next
+Auto-merging drivers/input/touchscreen/Makefile
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/input/mouse/Kconfig
+Auto-merging drivers/input/keyboard/Kconfig
+Merge made by the 'recursive' strategy.
+ .../{gpio/gpio_keys.txt => input/gpio-keys.txt} | 0
+ .../devicetree/bindings/input/st-keyscan.txt | 60 ++++
+ .../bindings/input/touchscreen/sun4i.txt | 20 ++
+ drivers/input/evdev.c | 18 --
+ drivers/input/input-polldev.c | 131 +++++++-
+ drivers/input/keyboard/Kconfig | 11 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/clps711x-keypad.c | 2 +-
+ drivers/input/keyboard/gpio_keys.c | 145 ++++-----
+ drivers/input/keyboard/gpio_keys_polled.c | 100 ++----
+ drivers/input/keyboard/imx_keypad.c | 2 +-
+ 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/pmic8xxx-pwrkey.c | 8 +-
+ drivers/input/misc/rotary_encoder.c | 2 +-
+ drivers/input/misc/twl6040-vibra.c | 83 ++---
+ drivers/input/mouse/Kconfig | 2 +-
+ drivers/input/serio/apbps2.c | 2 +-
+ drivers/input/serio/olpc_apsp.c | 2 +-
+ drivers/input/tablet/wacom_sys.c | 19 ++
+ drivers/input/tablet/wacom_wac.c | 46 ++-
+ drivers/input/tablet/wacom_wac.h | 4 +
+ drivers/input/touchscreen/Kconfig | 13 +-
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/ad7877.c | 5 -
+ drivers/input/touchscreen/ads7846.c | 2 +-
+ drivers/input/touchscreen/auo-pixcir-ts.c | 2 +-
+ drivers/input/touchscreen/egalax_ts.c | 2 +-
+ drivers/input/touchscreen/lpc32xx_ts.c | 2 +-
+ drivers/input/touchscreen/mms114.c | 2 +-
+ drivers/input/touchscreen/sun4i-ts.c | 339 +++++++++++++++++++++
+ drivers/input/touchscreen/tsc2005.c | 41 +--
+ drivers/input/touchscreen/zforce_ts.c | 2 +-
+ include/linux/gpio_keys.h | 48 ++-
+ include/linux/input-polldev.h | 3 +
+ 37 files changed, 1162 insertions(+), 329 deletions(-)
+ rename Documentation/devicetree/bindings/{gpio/gpio_keys.txt => input/gpio-keys.txt} (100%)
+ create mode 100644 Documentation/devicetree/bindings/input/st-keyscan.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
+ create mode 100644 drivers/input/keyboard/st-keyscan.c
+ create mode 100644 drivers/input/touchscreen/sun4i-ts.c
+Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging block/for-next (5572bbbc92a1 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/ubi/block.c
+Auto-merging drivers/mtd/mtd_blkdevs.c
+Auto-merging drivers/block/floppy.c
+Removing drivers/block/drbd/drbd_wrappers.h
+Merge made by the 'recursive' strategy.
+ block/blk-core.c | 52 +-
+ block/blk-flush.c | 26 +-
+ block/blk-iopoll.c | 4 +-
+ block/blk-map.c | 3 -
+ block/blk-mq-cpumap.c | 6 +-
+ block/blk-mq-sysfs.c | 50 +-
+ block/blk-mq-tag.c | 444 +++++++++---
+ block/blk-mq-tag.h | 52 +-
+ block/blk-mq.c | 657 ++++++++++-------
+ block/blk-mq.h | 15 +-
+ block/blk-throttle.c | 10 +-
+ block/blk-timeout.c | 47 +-
+ block/blk.h | 3 +-
+ block/bsg.c | 2 +-
+ block/cfq-iosched.c | 4 +-
+ 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 | 1022 +++++++++++----------------
+ drivers/block/mtip32xx/mtip32xx.h | 24 +-
+ 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 | 77 +-
+ drivers/block/xen-blkfront.c | 4 +-
+ drivers/block/xsysace.c | 4 +-
+ drivers/block/z2ram.c | 6 +-
+ drivers/cdrom/cdrom.c | 1357 ++++++++++++++++++------------------
+ 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 | 70 +-
+ include/linux/blkdev.h | 28 +-
+ 62 files changed, 2911 insertions(+), 2401 deletions(-)
+ delete mode 100644 drivers/block/drbd/drbd_wrappers.h
+Merging device-mapper/for-next (42d32438c4f9 dm thin: cleanup noflush_work to use a proper completion)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm.c
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-crypt.c | 61 ++++++-----------------------
+ drivers/md/dm-mpath.c | 2 +-
+ drivers/md/dm-snap.c | 67 +++++++++++++++++++++++---------
+ drivers/md/dm-thin.c | 89 ++++++++++++++++++++++++++++++++++---------
+ drivers/md/dm.c | 69 ++++++++++++++++++++++++++-------
+ include/linux/device-mapper.h | 2 +
+ 6 files changed, 189 insertions(+), 101 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 (197160d52e85 mmc: sdhci: remove mdelay in eMMC tuning)
+$ git merge mmc/mmc-next
+Auto-merging drivers/mmc/host/rtsx_pci_sdmmc.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mmc/mmc.txt | 2 +
+ .../devicetree/bindings/mmc/moxa,moxart-mmc.txt | 30 +
+ .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 5 -
+ MAINTAINERS | 2 +-
+ drivers/mmc/core/bus.c | 9 +-
+ drivers/mmc/core/core.c | 52 +-
+ drivers/mmc/core/debugfs.c | 8 +-
+ drivers/mmc/core/host.c | 4 +
+ drivers/mmc/core/mmc.c | 678 +++++----
+ drivers/mmc/core/sd.c | 28 +-
+ drivers/mmc/core/sd.h | 1 -
+ drivers/mmc/core/sdio.c | 53 +-
+ drivers/mmc/core/sdio_bus.c | 14 +-
+ drivers/mmc/core/slot-gpio.c | 4 +-
+ drivers/mmc/host/Kconfig | 16 +
+ drivers/mmc/host/Makefile | 2 +
+ drivers/mmc/host/atmel-mci.c | 13 +-
+ 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/jz4740_mmc.c | 11 +-
+ drivers/mmc/host/mmci.c | 6 +-
+ drivers/mmc/host/moxart-mmc.c | 730 ++++++++++
+ drivers/mmc/host/mvsdio.c | 20 +-
+ drivers/mmc/host/mxcmmc.c | 140 +-
+ drivers/mmc/host/mxs-mmc.c | 7 +
+ drivers/mmc/host/omap_hsmmc.c | 4 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 5 +
+ drivers/mmc/host/rtsx_usb_sdmmc.c | 1456 ++++++++++++++++++++
+ drivers/mmc/host/sdhci-s3c.c | 3 -
+ drivers/mmc/host/sdhci.c | 9 +-
+ drivers/mmc/host/sh_mmcif.c | 9 +-
+ drivers/net/wireless/rsi/rsi_91x_sdio.c | 4 +-
+ include/linux/mmc/card.h | 29 +-
+ include/linux/mmc/dw_mmc.h | 14 -
+ include/linux/mmc/host.h | 56 +-
+ include/linux/mmc/mmc.h | 23 +-
+ 37 files changed, 2909 insertions(+), 725 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/moxa,moxart-mmc.txt
+ create mode 100644 drivers/mmc/host/moxart-mmc.c
+ create mode 100644 drivers/mmc/host/rtsx_usb_sdmmc.c
+Merging mmc-uh/next (0bb692d67ce7 mmc: mmci: Enforce max frequency configuration through DT)
+$ git merge mmc-uh/next
+Auto-merging drivers/mmc/host/mmci.c
+Removing arch/arm/mach-ux500/board-mop500-sdi.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mmc/mmci.txt | 54 ++++-
+ arch/arm/boot/dts/ste-ccu9540.dts | 6 +-
+ arch/arm/boot/dts/ste-href.dtsi | 19 +-
+ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 4 +-
+ arch/arm/boot/dts/ste-snowball.dts | 4 +-
+ arch/arm/boot/dts/ste-u300.dts | 4 +-
+ arch/arm/mach-ux500/Makefile | 3 +-
+ arch/arm/mach-ux500/board-mop500-sdi.c | 166 -------------
+ arch/arm/mach-ux500/board-mop500.h | 5 -
+ arch/arm/mach-ux500/cpu-db8500.c | 4 -
+ drivers/mmc/host/mmci.c | 324 +++++++------------------
+ drivers/mmc/host/mmci.h | 14 +-
+ include/linux/amba/mmci.h | 42 ----
+ 13 files changed, 169 insertions(+), 480 deletions(-)
+ delete mode 100644 arch/arm/mach-ux500/board-mop500-sdi.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 (41040c9701c2 raid5: add an option to avoid copy data from bio to stripe cache)
+$ git merge md/for-next
+Auto-merging drivers/md/md.c
+Merge made by the 'recursive' strategy.
+ drivers/md/md.c | 10 +++++
+ drivers/md/raid5.c | 114 +++++++++++++++++++++++++++++++++++++++++++----------
+ drivers/md/raid5.h | 4 +-
+ 3 files changed, 107 insertions(+), 21 deletions(-)
+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 (cac74bcff07d Merge branches '3.16/fbdev' and '3.16/fbdev-omap' into for-next)
+$ git merge omap_dss2/for-next
+Removing drivers/video/fbdev/omap2/dss/venc_panel.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/video/hdmi-connector.txt | 1 +
+ .../devicetree/bindings/video/panel-dpi.txt | 45 +
+ .../devicetree/bindings/video/ti,omap4-dss.txt | 4 +
+ .../devicetree/bindings/video/ti,omap5-dss.txt | 96 +++
+ .../bindings/video/toppoly,td028ttec1.txt | 30 +
+ arch/arm/mach-omap2/display.c | 7 +
+ drivers/video/console/fbcon.c | 1 +
+ drivers/video/fbdev/Kconfig | 10 +-
+ drivers/video/fbdev/core/fbmem.c | 7 +-
+ drivers/video/fbdev/core/fbmon.c | 9 +-
+ drivers/video/fbdev/da8xx-fb.c | 14 +
+ drivers/video/fbdev/exynos/Kconfig | 2 +-
+ drivers/video/fbdev/gbefb.c | 2 +-
+ drivers/video/fbdev/mbx/Makefile | 3 +-
+ drivers/video/fbdev/mbx/mbxdebugfs.c | 2 +-
+ drivers/video/fbdev/mbx/mbxfb.c | 2 +
+ drivers/video/fbdev/mmp/Kconfig | 2 +-
+ drivers/video/fbdev/mmp/fb/mmpfb.c | 9 +-
+ drivers/video/fbdev/mmp/hw/Kconfig | 6 +-
+ drivers/video/fbdev/mmp/hw/mmp_ctrl.h | 32 -
+ drivers/video/fbdev/mx3fb.c | 4 +-
+ drivers/video/fbdev/omap/Kconfig | 9 +
+ drivers/video/fbdev/omap/Makefile | 23 +-
+ drivers/video/fbdev/omap/omapfb_main.c | 1 +
+ .../fbdev/omap2/displays-new/connector-hdmi.c | 25 +-
+ drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 91 +-
+ .../omap2/displays-new/panel-tpo-td028ttec1.c | 33 +-
+ drivers/video/fbdev/omap2/dss/Kconfig | 22 +-
+ drivers/video/fbdev/omap2/dss/Makefile | 6 +-
+ drivers/video/fbdev/omap2/dss/core.c | 6 +
+ drivers/video/fbdev/omap2/dss/dispc.c | 8 +-
+ drivers/video/fbdev/omap2/dss/dpi.c | 4 +
+ drivers/video/fbdev/omap2/dss/dsi.c | 18 +
+ drivers/video/fbdev/omap2/dss/dss.c | 20 +-
+ drivers/video/fbdev/omap2/dss/dss.h | 3 +
+ drivers/video/fbdev/omap2/dss/dss_features.c | 70 +-
+ drivers/video/fbdev/omap2/dss/hdmi.h | 17 +-
+ drivers/video/fbdev/omap2/dss/hdmi4.c | 113 ++-
+ drivers/video/fbdev/omap2/dss/hdmi4_core.c | 21 +-
+ drivers/video/fbdev/omap2/dss/hdmi5.c | 829 ++++++++++++++++++
+ drivers/video/fbdev/omap2/dss/hdmi5_core.c | 922 +++++++++++++++++++++
+ drivers/video/fbdev/omap2/dss/hdmi5_core.h | 306 +++++++
+ drivers/video/fbdev/omap2/dss/hdmi_common.c | 41 +
+ drivers/video/fbdev/omap2/dss/hdmi_phy.c | 260 ++++--
+ drivers/video/fbdev/omap2/dss/hdmi_pll.c | 102 ++-
+ drivers/video/fbdev/omap2/dss/hdmi_wp.c | 2 +-
+ drivers/video/fbdev/omap2/dss/venc_panel.c | 232 ------
+ drivers/video/fbdev/pxa3xx-gcu.c | 6 +-
+ drivers/video/fbdev/wm8505fb.c | 2 +-
+ include/linux/fb.h | 3 +-
+ include/linux/omap-dma.h | 2 +-
+ include/video/omapdss.h | 8 +-
+ 52 files changed, 3016 insertions(+), 477 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/video/panel-dpi.txt
+ create mode 100644 Documentation/devicetree/bindings/video/ti,omap5-dss.txt
+ create mode 100644 Documentation/devicetree/bindings/video/toppoly,td028ttec1.txt
+ create mode 100644 drivers/video/fbdev/omap2/dss/hdmi5.c
+ create mode 100644 drivers/video/fbdev/omap2/dss/hdmi5_core.c
+ create mode 100644 drivers/video/fbdev/omap2/dss/hdmi5_core.h
+ delete mode 100644 drivers/video/fbdev/omap2/dss/venc_panel.c
+Merging regulator/for-next (53aa16752360 Merge remote-tracking branches 'regulator/topic/tps65090' and 'regulator/topic/tps65217' into regulator-next)
+$ git merge regulator/for-next
+Resolved 'drivers/regulator/tps65090-regulator.c' using previous resolution.
+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
+[master 6268af1d6607] 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/anatop-regulator.c | 2 +-
+ drivers/regulator/arizona-micsupp.c | 1 +
+ drivers/regulator/axp20x-regulator.c | 285 ++++++++++++++++++++++
+ drivers/regulator/core.c | 3 +-
+ drivers/regulator/max8952.c | 2 +-
+ drivers/regulator/of_regulator.c | 31 ++-
+ drivers/regulator/palmas-regulator.c | 2 +-
+ drivers/regulator/pbias-regulator.c | 25 +-
+ drivers/regulator/s2mpa01.c | 18 +-
+ drivers/regulator/s2mps11.c | 113 +++++++--
+ drivers/regulator/s5m8767.c | 37 +--
+ drivers/regulator/st-pwm.c | 2 +-
+ drivers/regulator/tps65090-regulator.c | 162 ++++++++++--
+ drivers/regulator/tps65217-regulator.c | 4 +-
+ drivers/regulator/vexpress.c | 2 +-
+ include/linux/mfd/samsung/s2mps14.h | 2 +
+ include/linux/mfd/tps65217.h | 1 -
+ 20 files changed, 614 insertions(+), 100 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 (47dd0b76ace9 selinux: conditionally reschedule in hashtab_insert while loading selinux policy)
+$ git merge selinux/next
+Auto-merging security/selinux/hooks.c
+Merge made by the 'recursive' strategy.
+ security/selinux/avc.c | 7 ++++++-
+ security/selinux/hooks.c | 11 +++++++----
+ security/selinux/include/avc.h | 4 ++--
+ security/selinux/ss/hashtab.c | 3 +++
+ security/selinux/ss/mls.c | 2 ++
+ 5 files changed, 20 insertions(+), 7 deletions(-)
+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 (4a40277d217d Merge branches 'iommu/fixes', 'arm/omap', 'arm/smmu', 'arm/shmobile', 'x86/amd' and 'arm/exynos' into next)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/iommu/samsung,sysmmu.txt | 70 ++
+ drivers/iommu/amd_iommu.c | 2 +-
+ drivers/iommu/amd_iommu_init.c | 2 +-
+ drivers/iommu/amd_iommu_v2.c | 2 +
+ drivers/iommu/arm-smmu.c | 4 +-
+ drivers/iommu/exynos-iommu.c | 1049 ++++++++++++--------
+ drivers/iommu/omap-iommu.c | 31 +-
+ drivers/iommu/omap-iopgtable.h | 3 -
+ drivers/iommu/shmobile-ipmmu.c | 20 +-
+ 9 files changed, 714 insertions(+), 469 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
+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 (5835f25117ef mm: Fix printk typo in dmapool.c)
+$ git merge trivial/for-next
+Resolved 'Documentation/devicetree/bindings/arm/omap/omap.txt' using previous resolution.
+Auto-merging scripts/mod/modpost.c
+Auto-merging lib/Kconfig.debug
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/of/base.c
+Auto-merging drivers/net/wireless/ath/ath6kl/wmi.h
+Auto-merging drivers/net/wireless/ath/ath10k/wmi.h
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging Documentation/networking/can.txt
+Auto-merging Documentation/hid/uhid.txt
+Auto-merging Documentation/gpio/consumer.txt
+Auto-merging Documentation/filesystems/proc.txt
+Auto-merging Documentation/edac.txt
+Auto-merging Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt
+Auto-merging Documentation/devicetree/bindings/arm/omap/omap.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/omap/omap.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d3634026a9c7] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DMA-attributes.txt | 2 +-
+ Documentation/devicetree/bindings/arm/omap/omap.txt | 2 +-
+ Documentation/devicetree/bindings/bus/mvebu-mbus.txt | 2 +-
+ Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 2 +-
+ Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt | 2 +-
+ Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt | 2 +-
+ Documentation/devicetree/bindings/mmc/samsung-sdhci.txt | 2 +-
+ Documentation/devicetree/bindings/mtd/gpmc-nand.txt | 2 +-
+ Documentation/devicetree/bindings/mtd/gpmc-nor.txt | 2 +-
+ Documentation/devicetree/bindings/mtd/gpmc-onenand.txt | 2 +-
+ .../devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt | 12 ++++++------
+ Documentation/devicetree/bindings/powerpc/4xx/reboot.txt | 2 +-
+ Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt | 2 +-
+ Documentation/devicetree/bindings/regulator/regulator.txt | 2 +-
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 2 +-
+ Documentation/dma-buf-sharing.txt | 6 +++---
+ Documentation/dynamic-debug-howto.txt | 2 +-
+ Documentation/edac.txt | 2 +-
+ Documentation/fb/sm501.txt | 2 +-
+ Documentation/fb/sstfb.txt | 2 +-
+ Documentation/filesystems/proc.txt | 4 ++--
+ Documentation/filesystems/sharedsubtree.txt | 2 +-
+ Documentation/gpio/consumer.txt | 2 +-
+ Documentation/hid/uhid.txt | 2 +-
+ Documentation/input/alps.txt | 2 +-
+ Documentation/input/input.txt | 2 +-
+ Documentation/mtd/nand/pxa3xx-nand.txt | 2 +-
+ Documentation/networking/can.txt | 2 +-
+ Documentation/networking/dccp.txt | 2 +-
+ Documentation/powerpc/transactional_memory.txt | 2 +-
+ Documentation/printk-formats.txt | 4 ++--
+ Documentation/rbtree.txt | 2 +-
+ Documentation/rfkill.txt | 2 +-
+ Documentation/robust-futexes.txt | 2 +-
+ Documentation/s390/monreader.txt | 2 +-
+ Documentation/security/Yama.txt | 2 +-
+ Documentation/sound/alsa/ALSA-Configuration.txt | 4 ++--
+ Documentation/trace/events.txt | 2 +-
+ Documentation/usb/mass-storage.txt | 2 +-
+ Documentation/virtual/kvm/api.txt | 2 +-
+ Documentation/vm/transhuge.txt | 4 ++--
+ Documentation/x86/earlyprintk.txt | 2 +-
+ Documentation/x86/i386/IO-APIC.txt | 2 +-
+ arch/arm64/include/asm/pgtable.h | 2 +-
+ drivers/base/dma-buf.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 2 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 4 ++--
+ drivers/net/wireless/ath/ath6kl/wmi.h | 2 +-
+ drivers/of/base.c | 4 ++--
+ drivers/pci/pci.c | 6 +++---
+ drivers/scsi/aic7xxx/aic79xx.h | 2 +-
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +-
+ include/linux/of_platform.h | 2 +-
+ include/net/wimax.h | 4 ++--
+ lib/Kconfig.debug | 4 ++--
+ mm/dmapool.c | 4 ++--
+ scripts/mod/modpost.c | 2 +-
+ 57 files changed, 75 insertions(+), 75 deletions(-)
+Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface)
+$ 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 e029993c31e5] 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/ia32/ia32entry.S | 12 ++++++------
+ arch/x86/kernel/entry_32.S | 11 +++++------
+ arch/x86/kernel/entry_64.S | 11 +++++------
+ 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 | 11 ++++++-----
+ include/uapi/linux/audit.h | 14 +-------------
+ kernel/auditsc.c | 17 +++++++----------
+ 36 files changed, 147 insertions(+), 122 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 (eafd370dfe48 Merge branch 'dt-bus-name' into for-next)
+$ git merge dt-rh/for-next
+Auto-merging include/linux/of_address.h
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/of/address.c
+Auto-merging arch/powerpc/platforms/pseries/setup.c
+Auto-merging arch/powerpc/mm/hash_utils_64.c
+Auto-merging arch/powerpc/kernel/fadump.c
+Auto-merging arch/powerpc/kernel/epapr_paravirt.c
+Auto-merging arch/arm/mach-exynos/exynos.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/address.c | 24 +-
+ drivers/of/fdt.c | 398 ++++++++++-----------------
+ drivers/of/of_reserved_mem.c | 4 +-
+ drivers/of/platform.c | 16 +-
+ drivers/of/selftest.c | 34 ++-
+ drivers/of/testcase-data/testcases.dtsi | 1 +
+ drivers/of/testcase-data/tests-platform.dtsi | 35 +++
+ include/linux/of_address.h | 1 -
+ include/linux/of_fdt.h | 63 +----
+ 46 files changed, 347 insertions(+), 646 deletions(-)
+ create mode 100644 drivers/of/testcase-data/tests-platform.dtsi
+Merging spi/for-next (38139d371eb8 Merge remote-tracking branches 'spi/topic/id-const', 'spi/topic/oom', 'spi/topic/pxa2xx', 'spi/topic/sirf' and 'spi/topic/workqueue' into spi-next)
+$ git merge spi/for-next
+Auto-merging include/linux/spi/adi_spi3.h
+Auto-merging drivers/spi/spi-adi-v3.c
+Auto-merging Documentation/devicetree/bindings/spi/spi-bus.txt
+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 | 13 +-
+ 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 | 9 +-
+ 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-dspi.c | 2 +-
+ 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-gpio.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-dma.c | 16 -
+ drivers/spi/spi-pxa2xx-pci.c | 76 ++-
+ drivers/spi/spi-pxa2xx.c | 11 +-
+ drivers/spi/spi-qup.c | 8 +-
+ 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-tegra114.c | 2 +-
+ drivers/spi/spi-tegra20-sflash.c | 2 +-
+ drivers/spi/spi-tegra20-slink.c | 2 +-
+ drivers/spi/spi-tle62x0.c | 4 +-
+ drivers/spi/spi-topcliff-pch.c | 5 +-
+ drivers/spi/spi.c | 128 ++--
+ .../bfin_spi3.h => include/linux/spi/adi_spi3.h | 20 +-
+ 45 files changed, 1396 insertions(+), 688 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 (1974363f7e89 Merge branch 'x86/x32')
+$ git merge tip/auto-latest
+Resolved 'drivers/block/mtip32xx/mtip32xx.c' using previous resolution.
+Resolved 'kernel/sched/idle.c' using previous resolution.
+Resolved 'net/ipv4/tcp_output.c' using previous resolution.
+Removing tools/virtio/linux/types.h
+Removing tools/perf/util/types.h
+Removing tools/perf/util/include/linux/types.h
+Removing tools/perf/util/include/linux/export.h
+Removing tools/lib/lockdep/uinclude/linux/export.h
+Auto-merging tools/include/linux/types.h
+Auto-merging tools/include/linux/export.h
+Auto-merging net/ipv4/tcp_output.c
+CONFLICT (content): Merge conflict in 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 kernel/workqueue.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/sched/idle.c
+CONFLICT (content): Merge conflict in kernel/sched/idle.c
+Auto-merging init/main.c
+Auto-merging include/linux/netdevice.h
+Auto-merging fs/nfs/write.c
+Auto-merging fs/nfs/inode.c
+Auto-merging fs/gfs2/sys.c
+Auto-merging fs/gfs2/recovery.c
+Auto-merging fs/gfs2/glops.c
+Auto-merging fs/ext4/resize.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/chelsio/cxgb4vf/sge.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/sge.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/md/dm-snap.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
+CONFLICT (content): Merge conflict in drivers/block/mtip32xx/mtip32xx.c
+Auto-merging block/blk-iopoll.c
+Removing arch/x86/vdso/vdsox32.S
+Removing arch/x86/vdso/vdso32.S
+Removing arch/x86/vdso/vdso.S
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/entry_32.S
+Removing arch/x86/include/asm/vdso32.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/kernel/topology.c
+Auto-merging arch/metag/include/asm/barrier.h
+Auto-merging arch/arm64/include/asm/barrier.h
+Auto-merging arch/arm64/include/asm/atomic.h
+Auto-merging arch/arm/kernel/topology.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 143582c43bd8] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/atomic_ops.txt | 31 +-
+ Documentation/kprobes.txt | 16 +-
+ Documentation/memory-barriers.txt | 42 +-
+ Documentation/timers/timer_stats.txt | 6 +-
+ Documentation/x86/x86_64/mm.txt | 2 +
+ arch/alpha/include/asm/atomic.h | 5 -
+ arch/alpha/include/asm/bitops.h | 3 -
+ arch/alpha/include/asm/thread_info.h | 4 +-
+ 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/arm/kernel/topology.c | 26 +
+ 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/asm/thread_info.h | 3 +-
+ arch/ia64/include/asm/topology.h | 24 -
+ 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/powerpc/kernel/smp.c | 31 +-
+ arch/s390/include/asm/atomic.h | 5 -
+ arch/s390/include/asm/barrier.h | 5 +-
+ arch/s390/include/asm/topology.h | 13 +-
+ arch/s390/kernel/topology.c | 20 +
+ 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/tile/include/asm/thread_info.h | 3 +-
+ arch/tile/include/asm/topology.h | 33 -
+ arch/x86/Kconfig | 25 +-
+ arch/x86/boot/compressed/eboot.c | 3 +-
+ arch/x86/boot/compressed/head_64.S | 2 +-
+ arch/x86/ia32/ia32_signal.c | 8 +-
+ 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/elf.h | 35 +-
+ arch/x86/include/asm/espfix.h | 16 +
+ arch/x86/include/asm/fixmap.h | 11 +-
+ 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/mmu.h | 2 +-
+ arch/x86/include/asm/pgtable_64_types.h | 2 +
+ arch/x86/include/asm/proto.h | 2 -
+ arch/x86/include/asm/setup.h | 2 +
+ arch/x86/include/asm/sync_bitops.h | 2 +-
+ arch/x86/include/asm/thread_info.h | 4 +-
+ arch/x86/include/asm/traps.h | 2 +-
+ arch/x86/include/asm/uprobes.h | 19 +-
+ arch/x86/include/asm/uv/uv_hub.h | 12 +-
+ arch/x86/include/asm/uv/uv_mmrs.h | 42 +-
+ arch/x86/include/asm/vdso.h | 74 +--
+ arch/x86/include/asm/vdso32.h | 11 -
+ arch/x86/include/asm/vvar.h | 20 +-
+ arch/x86/include/uapi/asm/vsyscall.h | 7 +-
+ arch/x86/kernel/Makefile | 1 +
+ 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/apm_32.c | 11 -
+ arch/x86/kernel/cpu/common.c | 37 ++
+ 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/cpu/perf_event_intel.c | 1 -
+ arch/x86/kernel/dumpstack.c | 9 +-
+ arch/x86/kernel/entry_32.S | 50 +-
+ arch/x86/kernel/entry_64.S | 101 ++-
+ arch/x86/kernel/espfix_64.c | 209 +++++++
+ arch/x86/kernel/hpet.c | 3 -
+ 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/ldt.c | 8 +-
+ arch/x86/kernel/nmi.c | 18 +-
+ arch/x86/kernel/paravirt.c | 6 +
+ arch/x86/kernel/process_64.c | 7 +-
+ arch/x86/kernel/signal.c | 6 +-
+ arch/x86/kernel/smpboot.c | 7 +
+ arch/x86/kernel/traps.c | 35 +-
+ arch/x86/kernel/uprobes.c | 688 +++++++++++++--------
+ arch/x86/kernel/vsyscall_64.c | 15 +-
+ arch/x86/lib/thunk_32.S | 3 +-
+ arch/x86/lib/thunk_64.S | 3 +
+ arch/x86/mm/dump_pagetables.c | 44 +-
+ arch/x86/mm/fault.c | 34 +-
+ arch/x86/mm/init_64.c | 13 +-
+ arch/x86/mm/ioremap.c | 32 +-
+ arch/x86/mm/pgtable.c | 27 +-
+ 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/x86/syscalls/syscall_64.tbl | 6 +-
+ arch/x86/um/vdso/vma.c | 2 +-
+ arch/x86/vdso/.gitignore | 5 +-
+ arch/x86/vdso/Makefile | 90 +--
+ arch/x86/vdso/vclock_gettime.c | 26 +-
+ arch/x86/vdso/vdso-layout.lds.S | 40 +-
+ arch/x86/vdso/vdso.S | 3 -
+ arch/x86/vdso/vdso.lds.S | 7 +-
+ arch/x86/vdso/vdso2c.c | 156 +++++
+ arch/x86/vdso/vdso2c.h | 154 +++++
+ arch/x86/vdso/vdso32-setup.c | 196 +-----
+ arch/x86/vdso/vdso32.S | 9 -
+ arch/x86/vdso/vdso32/vdso32.lds.S | 15 +-
+ arch/x86/vdso/vdsox32.S | 3 -
+ arch/x86/vdso/vdsox32.lds.S | 7 +-
+ arch/x86/vdso/vma.c | 222 ++++---
+ arch/x86/xen/mmu.c | 8 +-
+ arch/x86/xen/setup.c | 11 +-
+ 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/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 | 10 +
+ 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 | 13 +-
+ include/linux/irqdesc.h | 4 +
+ include/linux/kprobes.h | 21 +-
+ include/linux/netdevice.h | 2 +-
+ include/linux/perf_event.h | 1 +
+ include/linux/sched.h | 113 ++--
+ 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/topology.h | 128 +---
+ include/linux/tracehook.h | 2 +-
+ include/net/ip_vs.h | 4 +-
+ init/main.c | 4 +
+ kernel/debug/debug_core.c | 4 +-
+ kernel/events/core.c | 160 +++--
+ kernel/events/uprobes.c | 33 +-
+ kernel/futex.c | 4 +-
+ kernel/hrtimer.c | 1 +
+ kernel/irq/manage.c | 4 +-
+ kernel/irq/spurious.c | 106 +++-
+ kernel/kmod.c | 2 +-
+ kernel/kprobes.c | 392 +++++++-----
+ kernel/locking/lockdep_internals.h | 6 +-
+ kernel/locking/locktorture.c | 2 +-
+ kernel/locking/rwsem-xadd.c | 49 ++
+ kernel/notifier.c | 22 +-
+ kernel/rcu/tree.c | 22 +-
+ kernel/rcu/tree_plugin.h | 8 +-
+ kernel/sched/core.c | 321 ++++++----
+ kernel/sched/cpudeadline.c | 4 +-
+ kernel/sched/cpupri.c | 9 +-
+ kernel/sched/cputime.c | 32 +-
+ kernel/sched/deadline.c | 5 +-
+ kernel/sched/fair.c | 66 +-
+ kernel/sched/idle.c | 126 ++--
+ kernel/sched/rt.c | 119 +++-
+ kernel/sched/sched.h | 14 +-
+ kernel/sched/wait.c | 2 +-
+ kernel/smp.c | 42 ++
+ kernel/sysctl.c | 5 +
+ 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 | 66 +-
+ kernel/workqueue.c | 6 +-
+ mm/backing-dev.c | 2 +-
+ mm/filemap.c | 4 +-
+ mm/huge_memory.c | 2 +-
+ mm/memory.c | 3 -
+ 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/include/linux/compiler.h | 2 +
+ tools/{virtio => include}/linux/export.h | 5 +
+ .../lockdep/uinclude => include}/linux/types.h | 29 +-
+ tools/lib/lockdep/Makefile | 2 +-
+ tools/lib/lockdep/uinclude/linux/export.h | 7 -
+ tools/perf/Documentation/perf-diff.txt | 21 +-
+ tools/perf/Documentation/perf-report.txt | 24 +-
+ tools/perf/Documentation/perf-top.txt | 18 +-
+ tools/perf/MANIFEST | 2 +
+ tools/perf/Makefile.perf | 9 +-
+ tools/perf/arch/arm64/Makefile | 7 +
+ tools/perf/arch/arm64/include/perf_regs.h | 88 +++
+ tools/perf/arch/arm64/util/dwarf-regs.c | 80 +++
+ tools/perf/arch/arm64/util/unwind-libunwind.c | 82 +++
+ tools/perf/arch/x86/include/perf_regs.h | 2 +-
+ tools/perf/arch/x86/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/x86/util/tsc.c | 2 +-
+ tools/perf/arch/x86/util/tsc.h | 2 +-
+ 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/config/Makefile | 8 +-
+ tools/perf/perf-completion.sh | 4 +-
+ tools/perf/perf-sys.h | 190 ++++++
+ tools/perf/perf.h | 248 +-------
+ tools/perf/tests/attr.c | 7 -
+ tools/perf/tests/builtin-test.c | 12 +
+ tools/perf/tests/code-reading.c | 3 +-
+ tools/perf/tests/dso-data.c | 2 +-
+ tools/perf/tests/dwarf-unwind.c | 2 +-
+ tools/perf/tests/hists_common.c | 148 +++++
+ tools/perf/tests/hists_common.h | 44 ++
+ tools/perf/tests/hists_filter.c | 315 ++++++++++
+ tools/perf/tests/hists_link.c | 141 +----
+ tools/perf/tests/keep-tracking.c | 2 +-
+ tools/perf/tests/mmap-thread-lookup.c | 233 +++++++
+ tools/perf/tests/parse-events.c | 142 +++--
+ tools/perf/tests/parse-no-sample-id-all.c | 2 +-
+ tools/perf/tests/perf-time-to-tsc.c | 3 +-
+ tools/perf/tests/rdpmc.c | 2 +-
+ tools/perf/tests/sample-parsing.c | 2 +-
+ tools/perf/tests/tests.h | 3 +
+ tools/perf/tests/thread-mg-share.c | 90 +++
+ tools/perf/ui/browser.h | 4 +-
+ tools/perf/ui/browsers/hists.c | 131 ++--
+ tools/perf/ui/gtk/hists.c | 11 +-
+ tools/perf/ui/hist.c | 8 +-
+ tools/perf/ui/progress.h | 2 +-
+ tools/perf/ui/stdio/hist.c | 2 +-
+ tools/perf/util/annotate.h | 2 +-
+ tools/perf/util/build-id.h | 2 +-
+ tools/perf/util/callchain.c | 78 +++
+ tools/perf/util/callchain.h | 8 +
+ tools/perf/util/config.c | 4 +
+ tools/perf/util/cpumap.c | 160 +++++
+ tools/perf/util/cpumap.h | 35 ++
+ tools/perf/util/dso.h | 2 +-
+ tools/perf/util/event.c | 2 +-
+ tools/perf/util/event.h | 24 +
+ tools/perf/util/evsel.h | 9 +-
+ tools/perf/util/header.h | 4 +-
+ tools/perf/util/hist.c | 112 +++-
+ tools/perf/util/hist.h | 19 +-
+ tools/perf/util/include/linux/bitmap.h | 3 +
+ tools/perf/util/include/linux/export.h | 6 -
+ tools/perf/util/include/linux/list.h | 1 +
+ tools/perf/util/include/linux/types.h | 29 -
+ tools/perf/util/machine.c | 11 +
+ tools/perf/util/map.c | 23 +
+ tools/perf/util/map.h | 14 +-
+ tools/perf/util/parse-events.h | 3 +-
+ tools/perf/util/parse-events.y | 14 +-
+ tools/perf/util/perf_regs.h | 2 +-
+ tools/perf/util/pmu.c | 6 +-
+ tools/perf/util/pmu.h | 2 +-
+ tools/perf/util/stat.h | 2 +-
+ tools/perf/util/svghelper.c | 2 +-
+ tools/perf/util/svghelper.h | 2 +-
+ tools/perf/util/symbol.h | 4 +-
+ tools/perf/util/thread.c | 52 +-
+ tools/perf/util/thread.h | 3 +-
+ tools/perf/util/top.h | 2 +-
+ tools/perf/util/types.h | 24 -
+ tools/perf/util/unwind-libdw.c | 2 +-
+ tools/perf/util/unwind.h | 2 +-
+ tools/perf/util/util.c | 2 +
+ tools/perf/util/util.h | 2 +-
+ tools/perf/util/values.h | 2 +-
+ tools/virtio/Makefile | 2 +-
+ tools/virtio/linux/kernel.h | 7 -
+ tools/virtio/linux/types.h | 28 -
+ 433 files changed, 6285 insertions(+), 3867 deletions(-)
+ create mode 100644 arch/x86/include/asm/espfix.h
+ delete mode 100644 arch/x86/include/asm/vdso32.h
+ create mode 100644 arch/x86/kernel/espfix_64.c
+ delete mode 100644 arch/x86/vdso/vdso.S
+ create mode 100644 arch/x86/vdso/vdso2c.c
+ create mode 100644 arch/x86/vdso/vdso2c.h
+ delete mode 100644 arch/x86/vdso/vdso32.S
+ delete mode 100644 arch/x86/vdso/vdsox32.S
+ rename tools/{virtio => include}/linux/export.h (70%)
+ rename tools/{lib/lockdep/uinclude => include}/linux/types.h (63%)
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/export.h
+ create mode 100644 tools/perf/arch/arm64/Makefile
+ create mode 100644 tools/perf/arch/arm64/include/perf_regs.h
+ create mode 100644 tools/perf/arch/arm64/util/dwarf-regs.c
+ create mode 100644 tools/perf/arch/arm64/util/unwind-libunwind.c
+ create mode 100644 tools/perf/perf-sys.h
+ create mode 100644 tools/perf/tests/hists_common.c
+ create mode 100644 tools/perf/tests/hists_common.h
+ create mode 100644 tools/perf/tests/hists_filter.c
+ create mode 100644 tools/perf/tests/mmap-thread-lookup.c
+ create mode 100644 tools/perf/tests/thread-mg-share.c
+ delete mode 100644 tools/perf/util/include/linux/export.h
+ delete mode 100644 tools/perf/util/include/linux/types.h
+ delete mode 100644 tools/perf/util/types.h
+ delete mode 100644 tools/virtio/linux/types.h
+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 (aa2064d7dd35 EDAC: Fix MC scrub mode comparsion bug for correctable errors)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/edac_mc.c | 2 +-
+ drivers/edac/mce_amd.c | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+Merging irqchip/irqchip/for-next (c9eaa447e77e Linux 3.15-rc1)
+$ git merge irqchip/irqchip/for-next
+Already up-to-date.
+Merging ftrace/for-next (4449bf927b61 tracing: Add __bitmask() macro to trace events to cpumasks and other bitmasks)
+$ git merge ftrace/for-next
+Auto-merging kernel/trace/ftrace.c
+Auto-merging include/linux/kprobes.h
+Auto-merging include/linux/ftrace.h
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/trace/tracepoints.txt | 24 ++++
+ MAINTAINERS | 1 -
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/entry_64.S | 204 --------------------------
+ arch/x86/kernel/ftrace.c | 45 +-----
+ arch/x86/kernel/mcount_64.S | 217 ++++++++++++++++++++++++++++
+ include/linux/ftrace.h | 24 ++--
+ include/linux/ftrace_event.h | 3 +
+ include/linux/kprobes.h | 2 +-
+ include/linux/trace_seq.h | 10 ++
+ include/linux/tracepoint.h | 10 ++
+ include/trace/ftrace.h | 57 +++++++-
+ kernel/trace/ftrace.c | 267 +++++++++++++++--------------------
+ kernel/trace/trace.c | 107 +++++---------
+ 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_output.c | 41 ++++++
+ kernel/trace/trace_sched_wakeup.c | 70 +++++----
+ kernel/trace/trace_selftest.c | 69 ++++-----
+ kernel/trace/trace_stack.c | 8 +-
+ 23 files changed, 700 insertions(+), 630 deletions(-)
+ create mode 100644 arch/x86/kernel/mcount_64.S
+Merging rcu/rcu/next (f96b7117cddd documentation: Clarify wake-up/memory-barrier relationship)
+$ git merge rcu/rcu/next
+Auto-merging tools/testing/selftests/rcutorture/bin/parse-torture.sh
+Auto-merging kernel/softirq.c
+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
+Auto-merging init/Kconfig
+Auto-merging Documentation/memory-barriers.txt
+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 ++-
+ Documentation/memory-barriers.txt | 15 +
+ include/linux/percpu.h | 2 +-
+ include/linux/rcupdate.h | 117 ++++++-
+ include/linux/rcutiny.h | 4 +
+ include/linux/rcutree.h | 1 +
+ include/linux/torture.h | 8 +-
+ init/Kconfig | 2 +-
+ kernel/locking/locktorture.c | 10 +-
+ kernel/rcu/rcutorture.c | 217 +++++++++---
+ kernel/rcu/tiny_plugin.h | 8 +-
+ kernel/rcu/tree.c | 352 +++++++++++++------
+ kernel/rcu/tree.h | 11 +-
+ kernel/rcu/tree_plugin.h | 151 +++------
+ kernel/rcu/update.c | 30 ++
+ kernel/sched/core.c | 7 +-
+ kernel/signal.c | 4 +
+ kernel/softirq.c | 4 +-
+ kernel/torture.c | 40 ++-
+ .../testing/selftests/rcutorture/bin/configinit.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/functions.sh | 48 ++-
+ .../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 | 30 +-
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh | 54 ++-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 155 ++++-----
+ .../bin/{parse-rcutorture.sh => parse-torture.sh} | 22 +-
+ .../selftests/rcutorture/configs/rcu/TREE02-T | 25 ++
+ .../selftests/rcutorture/configs/rcu/TREE08.boot | 1 +
+ 34 files changed, 1328 insertions(+), 444 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 (d9f89b88f510 KVM: x86: Fix CR3 reserved bits check in long mode)
+$ git merge kvm/linux-next
+Auto-merging virt/kvm/async_pf.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/vmx.c
+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
+Auto-merging Documentation/virtual/kvm/api.txt
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 10 +-
+ 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 | 154 ++++++-
+ 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 | 17 +-
+ arch/s390/kvm/gaccess.c | 673 +++++++++++++++++++++++++++++++
+ arch/s390/kvm/gaccess.h | 374 +++++++++++++----
+ arch/s390/kvm/guestdbg.c | 482 ++++++++++++++++++++++
+ arch/s390/kvm/intercept.c | 217 +++++++++-
+ arch/s390/kvm/interrupt.c | 371 ++++++++++++-----
+ arch/s390/kvm/kvm-s390.c | 512 ++++++++++++++++++-----
+ arch/s390/kvm/kvm-s390.h | 61 ++-
+ arch/s390/kvm/priv.c | 293 ++++++++++----
+ arch/s390/kvm/sigp.c | 12 +-
+ arch/s390/kvm/trace-s390.h | 43 ++
+ arch/s390/kvm/trace.h | 39 ++
+ arch/s390/mm/pgtable.c | 93 ++++-
+ arch/x86/include/asm/kvm_host.h | 6 +-
+ arch/x86/kvm/cpuid.c | 11 +-
+ arch/x86/kvm/cpuid.h | 7 +
+ arch/x86/kvm/emulate.c | 17 +-
+ arch/x86/kvm/irq.c | 1 +
+ arch/x86/kvm/mmu.c | 84 ++--
+ arch/x86/kvm/mmu.h | 33 ++
+ arch/x86/kvm/paging_tmpl.h | 7 +-
+ arch/x86/kvm/pmu.c | 7 +-
+ arch/x86/kvm/svm.c | 28 +-
+ arch/x86/kvm/trace.h | 20 +-
+ arch/x86/kvm/vmx.c | 307 +++++++++-----
+ arch/x86/kvm/x86.c | 55 +--
+ drivers/s390/char/sclp_early.c | 22 +-
+ include/linux/kvm_host.h | 15 +-
+ include/uapi/linux/kvm.h | 7 +-
+ virt/kvm/async_pf.c | 4 +-
+ virt/kvm/eventfd.c | 68 +++-
+ virt/kvm/irq_comm.c | 17 +-
+ virt/kvm/irqchip.c | 31 +-
+ virt/kvm/kvm_main.c | 24 +-
+ 51 files changed, 3695 insertions(+), 759 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 (4447a208f7fc ARM/ARM64: KVM: Advertise KVM_CAP_ARM_PSCI_0_2 to user space)
+$ git merge kvm-arm/next
+Auto-merging include/uapi/linux/kvm.h
+Auto-merging Documentation/virtual/kvm/api.txt
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 17 +++
+ arch/arm/include/asm/kvm_host.h | 2 +-
+ arch/arm/include/asm/kvm_psci.h | 6 +-
+ arch/arm/include/uapi/asm/kvm.h | 10 +-
+ arch/arm/kvm/arm.c | 1 +
+ arch/arm/kvm/handle_exit.c | 10 +-
+ arch/arm/kvm/psci.c | 235 +++++++++++++++++++++++++++++++++++---
+ arch/arm64/include/asm/kvm_host.h | 2 +-
+ arch/arm64/include/asm/kvm_psci.h | 6 +-
+ arch/arm64/include/uapi/asm/kvm.h | 10 +-
+ arch/arm64/kvm/handle_exit.c | 10 +-
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/kvm.h | 9 ++
+ include/uapi/linux/psci.h | 90 +++++++++++++++
+ 14 files changed, 372 insertions(+), 37 deletions(-)
+ create mode 100644 include/uapi/linux/psci.h
+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 (f59c5145dc6a x86/xen: do not use _PAGE_IOMAP in xen_remap_domain_mfn_range())
+$ git merge xen-tip/linux-next
+Auto-merging arch/x86/xen/setup.c
+Auto-merging arch/x86/xen/mmu.c
+Auto-merging arch/x86/xen/enlighten.c
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/xen/hypercall.h | 16 +++-
+ arch/arm/include/asm/xen/interface.h | 2 +
+ arch/arm/xen/enlighten.c | 9 ++
+ arch/arm/xen/hypercall.S | 1 +
+ arch/arm64/xen/hypercall.S | 1 +
+ arch/x86/include/asm/xen/hypercall.h | 2 +-
+ arch/x86/include/asm/xen/interface.h | 3 +
+ arch/x86/xen/enlighten.c | 1 +
+ arch/x86/xen/mmu.c | 4 +-
+ arch/x86/xen/p2m.c | 174 +++++++++++++++++++++++------------
+ arch/x86/xen/setup.c | 15 ++-
+ arch/x86/xen/suspend.c | 23 ++++-
+ arch/x86/xen/xen-ops.h | 2 +
+ drivers/xen/manage.c | 45 ++-------
+ include/xen/interface/xen.h | 6 +-
+ include/xen/xen-ops.h | 4 -
+ 16 files changed, 190 insertions(+), 118 deletions(-)
+Merging percpu/for-next (92a82b81ba46 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/cgroup.h | 2 +-
+ include/linux/percpu-refcount.h | 34 +++++++++++++++++++++++++++++++++-
+ include/linux/percpu.h | 2 +-
+ 3 files changed, 35 insertions(+), 3 deletions(-)
+Merging workqueues/for-next (cf416171e7e1 workqueue: Remove deprecated system_nrt[_freezable]_wq)
+$ git merge workqueues/for-next
+Auto-merging kernel/workqueue.c
+Merge made by the 'recursive' strategy.
+ include/linux/workqueue.h | 26 --------------------------
+ kernel/workqueue.c | 14 +++++---------
+ 2 files changed, 5 insertions(+), 35 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 (bf60cb3ec5fb 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 (eafaebd987fc HSI: Introduce Nokia N900 modem driver)
+$ git merge hsi/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/hsi/client-devices.txt | 44 +
+ .../devicetree/bindings/hsi/nokia-modem.txt | 57 +
+ Documentation/devicetree/bindings/hsi/omap-ssi.txt | 97 ++
+ Documentation/hsi.txt | 75 ++
+ MAINTAINERS | 4 +-
+ drivers/hsi/Kconfig | 1 +
+ drivers/hsi/Makefile | 1 +
+ drivers/hsi/clients/Kconfig | 17 +
+ drivers/hsi/clients/Makefile | 4 +-
+ drivers/hsi/clients/hsi_char.c | 14 +-
+ drivers/hsi/clients/nokia-modem.c | 285 ++++
+ drivers/hsi/clients/ssi_protocol.c | 1191 +++++++++++++++++
+ drivers/hsi/controllers/Kconfig | 19 +
+ drivers/hsi/controllers/Makefile | 6 +
+ drivers/hsi/controllers/omap_ssi.c | 625 +++++++++
+ drivers/hsi/controllers/omap_ssi.h | 166 +++
+ drivers/hsi/controllers/omap_ssi_port.c | 1399 ++++++++++++++++++++
+ drivers/hsi/controllers/omap_ssi_regs.h | 171 +++
+ drivers/hsi/hsi.c | 275 +++-
+ include/linux/hsi/hsi.h | 39 +-
+ include/linux/hsi/ssi_protocol.h | 42 +
+ 21 files changed, 4513 insertions(+), 19 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hsi/client-devices.txt
+ create mode 100644 Documentation/devicetree/bindings/hsi/nokia-modem.txt
+ create mode 100644 Documentation/devicetree/bindings/hsi/omap-ssi.txt
+ create mode 100644 Documentation/hsi.txt
+ create mode 100644 drivers/hsi/clients/nokia-modem.c
+ create mode 100644 drivers/hsi/clients/ssi_protocol.c
+ create mode 100644 drivers/hsi/controllers/Kconfig
+ create mode 100644 drivers/hsi/controllers/Makefile
+ create mode 100644 drivers/hsi/controllers/omap_ssi.c
+ create mode 100644 drivers/hsi/controllers/omap_ssi.h
+ create mode 100644 drivers/hsi/controllers/omap_ssi_port.c
+ create mode 100644 drivers/hsi/controllers/omap_ssi_regs.h
+ create mode 100644 include/linux/hsi/ssi_protocol.h
+Merging leds/for-next (0c9a03b68511 leds: Remove duplicated OOM message for individual driver)
+$ git merge leds/for-next
+Removing include/linux/platform_data/leds-pca9685.h
+Removing drivers/leds/leds-pca9685.c
+Auto-merging drivers/leds/Makefile
+Auto-merging drivers/leds/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/leds/leds-lp55xx.txt | 8 +-
+ .../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-adp5520.c | 5 +-
+ drivers/leds/leds-bd2802.c | 4 +-
+ drivers/leds/leds-da903x.c | 4 +-
+ drivers/leds/leds-da9052.c | 3 +-
+ drivers/leds/leds-lp5523.c | 3 +-
+ drivers/leds/leds-pca9685.c | 213 ---------------------
+ drivers/leds/leds-pwm.c | 144 +++++++-------
+ drivers/leds/leds-s3c24xx.c | 4 +-
+ drivers/leds/leds-sunfire.c | 4 +-
+ drivers/leds/trigger/ledtrig-cpu.c | 2 +-
+ include/linux/dell-led.h | 10 +
+ include/linux/platform_data/leds-pca9685.h | 35 ----
+ 18 files changed, 264 insertions(+), 364 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
+Auto-merging kernel/sysctl.c
+Auto-merging include/linux/kernfs.h
+Auto-merging fs/kernfs/file.c
+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 (e26f1db9b8d7 tty/serial: fix generic earlycon option parsing)
+$ git merge tty/tty-next
+Auto-merging drivers/tty/serial/8250/8250_core.c
+Auto-merging arch/x86/Kconfig
+CONFLICT (modify/delete): arch/arm64/kernel/early_printk.c deleted in tty/tty-next and modified in HEAD. Version HEAD of arch/arm64/kernel/early_printk.c left in tree.
+Auto-merging arch/arm64/Kconfig
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm64/kernel/early_printk.c
+arch/arm64/kernel/early_printk.c: needs merge
+rm 'arch/arm64/kernel/early_printk.c'
+$ git commit -v -a
+[master 57f6bd37bb0d] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ .../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 | 156 ---
+ 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 | 144 +++
+ 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, 3193 insertions(+), 993 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
+Auto-merging drivers/usb/host/ohci.h
+Auto-merging drivers/usb/host/ohci-hub.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 (7751b6fb0586 usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.)
+$ git merge usb-gadget/next
+Auto-merging include/linux/usb/usb_phy_generic.h
+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/phy/Kconfig
+Auto-merging drivers/usb/musb/musb_dsps.c
+Auto-merging drivers/usb/gadget/u_ether.c
+Auto-merging drivers/usb/gadget/tcm_usb_gadget.c
+Auto-merging drivers/usb/gadget/storage_common.c
+Auto-merging drivers/usb/gadget/rndis.c
+Auto-merging drivers/usb/gadget/inode.c
+Auto-merging drivers/usb/gadget/fsl_udc_core.c
+Auto-merging drivers/usb/gadget/f_rndis.c
+Auto-merging drivers/usb/gadget/f_fs.c
+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 8b1fe48739d7] Merge remote-tracking branch 'usb-gadget/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/configfs-usb-gadget | 45 ++
+ Documentation/DocBook/Makefile | 3 +-
+ Documentation/DocBook/writing_musb_glue_layer.tmpl | 873 +++++++++++++++++++++
+ Documentation/devicetree/bindings/usb/gr-udc.txt | 22 +-
+ .../devicetree/bindings/usb/msm-hsusb.txt | 78 ++
+ arch/arm/mach-msm/board-msm7x30.c | 2 +-
+ arch/arm/mach-msm/board-qsd8x50.c | 2 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 1 -
+ arch/arm/mach-omap2/usb-host.c | 10 +-
+ drivers/usb/dwc3/Kconfig | 4 +-
+ drivers/usb/dwc3/core.c | 253 +++---
+ drivers/usb/dwc3/dwc3-exynos.c | 71 +-
+ drivers/usb/dwc3/dwc3-omap.c | 2 +-
+ drivers/usb/dwc3/dwc3-pci.c | 21 +-
+ drivers/usb/dwc3/gadget.c | 83 +-
+ drivers/usb/gadget/atmel_usba_udc.c | 2 +-
+ drivers/usb/gadget/composite.c | 318 +++++++-
+ drivers/usb/gadget/configfs.c | 556 ++++++++++++-
+ drivers/usb/gadget/configfs.h | 12 +
+ drivers/usb/gadget/f_fs.c | 33 +-
+ drivers/usb/gadget/f_rndis.c | 33 +-
+ drivers/usb/gadget/f_subset.c | 2 +-
+ drivers/usb/gadget/f_uac2.c | 10 +-
+ drivers/usb/gadget/fotg210-udc.c | 8 +-
+ drivers/usb/gadget/fsl_udc_core.c | 8 +-
+ drivers/usb/gadget/fusb300_udc.c | 8 +-
+ drivers/usb/gadget/gr_udc.c | 55 +-
+ drivers/usb/gadget/inode.c | 1 +
+ drivers/usb/gadget/m66592-udc.c | 1 -
+ drivers/usb/gadget/mv_u3d_core.c | 14 +-
+ drivers/usb/gadget/net2280.c | 4 +-
+ drivers/usb/gadget/r8a66597-udc.c | 1 -
+ drivers/usb/gadget/rndis.c | 28 +-
+ drivers/usb/gadget/s3c2410_udc.c | 3 +-
+ drivers/usb/gadget/storage_common.c | 52 +-
+ drivers/usb/gadget/tcm_usb_gadget.c | 16 +-
+ drivers/usb/gadget/u_ether.c | 32 +-
+ drivers/usb/gadget/u_f.c | 2 +-
+ drivers/usb/gadget/u_f.h | 26 +
+ drivers/usb/gadget/u_os_desc.h | 90 +++
+ drivers/usb/gadget/u_rndis.h | 3 +
+ drivers/usb/gadget/udc-core.c | 2 +
+ drivers/usb/gadget/uvc_queue.c | 12 +-
+ drivers/usb/host/Kconfig | 1 -
+ drivers/usb/musb/Kconfig | 5 +-
+ drivers/usb/musb/am35x.c | 14 +-
+ drivers/usb/musb/blackfin.c | 14 +-
+ drivers/usb/musb/da8xx.c | 16 +-
+ drivers/usb/musb/davinci.c | 8 +-
+ drivers/usb/musb/musb_core.c | 35 +
+ drivers/usb/musb/musb_core.h | 9 +
+ drivers/usb/musb/musb_dsps.c | 29 +-
+ drivers/usb/musb/tusb6010.c | 28 +-
+ drivers/usb/musb/tusb6010.h | 8 -
+ drivers/usb/musb/tusb6010_omap.c | 2 +-
+ drivers/usb/phy/Kconfig | 7 +-
+ drivers/usb/phy/phy-am335x.c | 4 +-
+ drivers/usb/phy/phy-generic.c | 65 +-
+ drivers/usb/phy/phy-generic.h | 8 +-
+ drivers/usb/phy/phy-keystone.c | 4 +-
+ drivers/usb/phy/phy-msm-usb.c | 700 ++++++++++-------
+ drivers/usb/phy/phy-ulpi.c | 1 +
+ include/linux/usb/composite.h | 79 ++
+ include/linux/usb/msm_hsusb.h | 39 +-
+ include/linux/usb/msm_hsusb_hw.h | 14 +-
+ .../usb/{usb_phy_gen_xceiv.h => usb_phy_generic.h} | 13 +-
+ .../multibuff/device_app/aio_multibuff.c | 349 ++++++++
+ .../ffs-aio-example/multibuff/host_app/Makefile | 13 +
+ .../usb/ffs-aio-example/multibuff/host_app/test.c | 146 ++++
+ .../ffs-aio-example/simple/device_app/aio_simple.c | 335 ++++++++
+ tools/usb/ffs-aio-example/simple/host_app/Makefile | 13 +
+ tools/usb/ffs-aio-example/simple/host_app/test.c | 148 ++++
+ 72 files changed, 4122 insertions(+), 787 deletions(-)
+ create mode 100644 Documentation/DocBook/writing_musb_glue_layer.tmpl
+ create mode 100644 drivers/usb/gadget/u_os_desc.h
+ rename include/linux/usb/{usb_phy_gen_xceiv.h => usb_phy_generic.h} (53%)
+ create mode 100644 tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c
+ create mode 100644 tools/usb/ffs-aio-example/multibuff/host_app/Makefile
+ create mode 100644 tools/usb/ffs-aio-example/multibuff/host_app/test.c
+ create mode 100644 tools/usb/ffs-aio-example/simple/device_app/aio_simple.c
+ create mode 100644 tools/usb/ffs-aio-example/simple/host_app/Makefile
+ create mode 100644 tools/usb/ffs-aio-example/simple/host_app/test.c
+Merging staging/staging-next (50667c67dbef staging: dgnc: Remove extra curly braces)
+$ git merge staging/staging-next
+Recorded preimage for 'drivers/staging/rtl8723au/os_dep/usb_ops_linux.c'
+Resolved 'drivers/iio/adc/Kconfig' using previous resolution.
+Auto-merging include/linux/device.h
+Removing drivers/staging/vt6656/srom.h
+Removing drivers/staging/vt6656/rndis.h
+Removing drivers/staging/vt6656/device_cfg.h
+Removing drivers/staging/unisys/include/guidutils.h
+Auto-merging drivers/staging/speakup/kobjects.c
+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
+Auto-merging drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
+CONFLICT (content): Merge conflict in drivers/staging/rtl8723au/os_dep/usb_ops_linux.c
+Removing drivers/staging/rtl8723au/os_dep/osdep_service.c
+Auto-merging drivers/staging/rtl8723au/os_dep/os_intfs.c
+Removing drivers/staging/rtl8723au/include/usb_vendor_req.h
+Removing drivers/staging/rtl8723au/include/usb_osintf.h
+Removing drivers/staging/rtl8723au/include/usb_hal.h
+Removing drivers/staging/rtl8723au/include/rtw_qos.h
+Removing drivers/staging/rtl8723au/include/rtw_p2p.h
+Removing drivers/staging/rtl8723au/include/rtw_ioctl.h
+Removing drivers/staging/rtl8723au/include/odm_types.h
+Removing drivers/staging/rtl8723au/include/mp_custom_oid.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/rtl8723au/core/rtw_io.c
+Removing drivers/staging/rtl8188eu/include/drv_types_linux.h
+Auto-merging drivers/staging/netlogic/xlr_net.c
+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
+Auto-merging drivers/staging/imx-drm/parallel-display.c
+Auto-merging drivers/staging/imx-drm/imx-hdmi.c
+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/exynos_adc.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 arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-model/devres.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/staging/rtl8723au/os_dep/usb_ops_linux.c'.
+[master 052413e25b94] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio | 46 +-
+ .../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 +
+ Documentation/driver-model/devres.txt | 1 +
+ MAINTAINERS | 9 +
+ arch/x86/Kconfig | 1 -
+ drivers/base/devres.c | 21 +
+ drivers/iio/Kconfig | 1 +
+ drivers/iio/Makefile | 1 +
+ drivers/iio/accel/Kconfig | 12 +
+ drivers/iio/accel/Makefile | 1 +
+ drivers/iio/accel/hid-sensor-accel-3d.c | 45 +-
+ drivers/iio/accel/mma8452.c | 439 ++
+ 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} | 160 +-
+ drivers/iio/adc/exynos_adc.c | 131 +-
+ drivers/iio/adc/mcp3422.c | 33 +-
+ .../iio/common/hid-sensors/hid-sensor-attributes.c | 134 +
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 17 +-
+ .../iio/common/hid-sensors/hid-sensor-trigger.h | 1 +
+ drivers/iio/common/st_sensors/st_sensors_core.c | 37 +
+ drivers/iio/gyro/hid-sensor-gyro-3d.c | 45 +-
+ drivers/iio/gyro/itg3200_core.c | 2 -
+ drivers/iio/gyro/st_gyro_core.c | 7 +
+ drivers/iio/iio_core.h | 2 +-
+ 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-buffer.c | 41 +-
+ drivers/iio/industrialio-core.c | 74 +-
+ drivers/iio/industrialio-event.c | 10 +-
+ drivers/iio/inkern.c | 34 +-
+ drivers/iio/light/gp2ap020a00f.c | 8 +-
+ drivers/iio/light/hid-sensor-als.c | 48 +-
+ drivers/iio/light/hid-sensor-prox.c | 25 +-
+ drivers/iio/magnetometer/Kconfig | 3 +-
+ drivers/iio/magnetometer/ak8975.c | 71 +-
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c | 40 +-
+ drivers/iio/magnetometer/mag3110.c | 19 +-
+ drivers/iio/magnetometer/st_magn_core.c | 7 +
+ drivers/iio/orientation/Kconfig | 12 +
+ drivers/iio/orientation/Makefile | 1 +
+ drivers/iio/orientation/hid-sensor-incl-3d.c | 37 +-
+ drivers/iio/orientation/hid-sensor-rotation.c | 346 ++
+ drivers/iio/pressure/Kconfig | 10 +
+ drivers/iio/pressure/Makefile | 1 +
+ drivers/iio/pressure/hid-sensor-press.c | 41 +-
+ drivers/iio/pressure/mpl115.c | 211 +
+ 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/iio/temperature/Kconfig | 10 +
+ drivers/iio/temperature/Makefile | 1 +
+ drivers/iio/temperature/mlx90614.c | 150 +
+ drivers/platform/goldfish/goldfish_pipe.c | 34 +-
+ drivers/platform/goldfish/pdev_bus.c | 11 +-
+ drivers/staging/Kconfig | 4 +-
+ drivers/staging/Makefile | 2 +-
+ drivers/staging/android/alarm-dev.c | 1 +
+ drivers/staging/android/binder.c | 42 +-
+ drivers/staging/android/ion/ion.c | 10 +
+ drivers/staging/android/ion/ion_carveout_heap.c | 2 +-
+ drivers/staging/android/ion/ion_chunk_heap.c | 2 +-
+ drivers/staging/android/ion/ion_heap.c | 2 +
+ drivers/staging/android/ion/ion_priv.h | 1 +
+ drivers/staging/android/ion/ion_system_heap.c | 9 +-
+ drivers/staging/android/logger.c | 3 +
+ drivers/staging/android/ram_console.h | 22 -
+ drivers/staging/android/sw_sync.c | 2 +
+ drivers/staging/android/sync.c | 8 +
+ drivers/staging/android/timed_gpio.c | 1 +
+ 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 | 23 +-
+ drivers/staging/comedi/drivers.c | 1 +
+ drivers/staging/comedi/drivers/8253.h | 109 +-
+ drivers/staging/comedi/drivers/8255.c | 3 +-
+ drivers/staging/comedi/drivers/8255.h | 4 +-
+ .../staging/comedi/drivers/addi-data/addi_common.h | 10 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c | 103 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 167 +-
+ .../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 | 143 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 22 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 43 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 165 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 25 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 498 +-
+ .../staging/comedi/drivers/amplc_dio200_common.c | 29 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 3 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 284 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 374 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c | 139 +-
+ 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 | 58 +-
+ drivers/staging/comedi/drivers/das16m1.c | 97 +-
+ drivers/staging/comedi/drivers/das1800.c | 186 +-
+ drivers/staging/comedi/drivers/das6402.c | 2 +-
+ drivers/staging/comedi/drivers/das800.c | 75 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 51 +-
+ drivers/staging/comedi/drivers/dt2801.c | 2 +-
+ drivers/staging/comedi/drivers/dt282x.c | 8 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 36 +-
+ drivers/staging/comedi/drivers/me4000.c | 96 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 3 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 3 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 80 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 8 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 184 +-
+ 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/pcl711.c | 19 +-
+ 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 | 588 +-
+ drivers/staging/dgap/dgap.h | 453 +-
+ drivers/staging/dgnc/dgnc_cls.c | 4 -
+ drivers/staging/dgnc/dgnc_cls.h | 1 -
+ drivers/staging/dgnc/dgnc_driver.c | 43 +-
+ drivers/staging/dgnc/dgnc_neo.c | 112 +-
+ drivers/staging/dgnc/dgnc_sysfs.c | 2 +-
+ drivers/staging/dgnc/dgnc_tty.c | 140 +-
+ drivers/staging/frontier/tranzport.c | 8 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 15 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 12 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 142 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 25 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 2 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 37 +-
+ drivers/staging/ft1000/ft1000.h | 7 +-
+ drivers/staging/fwserial/dma_fifo.c | 32 +-
+ drivers/staging/fwserial/dma_fifo.h | 22 +-
+ drivers/staging/fwserial/fwserial.c | 42 +-
+ drivers/staging/gdm72xx/TODO | 1 -
+ drivers/staging/gdm72xx/gdm_qos.c | 101 +-
+ drivers/staging/gdm72xx/gdm_qos.h | 17 -
+ drivers/staging/gdm72xx/gdm_sdio.c | 29 +-
+ drivers/staging/gdm72xx/gdm_sdio.h | 29 +-
+ drivers/staging/gdm72xx/gdm_usb.c | 62 +-
+ drivers/staging/gdm72xx/gdm_usb.h | 11 +-
+ drivers/staging/gdm72xx/gdm_wimax.c | 102 +-
+ drivers/staging/gdm72xx/gdm_wimax.h | 29 +-
+ drivers/staging/gdm72xx/hci.h | 87 +-
+ drivers/staging/gdm72xx/netlink_k.c | 12 +-
+ drivers/staging/gdm72xx/netlink_k.h | 4 +-
+ drivers/staging/gdm72xx/sdio_boot.c | 4 +-
+ drivers/staging/gdm72xx/sdio_boot.h | 2 +-
+ drivers/staging/gdm72xx/usb_boot.c | 35 +-
+ drivers/staging/gdm72xx/usb_boot.h | 4 +-
+ drivers/staging/gdm72xx/usb_ids.h | 2 +-
+ drivers/staging/gdm72xx/wm_ioctl.h | 22 +-
+ drivers/staging/goldfish/README | 1 -
+ drivers/staging/goldfish/goldfish_audio.c | 22 +-
+ drivers/staging/goldfish/goldfish_nand.c | 26 +-
+ drivers/staging/goldfish/goldfish_nand_reg.h | 3 +-
+ drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 2 +-
+ drivers/staging/gs_fpgaboot/io.c | 6 +
+ drivers/staging/iio/adc/Kconfig | 20 -
+ drivers/staging/iio/adc/Makefile | 4 -
+ drivers/staging/iio/adc/ad7280a.c | 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-hdmi.c | 18 +-
+ drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h | 5 +
+ drivers/staging/imx-drm/ipu-v3/ipu-common.c | 47 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 97 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-di.c | 2 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c | 25 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dp.c | 71 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-prv.h | 3 +
+ drivers/staging/imx-drm/ipuv3-crtc.c | 16 +-
+ drivers/staging/imx-drm/ipuv3-plane.c | 4 +
+ 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/capture.c | 3 +
+ drivers/staging/line6/driver.c | 1 +
+ drivers/staging/line6/midi.c | 2 +
+ drivers/staging/line6/pcm.c | 2 +-
+ drivers/staging/line6/playback.c | 11 +-
+ drivers/staging/line6/pod.c | 5 +
+ drivers/staging/line6/toneport.c | 3 +
+ drivers/staging/line6/variax.c | 2 +
+ .../staging/lustre/include/linux/libcfs/curproc.h | 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 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 8 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 4 -
+ .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 47 +-
+ drivers/staging/lustre/lnet/lnet/api-ni.c | 16 +-
+ drivers/staging/lustre/lnet/lnet/router.c | 2 +-
+ 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 | 5 +-
+ 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 | 34 +-
+ 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 | 19 +-
+ 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 | 23 +
+ .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 18 +-
+ .../lustre/lustre/libcfs/linux/linux-curproc.c | 152 -
+ .../lustre/lustre/libcfs/linux/linux-module.c | 15 +-
+ .../lustre/lustre/libcfs/linux/linux-tcpip.c | 43 +-
+ 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 | 152 +-
+ 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 | 19 +-
+ 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 | 7 +-
+ 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/class_obd.c | 50 +-
+ drivers/staging/lustre/lustre/obdclass/debug.c | 12 -
+ drivers/staging/lustre/lustre/obdclass/genops.c | 6 +-
+ .../lustre/lustre/obdclass/linux/linux-module.c | 42 +-
+ 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/nokia_h4p/nokia_fw-bcm.c | 3 +-
+ 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_mlme_ext.c | 6 +-
+ drivers/staging/rtl8188eu/core/rtw_p2p.c | 6 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 51 +-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 7 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 43 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 20 -
+ drivers/staging/rtl8188eu/hal/usb_halinit.c | 26 -
+ drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 17 +-
+ drivers/staging/rtl8188eu/include/drv_types.h | 1 -
+ .../staging/rtl8188eu/include/drv_types_linux.h | 24 -
+ drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_cmd.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_led.h | 119 +-
+ drivers/staging/rtl8188eu/include/rtw_recv.h | 17 -
+ drivers/staging/rtl8188eu/include/xmit_osdep.h | 4 -
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 6 +-
+ drivers/staging/rtl8188eu/os_dep/recv_linux.c | 15 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 120 +-
+ 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 | 7 +-
+ 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 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 19 +-
+ drivers/staging/rtl8192u/r8190_rtl8256.c | 6 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 6 +-
+ drivers/staging/rtl8192u/r8192U_wx.c | 3 +-
+ drivers/staging/rtl8192u/r819xU_firmware.c | 6 +-
+ drivers/staging/rtl8192u/r819xU_phy.c | 3 +-
+ drivers/staging/rtl8723au/Kconfig | 8 -
+ drivers/staging/rtl8723au/Makefile | 3 -
+ drivers/staging/rtl8723au/core/rtw_ap.c | 318 +-
+ drivers/staging/rtl8723au/core/rtw_cmd.c | 606 +-
+ drivers/staging/rtl8723au/core/rtw_efuse.c | 363 +-
+ drivers/staging/rtl8723au/core/rtw_ieee80211.c | 845 +--
+ drivers/staging/rtl8723au/core/rtw_io.c | 266 -
+ drivers/staging/rtl8723au/core/rtw_ioctl_set.c | 148 +-
+ drivers/staging/rtl8723au/core/rtw_mlme.c | 1464 +++--
+ drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 6133 +++++---------------
+ drivers/staging/rtl8723au/core/rtw_p2p.c | 4001 -------------
+ drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 314 +-
+ drivers/staging/rtl8723au/core/rtw_recv.c | 227 +-
+ drivers/staging/rtl8723au/core/rtw_security.c | 26 +-
+ drivers/staging/rtl8723au/core/rtw_sreset.c | 71 +-
+ drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 127 +-
+ drivers/staging/rtl8723au/core/rtw_wlan_util.c | 915 ++-
+ drivers/staging/rtl8723au/core/rtw_xmit.c | 366 +-
+ .../staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c | 133 +-
+ drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 8 +-
+ drivers/staging/rtl8723au/hal/hal_com.c | 246 +-
+ drivers/staging/rtl8723au/hal/hal_intf.c | 384 +-
+ drivers/staging/rtl8723au/hal/odm.c | 173 +-
+ drivers/staging/rtl8723au/hal/odm_HWConfig.c | 43 +-
+ drivers/staging/rtl8723au/hal/odm_interface.c | 121 +-
+ .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 482 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 157 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 33 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 1276 +---
+ drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 87 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 22 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_sreset.c | 11 +-
+ drivers/staging/rtl8723au/hal/rtl8723au_led.c | 27 +-
+ drivers/staging/rtl8723au/hal/rtl8723au_recv.c | 74 +-
+ drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 58 +-
+ drivers/staging/rtl8723au/hal/usb_halinit.c | 534 +-
+ drivers/staging/rtl8723au/hal/usb_ops_linux.c | 293 +-
+ drivers/staging/rtl8723au/include/Hal8723APhyCfg.h | 14 +-
+ drivers/staging/rtl8723au/include/Hal8723PwrSeq.h | 104 +-
+ drivers/staging/rtl8723au/include/cmd_osdep.h | 26 -
+ drivers/staging/rtl8723au/include/drv_types.h | 76 -
+ drivers/staging/rtl8723au/include/ethernet.h | 22 -
+ drivers/staging/rtl8723au/include/hal_com.h | 13 +-
+ drivers/staging/rtl8723au/include/hal_intf.h | 305 +-
+ drivers/staging/rtl8723au/include/ieee80211.h | 243 +-
+ drivers/staging/rtl8723au/include/mlme_osdep.h | 4 -
+ drivers/staging/rtl8723au/include/mp_custom_oid.h | 342 --
+ drivers/staging/rtl8723au/include/odm.h | 215 +-
+ drivers/staging/rtl8723au/include/odm_HWConfig.h | 16 +-
+ drivers/staging/rtl8723au/include/odm_debug.h | 42 +-
+ drivers/staging/rtl8723au/include/odm_interface.h | 57 -
+ drivers/staging/rtl8723au/include/odm_precomp.h | 4 -
+ drivers/staging/rtl8723au/include/odm_reg.h | 5 +-
+ drivers/staging/rtl8723au/include/odm_types.h | 36 -
+ drivers/staging/rtl8723au/include/osdep_intf.h | 12 +-
+ drivers/staging/rtl8723au/include/osdep_service.h | 118 -
+ drivers/staging/rtl8723au/include/recv_osdep.h | 9 -
+ .../rtl8723au/include/rtl8723a_bt-coexist.h | 94 +-
+ drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 16 +-
+ drivers/staging/rtl8723au/include/rtl8723a_dm.h | 2 -
+ drivers/staging/rtl8723au/include/rtl8723a_hal.h | 53 +-
+ drivers/staging/rtl8723au/include/rtl8723a_recv.h | 21 +-
+ drivers/staging/rtl8723au/include/rtl8723a_spec.h | 314 +-
+ drivers/staging/rtl8723au/include/rtl8723a_xmit.h | 10 +-
+ drivers/staging/rtl8723au/include/rtw_ap.h | 4 +-
+ drivers/staging/rtl8723au/include/rtw_cmd.h | 133 +-
+ drivers/staging/rtl8723au/include/rtw_efuse.h | 11 +-
+ drivers/staging/rtl8723au/include/rtw_event.h | 60 +-
+ drivers/staging/rtl8723au/include/rtw_ht.h | 4 +-
+ drivers/staging/rtl8723au/include/rtw_io.h | 193 +-
+ drivers/staging/rtl8723au/include/rtw_ioctl.h | 26 -
+ drivers/staging/rtl8723au/include/rtw_ioctl_set.h | 27 +-
+ drivers/staging/rtl8723au/include/rtw_mlme.h | 164 +-
+ drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 154 +-
+ drivers/staging/rtl8723au/include/rtw_p2p.h | 158 -
+ drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 3 -
+ drivers/staging/rtl8723au/include/rtw_qos.h | 26 -
+ drivers/staging/rtl8723au/include/rtw_recv.h | 24 +-
+ drivers/staging/rtl8723au/include/rtw_security.h | 25 +-
+ drivers/staging/rtl8723au/include/rtw_sreset.h | 28 +-
+ drivers/staging/rtl8723au/include/rtw_xmit.h | 27 +-
+ drivers/staging/rtl8723au/include/sta_info.h | 32 +-
+ drivers/staging/rtl8723au/include/usb_hal.h | 20 -
+ drivers/staging/rtl8723au/include/usb_ops.h | 31 +-
+ drivers/staging/rtl8723au/include/usb_ops_linux.h | 37 +-
+ drivers/staging/rtl8723au/include/usb_osintf.h | 24 -
+ drivers/staging/rtl8723au/include/usb_vendor_req.h | 31 -
+ drivers/staging/rtl8723au/include/wifi.h | 348 +-
+ drivers/staging/rtl8723au/include/xmit_osdep.h | 19 -
+ drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 1195 +---
+ drivers/staging/rtl8723au/os_dep/mlme_linux.c | 105 -
+ drivers/staging/rtl8723au/os_dep/os_intfs.c | 245 +-
+ drivers/staging/rtl8723au/os_dep/osdep_service.c | 175 -
+ drivers/staging/rtl8723au/os_dep/recv_linux.c | 66 +-
+ drivers/staging/rtl8723au/os_dep/usb_intf.c | 99 +-
+ drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 89 +-
+ drivers/staging/rtl8723au/os_dep/xmit_linux.c | 41 -
+ .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.c | 506 +-
+ .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.h | 2 -
+ drivers/staging/rtl8821ae/pci.c | 14 +-
+ drivers/staging/rtl8821ae/rtl8821ae/hw.h | 35 +-
+ drivers/staging/rtl8821ae/wifi.h | 4 +-
+ drivers/staging/rts5139/ms.c | 7 +-
+ drivers/staging/rts5139/ms_mg.c | 2 +-
+ drivers/staging/rts5139/ms_mg.h | 1 +
+ drivers/staging/rts5139/rts51x.c | 125 +-
+ drivers/staging/rts5139/rts51x_fop.c | 21 +-
+ drivers/staging/rts5139/rts51x_transport.c | 12 +-
+ drivers/staging/rts5208/rtsx_chip.c | 2 +-
+ 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/sep/sep_crypto.c | 10 +
+ drivers/staging/sep/sep_dev.h | 1 +
+ drivers/staging/serqt_usb2/serqt_usb2.c | 25 +-
+ 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 | 5 +-
+ drivers/staging/unisys/channels/chanstub.h | 2 +-
+ .../unisys/common-spar/include/channels/channel.h | 31 +-
+ .../common-spar/include/channels/channel_guid.h | 30 +-
+ .../include/channels/controlframework.h | 2 +-
+ .../include/channels/controlvmchannel.h | 21 +-
+ .../common-spar/include/channels/diagchannel.h | 14 +-
+ .../common-spar/include/channels/iochannel.h | 14 +-
+ .../common-spar/include/channels/vbuschannel.h | 12 +-
+ .../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 | 51 +-
+ drivers/staging/unisys/include/guestlinuxdebug.h | 6 +-
+ drivers/staging/unisys/include/guidutils.h | 203 -
+ 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 | 4 +-
+ drivers/staging/unisys/include/uisqueue.h | 15 +-
+ drivers/staging/unisys/include/uisthread.h | 2 +-
+ drivers/staging/unisys/include/uisutils.h | 23 +-
+ drivers/staging/unisys/include/uniklog.h | 2 +-
+ drivers/staging/unisys/uislib/uislib.c | 929 +--
+ drivers/staging/unisys/uislib/uisqueue.c | 2 +-
+ drivers/staging/unisys/uislib/uisthread.c | 2 +-
+ drivers/staging/unisys/uislib/uisutils.c | 55 +-
+ drivers/staging/unisys/virthba/virthba.c | 19 +-
+ drivers/staging/unisys/virthba/virthba.h | 2 +-
+ drivers/staging/unisys/virtpci/virtpci.c | 19 +-
+ drivers/staging/unisys/virtpci/virtpci.h | 5 +-
+ drivers/staging/unisys/visorchannel/globals.h | 2 +-
+ drivers/staging/unisys/visorchannel/visorchannel.h | 16 +-
+ .../unisys/visorchannel/visorchannel_funcs.c | 41 +-
+ .../unisys/visorchannel/visorchannel_main.c | 7 +-
+ 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 | 7 +-
+ drivers/staging/unisys/visorchipset/parser.h | 6 +-
+ drivers/staging/unisys/visorchipset/testing.h | 7 +-
+ drivers/staging/unisys/visorchipset/visorchipset.h | 18 +-
+ .../unisys/visorchipset/visorchipset_main.c | 20 +-
+ .../unisys/visorchipset/visorchipset_umode.h | 2 +-
+ drivers/staging/unisys/visorutil/charqueue.c | 4 +-
+ drivers/staging/unisys/visorutil/charqueue.h | 2 +-
+ drivers/staging/unisys/visorutil/easyproc.c | 8 +-
+ 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 | 3 +-
+ drivers/staging/unisys/visorutil/procobjecttree.c | 8 +-
+ drivers/staging/unisys/visorutil/visorkmodutils.c | 57 +-
+ drivers/staging/vme/devices/vme_user.c | 9 +-
+ drivers/staging/vt6655/IEEE11h.c | 6 -
+ drivers/staging/vt6655/baseband.c | 101 +-
+ drivers/staging/vt6655/bssdb.c | 6 +-
+ drivers/staging/vt6655/bssdb.h | 2 -
+ drivers/staging/vt6655/card.c | 195 +-
+ drivers/staging/vt6655/card.h | 1 -
+ drivers/staging/vt6655/channel.c | 80 +-
+ drivers/staging/vt6655/datarate.c | 24 +-
+ drivers/staging/vt6655/desc.h | 47 -
+ drivers/staging/vt6655/device.h | 19 +-
+ drivers/staging/vt6655/device_main.c | 298 +-
+ drivers/staging/vt6655/dpc.c | 142 +-
+ drivers/staging/vt6655/hostap.c | 63 +-
+ drivers/staging/vt6655/ioctl.c | 7 +-
+ drivers/staging/vt6655/ioctl.h | 9 -
+ drivers/staging/vt6655/iowpa.h | 7 -
+ drivers/staging/vt6655/iwctl.c | 402 +-
+ drivers/staging/vt6655/key.c | 55 +-
+ drivers/staging/vt6655/key.h | 2 -
+ drivers/staging/vt6655/mac.c | 96 +-
+ drivers/staging/vt6655/mac.h | 1 -
+ drivers/staging/vt6655/mib.c | 81 +-
+ drivers/staging/vt6655/mib.h | 8 -
+ drivers/staging/vt6655/michael.c | 33 +-
+ drivers/staging/vt6655/power.c | 36 +-
+ drivers/staging/vt6655/power.h | 3 -
+ drivers/staging/vt6655/rf.c | 69 +-
+ drivers/staging/vt6655/rxtx.c | 329 +-
+ drivers/staging/vt6655/rxtx.h | 11 -
+ drivers/staging/vt6655/tether.c | 4 +-
+ drivers/staging/vt6655/tkip.c | 7 +-
+ drivers/staging/vt6655/vntwifi.c | 115 +-
+ drivers/staging/vt6655/vntwifi.h | 14 -
+ drivers/staging/vt6655/wcmd.c | 126 +-
+ drivers/staging/vt6655/wctl.c | 9 +-
+ drivers/staging/vt6655/wmgr.c | 410 +-
+ drivers/staging/vt6655/wmgr.h | 30 -
+ drivers/staging/vt6655/wpa.c | 8 +-
+ drivers/staging/vt6655/wpa2.c | 41 +-
+ drivers/staging/vt6655/wpactl.c | 76 +-
+ drivers/staging/vt6655/wroute.c | 1 -
+ drivers/staging/vt6656/aes_ccmp.c | 1 +
+ drivers/staging/vt6656/baseband.c | 8 -
+ drivers/staging/vt6656/bssdb.c | 34 +-
+ drivers/staging/vt6656/card.c | 1 -
+ drivers/staging/vt6656/control.c | 1 -
+ drivers/staging/vt6656/control.h | 3 -
+ drivers/staging/vt6656/datarate.c | 1 -
+ drivers/staging/vt6656/desc.h | 68 -
+ drivers/staging/vt6656/device.h | 204 +-
+ drivers/staging/vt6656/device_cfg.h | 87 -
+ drivers/staging/vt6656/dpc.c | 23 +-
+ drivers/staging/vt6656/firmware.c | 6 +-
+ drivers/staging/vt6656/hostap.c | 10 +-
+ drivers/staging/vt6656/iwctl.c | 16 -
+ drivers/staging/vt6656/key.c | 4 -
+ drivers/staging/vt6656/mac.c | 3 +-
+ drivers/staging/vt6656/main_usb.c | 85 +-
+ drivers/staging/vt6656/power.c | 1 -
+ drivers/staging/vt6656/rf.c | 31 +-
+ drivers/staging/vt6656/rf.h | 2 +
+ drivers/staging/vt6656/rndis.h | 151 -
+ drivers/staging/vt6656/rxtx.c | 251 +-
+ drivers/staging/vt6656/rxtx.h | 10 +-
+ drivers/staging/vt6656/srom.h | 112 -
+ drivers/staging/vt6656/tether.h | 4 -
+ drivers/staging/vt6656/usbpipe.c | 315 +-
+ drivers/staging/vt6656/usbpipe.h | 2 -
+ drivers/staging/vt6656/wcmd.c | 44 +-
+ drivers/staging/vt6656/wmgr.c | 15 +-
+ drivers/staging/vt6656/wpactl.c | 1 -
+ drivers/staging/wlan-ng/hfa384x_usb.c | 224 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 95 +-
+ drivers/staging/wlan-ng/prism2mgmt.h | 5 +
+ drivers/staging/wlan-ng/prism2sta.c | 4 -
+ drivers/staging/wlan-ng/prism2usb.c | 164 +-
+ drivers/staging/xgifb/TODO | 3 +-
+ drivers/staging/xgifb/XGI_main.h | 4 -
+ drivers/staging/xgifb/XGI_main_26.c | 3 +
+ drivers/staging/xgifb/vb_def.h | 2 -
+ drivers/staging/xgifb/vb_init.c | 2 +
+ drivers/staging/xgifb/vb_setmode.c | 2 +
+ drivers/staging/xgifb/vgatypes.h | 2 -
+ drivers/tty/goldfish.c | 68 +-
+ include/linux/device.h | 2 +
+ include/linux/goldfish.h | 15 +
+ include/linux/hid-sensor-hub.h | 8 +-
+ include/linux/hid-sensor-ids.h | 1 +
+ include/linux/iio/common/st_sensors.h | 4 +
+ include/linux/iio/consumer.h | 13 +
+ include/linux/iio/iio.h | 24 +
+ include/linux/iio/types.h | 4 +
+ 706 files changed, 27667 insertions(+), 40598 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
+ create mode 100644 Documentation/devicetree/bindings/iio/proximity/as3935.txt
+ create mode 100644 drivers/iio/accel/mma8452.c
+ rename drivers/{staging/iio/adc/ad799x_core.c => iio/adc/ad799x.c} (80%)
+ create mode 100644 drivers/iio/orientation/hid-sensor-rotation.c
+ create mode 100644 drivers/iio/pressure/mpl115.c
+ create mode 100644 drivers/iio/proximity/Kconfig
+ create mode 100644 drivers/iio/proximity/Makefile
+ create mode 100644 drivers/iio/proximity/as3935.c
+ create mode 100644 drivers/iio/temperature/mlx90614.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_io.c
+ 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/mp_custom_oid.h
+ delete mode 100644 drivers/staging/rtl8723au/include/odm_types.h
+ delete mode 100644 drivers/staging/rtl8723au/include/rtw_ioctl.h
+ delete mode 100644 drivers/staging/rtl8723au/include/rtw_p2p.h
+ delete mode 100644 drivers/staging/rtl8723au/include/rtw_qos.h
+ delete mode 100644 drivers/staging/rtl8723au/include/usb_hal.h
+ delete mode 100644 drivers/staging/rtl8723au/include/usb_osintf.h
+ delete mode 100644 drivers/staging/rtl8723au/include/usb_vendor_req.h
+ delete mode 100644 drivers/staging/rtl8723au/os_dep/osdep_service.c
+ 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
+ delete mode 100644 drivers/staging/unisys/include/guidutils.h
+ delete mode 100644 drivers/staging/vt6656/device_cfg.h
+ delete mode 100644 drivers/staging/vt6656/rndis.h
+ delete mode 100644 drivers/staging/vt6656/srom.h
+ create mode 100644 include/linux/goldfish.h
+Merging char-misc/char-misc-next (4f0638100fe3 misc: arm-charlcd: add DT probe support)
+$ git merge char-misc/char-misc-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/misc/arm-charlcd.txt | 18 ++
+ drivers/hv/channel.c | 19 +-
+ drivers/hv/channel_mgmt.c | 52 ++++-
+ drivers/hv/connection.c | 35 +++-
+ drivers/hv/hv.c | 2 +
+ drivers/hv/hv_balloon.c | 29 ++-
+ drivers/hv/hyperv_vmbus.h | 5 +
+ drivers/misc/Kconfig | 4 +-
+ drivers/misc/arm-charlcd.c | 7 +
+ drivers/misc/ds1682.c | 5 +-
+ drivers/misc/genwqe/card_debugfs.c | 4 +-
+ drivers/misc/mei/amthif.c | 2 -
+ drivers/misc/mei/bus.c | 4 +-
+ drivers/misc/mei/client.c | 90 ++++++--
+ drivers/misc/mei/hbm.c | 51 +++++
+ drivers/misc/mei/hbm.h | 1 +
+ drivers/misc/mei/hw-me-regs.h | 9 +
+ drivers/misc/mei/hw-me.c | 226 ++++++++++++++++++++-
+ drivers/misc/mei/hw-me.h | 6 +
+ drivers/misc/mei/hw-txe-regs.h | 2 +-
+ drivers/misc/mei/hw-txe.c | 94 +++++++--
+ drivers/misc/mei/hw-txe.h | 16 +-
+ drivers/misc/mei/hw.h | 25 ++-
+ drivers/misc/mei/init.c | 34 +++-
+ drivers/misc/mei/main.c | 1 -
+ drivers/misc/mei/mei_dev.h | 82 ++++++++
+ drivers/misc/mei/pci-me.c | 142 ++++++++++++-
+ drivers/misc/mei/pci-txe.c | 150 +++++++++++++-
+ drivers/misc/mei/wd.c | 2 -
+ include/linux/hyperv.h | 7 +
+ 30 files changed, 1037 insertions(+), 87 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/misc/arm-charlcd.txt
+Merging cgroup/for-next (6f4524d355a8 cgroup: implement css_tryget())
+$ git merge cgroup/for-next
+Auto-merging mm/memcontrol.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/events/core.c
+Auto-merging fs/bio.c
+Auto-merging block/cfq-iosched.c
+Auto-merging block/blk-throttle.c
+Merge made by the 'recursive' strategy.
+ Documentation/cgroups/memory.txt | 6 +-
+ Documentation/cgroups/unified-hierarchy.txt | 359 +++++
+ block/blk-cgroup.c | 2 +-
+ block/blk-cgroup.h | 2 +-
+ block/blk-throttle.c | 32 +-
+ block/cfq-iosched.c | 28 +-
+ fs/bio.c | 2 +-
+ include/linux/cgroup.h | 285 ++--
+ kernel/cgroup.c | 1875 +++++++++++++++++----------
+ kernel/cgroup_freezer.c | 138 +-
+ kernel/cpuset.c | 46 +-
+ kernel/events/core.c | 3 +-
+ kernel/sched/core.c | 2 +-
+ kernel/sched/cpuacct.c | 2 +-
+ mm/hugetlb_cgroup.c | 37 +-
+ mm/memcontrol.c | 188 +--
+ net/core/netclassid_cgroup.c | 2 +-
+ net/core/netprio_cgroup.c | 14 +-
+ net/ipv4/tcp_memcontrol.c | 31 +-
+ security/device_cgroup.c | 33 +-
+ 20 files changed, 2011 insertions(+), 1076 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 (d1db0eea8524 Linux 3.15-rc3)
+$ 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 (45eefc1438de Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c
+Removing drivers/pinctrl/pinctrl-sunxi.h
+Removing drivers/pinctrl/pinctrl-sunxi-pins.h
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 9 +-
+ .../bindings/pinctrl/marvell,berlin-pinctrl.txt | 45 +
+ .../bindings/pinctrl/marvell,orion-pinctrl.txt | 91 +
+ .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 88 +
+ .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 95 +
+ .../bindings/pinctrl/rockchip,pinctrl.txt | 28 +-
+ arch/arm/Kconfig | 2 +-
+ drivers/pinctrl/Kconfig | 31 +-
+ drivers/pinctrl/Makefile | 5 +-
+ drivers/pinctrl/berlin/Kconfig | 19 +
+ drivers/pinctrl/berlin/Makefile | 4 +
+ drivers/pinctrl/berlin/berlin-bg2.c | 251 ++
+ drivers/pinctrl/berlin/berlin-bg2cd.c | 194 +
+ drivers/pinctrl/berlin/berlin-bg2q.c | 413 +++
+ drivers/pinctrl/berlin/berlin.c | 346 ++
+ drivers/pinctrl/berlin/berlin.h | 71 +
+ 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 | 221 +-
+ drivers/pinctrl/pinctrl-samsung.c | 2 +
+ drivers/pinctrl/pinctrl-samsung.h | 1 +
+ drivers/pinctrl/pinctrl-st.c | 130 +-
+ drivers/pinctrl/pinctrl-sunxi-pins.h | 3863 --------------------
+ drivers/pinctrl/pinctrl-sunxi.h | 548 ---
+ 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-r8a73a4.c | 3 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 138 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 412 ++-
+ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 2 +
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 5 +
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 274 +-
+ drivers/pinctrl/sunxi/Kconfig | 32 +
+ drivers/pinctrl/sunxi/Makefile | 10 +
+ drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1039 ++++++
+ drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 690 ++++
+ drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 411 +++
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 141 +
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 865 +++++
+ drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1065 ++++++
+ drivers/pinctrl/{ => sunxi}/pinctrl-sunxi.c | 85 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.h | 258 ++
+ drivers/pinctrl/vt8500/pinctrl-wmt.c | 23 +-
+ 61 files changed, 9628 insertions(+), 5938 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,berlin-pinctrl.txt
+ 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/berlin/Kconfig
+ create mode 100644 drivers/pinctrl/berlin/Makefile
+ create mode 100644 drivers/pinctrl/berlin/berlin-bg2.c
+ create mode 100644 drivers/pinctrl/berlin/berlin-bg2cd.c
+ create mode 100644 drivers/pinctrl/berlin/berlin-bg2q.c
+ create mode 100644 drivers/pinctrl/berlin/berlin.c
+ create mode 100644 drivers/pinctrl/berlin/berlin.h
+ 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
+ delete mode 100644 drivers/pinctrl/pinctrl-sunxi-pins.h
+ delete mode 100644 drivers/pinctrl/pinctrl-sunxi.h
+ create mode 100644 drivers/pinctrl/sunxi/Kconfig
+ create mode 100644 drivers/pinctrl/sunxi/Makefile
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
+ rename drivers/pinctrl/{ => sunxi}/pinctrl-sunxi.c (91%)
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sunxi.h
+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 (1524cd4cd490 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Resolved 'Documentation/driver-model/devres.txt' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-model/devres.txt
+CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 90e92628c613] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 6 +
+ Documentation/driver-model/devres.txt | 7 +
+ Documentation/gpio/driver.txt | 59 ++++++
+ MAINTAINERS | 1 +
+ drivers/gpio/Kconfig | 12 +-
+ drivers/gpio/Makefile | 2 +-
+ drivers/gpio/devres.c | 43 +++++
+ drivers/gpio/gpio-adp5520.c | 4 +-
+ drivers/gpio/gpio-adp5588.c | 4 +-
+ drivers/gpio/gpio-bt8xx.c | 19 +-
+ drivers/gpio/gpio-davinci.c | 4 +-
+ drivers/gpio/gpio-dwapb.c | 3 -
+ drivers/gpio/gpio-em.c | 3 +-
+ drivers/gpio/gpio-ep93xx.c | 34 +---
+ drivers/gpio/gpio-ge.c | 174 ++++++-----------
+ drivers/gpio/gpio-grgpio.c | 2 +-
+ drivers/gpio/gpio-ich.c | 4 +
+ drivers/gpio/gpio-janz-ttl.c | 38 +---
+ drivers/gpio/gpio-kempld.c | 4 +-
+ drivers/gpio/gpio-lynxpoint.c | 4 +-
+ drivers/gpio/gpio-max730x.c | 5 +-
+ drivers/gpio/gpio-mcp23s08.c | 16 +-
+ drivers/gpio/gpio-moxart.c | 4 +-
+ drivers/gpio/gpio-mvebu.c | 13 +-
+ drivers/gpio/gpio-omap.c | 205 +++++++++++----------
+ drivers/gpio/gpio-palmas.c | 6 +-
+ drivers/gpio/gpio-pca953x.c | 9 +-
+ drivers/gpio/gpio-pl061.c | 27 ++-
+ drivers/gpio/gpio-rc5t583.c | 4 +-
+ drivers/gpio/gpio-rcar.c | 9 +-
+ drivers/gpio/gpio-rdc321x.c | 23 +--
+ drivers/gpio/gpio-sch.c | 26 ++-
+ drivers/gpio/gpio-sch311x.c | 16 +-
+ drivers/gpio/gpio-spear-spics.c | 4 +-
+ drivers/gpio/gpio-sx150x.c | 1 -
+ drivers/gpio/gpio-tc3589x.c | 148 ++++-----------
+ drivers/gpio/gpio-tegra.c | 6 +-
+ drivers/gpio/gpio-timberdale.c | 47 ++---
+ drivers/gpio/gpio-tps6586x.c | 4 +-
+ drivers/gpio/gpio-tps65910.c | 4 +-
+ drivers/gpio/gpio-xilinx.c | 2 +-
+ drivers/gpio/gpio-zevio.c | 18 +-
+ drivers/gpio/gpiolib-of.c | 2 +-
+ drivers/gpio/gpiolib.c | 101 ++++++++--
+ include/linux/gpio/consumer.h | 41 +++++
+ include/linux/gpio/driver.h | 5 +-
+ include/linux/mfd/tc3589x.h | 1 -
+ 47 files changed, 604 insertions(+), 570 deletions(-)
+Merging dma-mapping/dma-mapping-next (7ee793a62fa8 cma: Remove potential deadlock situation)
+$ git merge dma-mapping/dma-mapping-next
+Merge made by the 'recursive' strategy.
+ drivers/base/dma-contiguous.c | 32 +++++++++++++++++++++++++-------
+ 1 file changed, 25 insertions(+), 7 deletions(-)
+Merging pwm/for-next (9c88669c2cfc pwm: twl: Really disable twl6030 PWMs)
+$ 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 +
+ arch/arm/plat-samsung/dev-backlight.c | 2 -
+ 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 | 6 +-
+ drivers/pwm/pwm-tegra.c | 4 +-
+ drivers/pwm/pwm-tiecap.c | 4 +-
+ drivers/pwm/pwm-tiehrpwm.c | 4 +-
+ drivers/pwm/pwm-twl.c | 8 -
+ drivers/pwm/pwm-vt8500.c | 4 +-
+ drivers/video/backlight/pwm_bl.c | 78 +++--
+ include/linux/pwm_backlight.h | 5 +-
+ 19 files changed, 535 insertions(+), 113 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 cab26ce8b53a] 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 (6ed8eb59e53b Merge tag 'clk-hisi-for-v3.16' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into clk-next-hisilicon)
+$ git merge clk/clk-next
+Resolved 'Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt' using previous resolution.
+Auto-merging drivers/clk/Makefile
+Auto-merging Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master adbb71e75e4c] Merge remote-tracking branch 'clk/clk-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/clk.txt | 16 +-
+ .../devicetree/bindings/clock/bcm-kona-clock.txt | 116 ++++++---
+ .../devicetree/bindings/clock/clock-bindings.txt | 9 +-
+ .../devicetree/bindings/clock/hix5hd2-clock.txt | 31 +++
+ .../devicetree/bindings/clock/qcom,gcc.txt | 1 +
+ .../bindings/clock/renesas,cpg-mstp-clocks.txt | 3 +-
+ .../bindings/clock/renesas,r8a7779-cpg-clocks.txt | 27 ++
+ arch/arm/boot/dts/bcm21664.dtsi | 164 +++++++-----
+ drivers/clk/Makefile | 1 +
+ 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/hisilicon/Makefile | 1 +
+ drivers/clk/hisilicon/clk-hix5hd2.c | 101 +++++++
+ drivers/clk/hisilicon/clk.c | 41 ++-
+ drivers/clk/hisilicon/clk.h | 3 +
+ 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/shmobile/Makefile | 1 +
+ drivers/clk/shmobile/clk-mstp.c | 9 +-
+ drivers/clk/shmobile/clk-r8a7779.c | 180 +++++++++++++
+ drivers/clk/socfpga/clk-gate.c | 1 -
+ drivers/clk/socfpga/clk-periph.c | 22 +-
+ drivers/clk/socfpga/clk-pll.c | 7 +
+ drivers/clk/socfpga/clk.c | 23 +-
+ drivers/clk/socfpga/clk.h | 4 +
+ drivers/clk/sunxi/clk-factors.c | 36 +++
+ drivers/clk/sunxi/clk-sunxi.c | 37 +++
+ include/dt-bindings/clock/bcm21664.h | 62 +++++
+ include/dt-bindings/clock/bcm281xx.h | 12 +
+ include/dt-bindings/clock/hix5hd2-clock.h | 58 +++++
+ include/dt-bindings/clock/qcom,gcc-msm8960.h | 7 +-
+ include/dt-bindings/reset/qcom,gcc-msm8960.h | 2 +-
+ include/linux/clk-provider.h | 123 +++++----
+ include/linux/clk/shmobile.h | 3 +
+ include/linux/clk/sunxi.h | 22 ++
+ 49 files changed, 2269 insertions(+), 902 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/hix5hd2-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7779-cpg-clocks.txt
+ create mode 100644 drivers/clk/bcm/clk-bcm21664.c
+ create mode 100644 drivers/clk/hisilicon/clk-hix5hd2.c
+ create mode 100644 drivers/clk/qcom/common.c
+ create mode 100644 drivers/clk/qcom/common.h
+ create mode 100644 drivers/clk/shmobile/clk-r8a7779.c
+ create mode 100644 include/dt-bindings/clock/bcm21664.h
+ create mode 100644 include/dt-bindings/clock/hix5hd2-clock.h
+ create mode 100644 include/linux/clk/sunxi.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 (8b1cbef71a7e These days most people use git to send patches so I have added a section about that.)
+$ git merge rd-docs/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/email-clients.txt | 11 +++++++++++
+ MAINTAINERS | 2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+Merging akpm-current/current (e58827aca533 kernel/seccomp.c: kernel-doc warning fix)
+$ git merge --no-ff akpm-current/current
+Recorded preimage for 'mm/memcontrol.c'
+Auto-merging mm/vmscan.c
+Auto-merging mm/shmem.c
+Auto-merging mm/page_io.c
+Auto-merging mm/page-writeback.c
+Auto-merging mm/memory.c
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Auto-merging mm/memblock.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/filemap.c
+Auto-merging mm/dmapool.c
+Auto-merging mm/Kconfig
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/smp.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/seccomp.c
+Auto-merging kernel/sched/rt.c
+Auto-merging kernel/sched/deadline.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/kmod.c
+Auto-merging kernel/cpuset.c
+Auto-merging kernel/audit.c
+Auto-merging kernel/acct.c
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/topology.h
+Auto-merging include/linux/thread_info.h
+Auto-merging include/linux/smp.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/memblock.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/buffer_head.h
+Auto-merging include/linux/blkdev.h
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/ntfs/file.c
+Auto-merging fs/gfs2/aops.c
+Auto-merging fs/fuse/file.c
+Auto-merging fs/fat/inode.c
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/f2fs/checkpoint.c
+Auto-merging fs/ext4/page-io.c
+Auto-merging fs/ext4/mballoc.c
+Auto-merging fs/cifs/smb2pdu.h
+Auto-merging fs/cifs/smb2pdu.c
+Auto-merging fs/cifs/smb2ops.c
+Auto-merging fs/ceph/addr.c
+Auto-merging fs/buffer.c
+Auto-merging fs/btrfs/file.c
+Auto-merging fs/btrfs/extent_io.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 drivers/base/dma-contiguous.c
+Auto-merging drivers/base/Kconfig
+Auto-merging arch/x86/mm/init_64.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
+Auto-merging arch/ia64/include/asm/topology.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/printk-formats.txt
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/cgroups/memory.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'mm/memcontrol.c'.
+[master d49c22ded3f0] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 7 +
+ Documentation/CodingStyle | 22 +-
+ Documentation/SubmittingPatches | 22 +-
+ Documentation/cgroups/memory.txt | 16 +-
+ .../devicetree/bindings/rtc/xgene-rtc.txt | 28 +
+ Documentation/filesystems/vfat.txt | 5 +
+ Documentation/kernel-parameters.txt | 19 +-
+ Documentation/leds/leds-class.txt | 3 -
+ Documentation/memory-hotplug.txt | 125 ++--
+ Documentation/printk-formats.txt | 6 +
+ Documentation/sysctl/kernel.txt | 21 +
+ Documentation/sysctl/vm.txt | 17 +-
+ MAINTAINERS | 30 +-
+ 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/sh/kernel/hw_breakpoint.c | 4 +-
+ arch/sh/kernel/kprobes.c | 30 +-
+ arch/sh/kernel/localtimer.c | 2 +-
+ arch/sh/kernel/perf_event.c | 8 +-
+ arch/sh/kernel/smp.c | 2 +-
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/scatterlist.h | 8 -
+ arch/sparc/include/asm/unistd.h | 1 -
+ arch/tile/mm/homecache.c | 2 +-
+ arch/um/include/asm/Kbuild | 1 +
+ arch/unicore32/mm/ioremap.c | 4 +-
+ arch/x86/Kconfig | 7 +-
+ arch/x86/include/asm/Kbuild | 3 +-
+ arch/x86/include/asm/pgtable-2level.h | 59 --
+ arch/x86/include/asm/pgtable.h | 20 +-
+ 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/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/numa.c | 6 +-
+ arch/x86/mm/pageattr-test.c | 2 +-
+ arch/x86/pci/sta2x11-fixup.c | 6 +-
+ block/genhd.c | 2 +-
+ drivers/base/Kconfig | 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/rapidio/devices/tsi721.c | 11 +-
+ drivers/rtc/Kconfig | 41 +-
+ drivers/rtc/Makefile | 4 +
+ drivers/rtc/interface.c | 14 +-
+ drivers/rtc/rtc-88pm860x.c | 3 +-
+ drivers/rtc/rtc-at91rm9200.c | 14 +-
+ drivers/rtc/rtc-bfin.c | 16 +-
+ drivers/rtc/rtc-cmos.c | 85 ++-
+ drivers/rtc/rtc-da9052.c | 122 ++--
+ drivers/rtc/rtc-da9063.c | 333 ++++++++++
+ drivers/rtc/rtc-ds1343.c | 679 +++++++++++++++++++++
+ drivers/rtc/rtc-ds1742.c | 2 +-
+ drivers/rtc/rtc-efi.c | 2 +-
+ drivers/rtc/rtc-hym8563.c | 2 +-
+ drivers/rtc/rtc-isl12057.c | 2 +-
+ drivers/rtc/rtc-m41t80.c | 104 ++--
+ drivers/rtc/rtc-mcp795.c | 199 ++++++
+ drivers/rtc/rtc-mv.c | 2 +-
+ drivers/rtc/rtc-omap.c | 71 ++-
+ drivers/rtc/rtc-palmas.c | 2 +-
+ drivers/rtc/rtc-puv3.c | 4 +-
+ drivers/rtc/rtc-xgene.c | 278 +++++++++
+ drivers/tty/Kconfig | 4 +
+ 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/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/btrfs/extent_io.c | 11 +-
+ fs/btrfs/file.c | 5 +-
+ fs/buffer.c | 49 +-
+ fs/cachefiles/bind.c | 17 +-
+ fs/cachefiles/daemon.c | 31 +-
+ fs/cachefiles/interface.c | 3 +-
+ fs/cachefiles/internal.h | 30 +-
+ fs/cachefiles/main.c | 9 +-
+ fs/cachefiles/namei.c | 53 +-
+ fs/cachefiles/security.c | 10 +-
+ fs/cachefiles/xattr.c | 10 +-
+ fs/ceph/addr.c | 2 +-
+ fs/ceph/debugfs.c | 6 +-
+ fs/ceph/inode.c | 2 +-
+ fs/ceph/mds_client.c | 6 +-
+ fs/ceph/mdsmap.c | 2 +-
+ fs/cifs/cifsacl.c | 2 +-
+ fs/cifs/cifssmb.c | 20 +-
+ fs/cifs/sess.c | 2 +-
+ fs/cifs/smb2misc.c | 38 +-
+ fs/cifs/smb2ops.c | 2 +-
+ fs/cifs/smb2pdu.c | 2 +-
+ fs/cifs/smb2pdu.h | 28 +-
+ fs/coda/cnode.c | 4 +-
+ fs/coda/coda_linux.h | 8 +-
+ fs/coda/dir.c | 18 +-
+ fs/coda/inode.c | 29 +-
+ fs/coda/psdev.c | 39 +-
+ fs/coda/upcall.c | 14 +-
+ fs/configfs/configfs_internal.h | 6 +
+ fs/configfs/dir.c | 8 +-
+ fs/configfs/inode.c | 5 +-
+ fs/configfs/item.c | 58 +-
+ fs/configfs/mount.c | 4 +-
+ fs/devpts/inode.c | 26 +-
+ fs/dlm/config.c | 26 +-
+ fs/dlm/debug_fs.c | 34 +-
+ fs/dlm/lockspace.c | 21 +-
+ fs/efivarfs/super.c | 2 +-
+ fs/efs/dir.c | 18 +-
+ fs/efs/efs.h | 6 +
+ fs/efs/file.c | 14 +-
+ fs/efs/inode.c | 42 +-
+ fs/efs/namei.c | 8 +-
+ fs/efs/super.c | 42 +-
+ fs/exportfs/expfs.c | 4 +-
+ fs/ext4/fsync.c | 5 +-
+ fs/ext4/mballoc.c | 14 +-
+ fs/ext4/page-io.c | 2 +-
+ fs/f2fs/checkpoint.c | 3 -
+ fs/f2fs/node.c | 2 -
+ fs/fat/fat.h | 3 +-
+ fs/fat/inode.c | 342 ++++++++---
+ fs/fscache/cache.c | 13 +-
+ fs/fscache/cookie.c | 2 +-
+ fs/fscache/histogram.c | 6 +-
+ fs/fscache/internal.h | 26 +-
+ fs/fscache/main.c | 7 +-
+ fs/fscache/netfs.c | 7 +-
+ fs/fscache/object-list.c | 8 +-
+ fs/fscache/operation.c | 3 +-
+ fs/fscache/page.c | 6 +-
+ fs/fuse/dev.c | 2 +-
+ fs/fuse/file.c | 2 -
+ fs/gfs2/aops.c | 1 -
+ fs/gfs2/meta_io.c | 4 +-
+ fs/hfsplus/attributes.c | 36 +-
+ fs/hfsplus/bnode.c | 32 +-
+ fs/hfsplus/catalog.c | 89 ++-
+ fs/hfsplus/dir.c | 42 +-
+ fs/hfsplus/hfsplus_fs.h | 7 +-
+ fs/hfsplus/options.c | 9 +-
+ fs/hfsplus/super.c | 4 +-
+ fs/hfsplus/wrapper.c | 6 +-
+ fs/hfsplus/xattr.c | 51 +-
+ fs/hfsplus/xattr_security.c | 49 +-
+ fs/hfsplus/xattr_trusted.c | 32 +-
+ fs/hfsplus/xattr_user.c | 32 +-
+ fs/hpfs/alloc.c | 2 +-
+ fs/hpfs/buffer.c | 12 +-
+ fs/hpfs/dir.c | 6 +-
+ fs/hpfs/dnode.c | 44 +-
+ fs/hpfs/ea.c | 6 +-
+ fs/hpfs/hpfs_fn.h | 5 +
+ fs/hpfs/inode.c | 3 +-
+ fs/hpfs/map.c | 17 +-
+ fs/hpfs/name.c | 11 +-
+ fs/hpfs/namei.c | 2 +-
+ fs/hpfs/super.c | 55 +-
+ fs/hugetlbfs/inode.c | 18 +-
+ 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/libfs.c | 34 +-
+ fs/mpage.c | 107 ++--
+ fs/notify/fanotify/fanotify_user.c | 45 +-
+ fs/notify/mark.c | 2 +-
+ fs/ntfs/attrib.c | 1 -
+ fs/ntfs/compress.c | 2 +-
+ fs/ntfs/file.c | 1 -
+ 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 | 28 +-
+ fs/ocfs2/file.c | 2 +-
+ fs/ocfs2/journal.c | 17 +-
+ fs/ocfs2/namei.c | 145 ++++-
+ fs/ocfs2/refcounttree.c | 7 +-
+ 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/squashfs/squashfs.h | 2 +-
+ fs/ufs/balloc.c | 6 +-
+ include/asm-generic/ioctl.h | 5 +
+ include/asm-generic/pgtable.h | 8 +-
+ include/linux/blkdev.h | 13 +
+ include/linux/bootmem.h | 6 +-
+ include/linux/buffer_head.h | 2 -
+ include/linux/compaction.h | 4 +-
+ include/linux/compiler.h | 13 +-
+ include/linux/cpuset.h | 29 +-
+ include/linux/crc64_ecma.h | 56 ++
+ include/linux/dma-contiguous.h | 9 +-
+ include/linux/fs.h | 1 +
+ include/linux/gfp.h | 15 +-
+ include/linux/hugetlb.h | 12 +-
+ include/linux/hugetlb_inline.h | 7 +
+ include/linux/idr.h | 13 +-
+ include/linux/input.h | 21 +
+ include/linux/jump_label.h | 20 +-
+ include/linux/mc146818rtc.h | 4 +
+ include/linux/memblock.h | 2 +
+ include/linux/memcontrol.h | 32 +-
+ include/linux/memory_hotplug.h | 14 +-
+ include/linux/migrate.h | 11 +-
+ include/linux/mm.h | 53 +-
+ include/linux/mm_types.h | 2 +-
+ include/linux/mmdebug.h | 15 +-
+ include/linux/mmzone.h | 35 +-
+ include/linux/page-flags.h | 5 +
+ include/linux/pageblock-flags.h | 30 +-
+ include/linux/pagemap.h | 139 ++++-
+ include/linux/plist.h | 45 ++
+ include/linux/printk.h | 23 +-
+ include/linux/proc_fs.h | 4 +
+ include/linux/ptrace.h | 32 +
+ include/linux/rmap.h | 4 -
+ include/linux/scatterlist.h | 2 +-
+ include/linux/sched.h | 14 +-
+ include/linux/sched/sysctl.h | 4 +
+ include/linux/shm.h | 3 +-
+ include/linux/signal.h | 21 +-
+ include/linux/slab.h | 20 +-
+ include/linux/smp.h | 2 +
+ include/linux/string.h | 1 +
+ include/linux/swap.h | 30 +-
+ include/linux/swapfile.h | 2 +-
+ 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/compaction.h | 25 +-
+ include/trace/events/gfpflags.h | 1 -
+ include/trace/events/vmscan.h | 19 +-
+ include/uapi/linux/shm.h | 17 +-
+ init/Kconfig | 23 +-
+ init/main.c | 77 ++-
+ ipc/compat.c | 2 +-
+ ipc/compat_mq.c | 2 +-
+ ipc/msg.c | 253 ++++----
+ 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/backtracetest.c | 18 +-
+ kernel/capability.c | 6 +-
+ kernel/compat.c | 8 +-
+ kernel/cpu.c | 31 +-
+ kernel/cpuset.c | 14 +-
+ kernel/exec_domain.c | 14 +-
+ kernel/exit.c | 61 +-
+ kernel/fork.c | 20 +-
+ kernel/gcov/base.c | 6 +
+ kernel/gcov/gcc_4_7.c | 5 +
+ kernel/hung_task.c | 4 +-
+ kernel/kexec.c | 70 +--
+ kernel/kmod.c | 5 +-
+ kernel/latencytop.c | 5 +-
+ kernel/panic.c | 23 +-
+ kernel/posix-timers.c | 57 +-
+ kernel/printk/printk.c | 330 ++++++----
+ kernel/profile.c | 20 +-
+ kernel/reboot.c | 21 +-
+ kernel/res_counter.c | 7 +-
+ kernel/sched/core.c | 2 +-
+ kernel/sched/deadline.c | 7 +-
+ kernel/sched/rt.c | 8 +-
+ kernel/seccomp.c | 4 +-
+ kernel/signal.c | 94 ++-
+ kernel/smp.c | 49 +-
+ kernel/stop_machine.c | 51 +-
+ kernel/sys_ni.c | 2 +
+ kernel/sysctl.c | 92 ++-
+ kernel/time/ntp.c | 20 +-
+ kernel/time/sched_clock.c | 4 +
+ kernel/time/timekeeping.c | 7 +-
+ kernel/tracepoint.c | 2 +
+ kernel/user.c | 1 -
+ kernel/user_namespace.c | 33 +-
+ kernel/utsname_sysctl.c | 4 +-
+ lib/Kconfig | 14 +
+ lib/Kconfig.debug | 25 +-
+ lib/Makefile | 1 +
+ lib/btree.c | 1 +
+ lib/crc64_ecma.c | 341 +++++++++++
+ lib/idr.c | 40 +-
+ lib/libcrc32c.c | 5 +-
+ lib/plist.c | 56 +-
+ 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/Kconfig | 2 +-
+ mm/Makefile | 2 +-
+ mm/bounce.c | 7 +-
+ mm/compaction.c | 232 ++++---
+ mm/dmapool.c | 27 +-
+ mm/filemap.c | 233 ++++---
+ mm/fremap.c | 7 +-
+ mm/frontswap.c | 13 +-
+ mm/gup.c | 662 ++++++++++++++++++++
+ mm/huge_memory.c | 34 +-
+ mm/hugetlb.c | 362 +++++++----
+ mm/internal.h | 31 +-
+ mm/kmemleak.c | 4 +-
+ mm/madvise.c | 2 +-
+ mm/memblock.c | 26 +-
+ mm/memcontrol.c | 452 +++++---------
+ mm/memory-failure.c | 46 +-
+ mm/memory.c | 660 +-------------------
+ mm/memory_hotplug.c | 148 +++--
+ mm/mempolicy.c | 294 ++++-----
+ mm/mempool.c | 2 +
+ mm/migrate.c | 61 +-
+ mm/mmap.c | 30 +-
+ mm/nommu.c | 5 +-
+ mm/page-writeback.c | 4 +-
+ mm/page_alloc.c | 374 +++++++-----
+ mm/page_io.c | 21 +-
+ mm/pagewalk.c | 375 ++++++++----
+ mm/rmap.c | 47 +-
+ mm/shmem.c | 8 +-
+ mm/slab.c | 45 +-
+ mm/slab.h | 48 +-
+ mm/slab_common.c | 95 ++-
+ mm/slob.c | 3 +-
+ mm/slub.c | 237 ++++---
+ mm/swap.c | 238 +++++---
+ mm/swap_state.c | 2 +-
+ mm/swapfile.c | 224 +++----
+ mm/util.c | 30 +
+ mm/vmacache.c | 22 +-
+ mm/vmalloc.c | 13 +-
+ mm/vmscan.c | 143 +++--
+ mm/vmstat.c | 12 +-
+ mm/zbud.c | 4 +-
+ mm/zsmalloc.c | 4 +-
+ scripts/checkpatch.pl | 88 ++-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/sysctl/Makefile | 19 +
+ tools/testing/selftests/sysctl/common_tests | 109 ++++
+ tools/testing/selftests/sysctl/run_numerictests | 10 +
+ tools/testing/selftests/sysctl/run_stringtests | 77 +++
+ usr/Kconfig | 77 ---
+ 454 files changed, 9860 insertions(+), 5409 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-da9063.c
+ create mode 100644 drivers/rtc/rtc-ds1343.c
+ create mode 100644 drivers/rtc/rtc-mcp795.c
+ create mode 100644 drivers/rtc/rtc-xgene.c
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 mm/gup.c
+ create mode 100644 tools/testing/selftests/sysctl/Makefile
+ create mode 100644 tools/testing/selftests/sysctl/common_tests
+ create mode 100644 tools/testing/selftests/sysctl/run_numerictests
+ create mode 100644 tools/testing/selftests/sysctl/run_stringtests
+$ 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: lib/test_bpf.c: don't use gcc union shortcut
+Applying: arm: convert use of typedef ctl_table to struct ctl_table
+Applying: ia64: convert use of typedef ctl_table to struct ctl_table
+Applying: tile: convert use of typedef ctl_table to struct ctl_table
+Applying: cdrom: convert use of typedef ctl_table to struct ctl_table
+Applying: random: convert use of typedef ctl_table to struct ctl_table
+Applying: parport: convert use of typedef ctl_table to struct ctl_table
+Applying: scsi: convert use of typedef ctl_table to struct ctl_table
+Applying: coda: convert use of typedef ctl_table to struct ctl_table
+Applying: fscache: convert use of typedef ctl_table to struct ctl_table
+Applying: lockd: convert use of typedef ctl_table to struct ctl_table
+Applying: nfs: convert use of typedef ctl_table to struct ctl_table
+Applying: inotify: convert use of typedef ctl_table to struct ctl_table
+Applying: ntfs: convert use of typedef ctl_table to struct ctl_table
+Applying: fs: convert use of typedef ctl_table to struct ctl_table
+Applying: key: convert use of typedef ctl_table to struct ctl_table
+Applying: ipc: convert use of typedef ctl_table to struct ctl_table
+Applying: sysctl: convert use of typedef ctl_table to struct ctl_table
+Applying: mm: convert use of typedef ctl_table to struct ctl_table
+Applying: mfd/rtc: sec/s5m: rename SEC* symbols to S5M
+Applying: rtc: s5m: remove undocumented time init on first boot
+Applying: rtc: s5m: use shorter time of register update
+Applying: rtc: s5m: support different register layout
+Applying: rtc: s5m: add support for S2MPS14 RTC
+Applying: rtc: s5m: consolidate two device type switch statements
+Applying: blackfin/ptrace: call find_vma with the mmap_sem held
+Applying: kernel/watchdog.c: print traces for all cpus on lockup detection
+Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix
+Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2
+Applying: kernel/watchdog.c: convert printk/pr_warning to pr_foo()
+Applying: init/main.c: code clean-up
+Applying: fs/reiserfs/bitmap.c: coding style fixes
+Applying: fs/reiserfs/stree.c: remove obsolete __constant
+Applying: rwsem: Support optimistic spinning
+Applying: rwsem-support-optimistic-spinning-checkpatch-fixes
+Applying: x86,vdso: fix an OOPS accessing the hpet mapping w/o an hpet
+Applying: kernel/kprobes.c: convert printk to pr_foo()
+Applying: sysrq: rcu-ify __handle_sysrq
+Applying: sysrq,rcu: suppress RCU stall warnings while sysrq runs
+Applying: memcg, mm: introduce lowlimit reclaim
+Applying: memcg-mm-introduce-lowlimit-reclaim-fix
+Applying: memcg: allow setting low_limit
+Applying: memcg, doc: clarify global vs. limit reclaims
+Applying: memcg-doc-clarify-global-vs-limit-reclaims-fix
+Applying: memcg: document memory.low_limit_in_bytes
+Applying: vmscan: memcg: always use swappiness of the reclaimed memcg
+Applying: mm/kmemleak.c: use %u to print ->checksum
+Applying: mm: introduce kmemleak_update_trace()
+Applying: lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
+Applying: mm/mempool.c: update the kmemleak stack trace for mempool allocations
+Applying: mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
+Applying: mm: memcontrol: clean up memcg zoneinfo lookup
+Applying: mm: memcontrol: remove unnecessary memcg argument from soft limit functions
+Applying: mm: mark remap_file_pages() syscall as deprecated
+Applying: mm-mark-remap_file_pages-syscall-as-deprecated-fix
+Applying: mm: replace remap_file_pages() syscall with emulation
+Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix
+Applying: mm: remap_file_pages: initialize populate before usage
+Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping
+Applying: memcg: deprecate memory.force_empty knob
+Applying: memcg-deprecate-memoryforce_empty-knob-fix
+Applying: fat: add i_disksize to represent uninitialized size
+Applying: fat: add fat_fallocate operation
+Applying: fat: zero out seek range on _fat_get_block
+Applying: fat: fallback to buffered write in case of fallocated region on direct IO
+Applying: fat: permit to return phy block number by fibmap in fallocated region
+Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate
+Applying: nmi: provide the option to issue an NMI back trace to every cpu but current
+Applying: nmi-provide-the-option-to-issue-an-nmi-back-trace-to-every-cpu-but-current-fix
+Applying: drivers/w1/w1_int.c: call put_device if device_register fails
+Applying: arm: move arm_dma_limit to setup_dma_zone
+Applying: ufs: sb mutex merge + mutex_destroy
+Applying: mm: add strictlimit knob
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + f5a133cee72c...5f7e8d768016 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (5f7e8d768016 mm: add strictlimit knob)
+$ git merge --no-ff akpm/master
+Removing mm/fremap.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-bdi | 8 +
+ Documentation/cgroups/memory.txt | 54 +++---
+ Documentation/filesystems/vfat.txt | 10 +
+ Documentation/kernel-parameters.txt | 5 +
+ Documentation/kmemleak.txt | 1 +
+ Documentation/sysctl/kernel.txt | 17 ++
+ Documentation/vm/remap_file_pages.txt | 27 +++
+ 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/sparc/include/asm/irq_64.h | 2 +-
+ arch/sparc/kernel/process_64.c | 18 +-
+ arch/tile/kernel/proc.c | 4 +-
+ arch/x86/include/asm/irq.h | 2 +-
+ arch/x86/kernel/apic/hw_nmi.c | 18 +-
+ arch/x86/vdso/vma.c | 3 +-
+ 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/tty/sysrq.c | 21 +-
+ 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/fat/cache.c | 70 +++++--
+ fs/fat/fat.h | 6 +-
+ fs/fat/file.c | 78 +++++++-
+ fs/fat/inode.c | 87 ++++++++-
+ 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/reiserfs/bitmap.c | 13 +-
+ fs/reiserfs/stree.c | 8 +-
+ fs/ufs/balloc.c | 30 +--
+ fs/ufs/ialloc.c | 17 +-
+ fs/ufs/super.c | 28 +--
+ fs/ufs/ufs.h | 1 -
+ include/linux/fs.h | 8 +-
+ include/linux/key.h | 2 +-
+ include/linux/kmemleak.h | 4 +
+ include/linux/memcontrol.h | 9 +
+ include/linux/mfd/samsung/rtc.h | 86 +++++----
+ include/linux/nmi.h | 12 +-
+ include/linux/res_counter.h | 40 ++++
+ include/linux/rwsem.h | 25 ++-
+ init/main.c | 23 +--
+ ipc/ipc_sysctl.c | 14 +-
+ ipc/mq_sysctl.c | 12 +-
+ kernel/kprobes.c | 36 ++--
+ kernel/locking/rwsem-xadd.c | 229 +++++++++++++++++++---
+ kernel/locking/rwsem.c | 31 ++-
+ kernel/res_counter.c | 2 +
+ kernel/sysctl.c | 13 +-
+ kernel/utsname_sysctl.c | 6 +-
+ kernel/watchdog.c | 49 ++++-
+ lib/radix-tree.c | 6 +
+ lib/test_bpf.c | 104 +++++-----
+ mm/Makefile | 2 +-
+ mm/backing-dev.c | 35 ++++
+ mm/fremap.c | 279 ---------------------------
+ mm/kmemleak.c | 36 +++-
+ mm/memblock.c | 10 +-
+ mm/memcontrol.c | 179 ++++++++++-------
+ mm/mempool.c | 6 +
+ mm/mmap.c | 69 +++++++
+ mm/nobootmem.c | 2 -
+ mm/nommu.c | 8 -
+ mm/page-writeback.c | 2 +-
+ mm/page_alloc.c | 12 +-
+ mm/page_io.c | 4 +-
+ mm/vmscan.c | 59 ++++--
+ 84 files changed, 1548 insertions(+), 871 deletions(-)
+ create mode 100644 Documentation/vm/remap_file_pages.txt
+ delete mode 100644 mm/fremap.c
+$ git revert 5f0202bc5e03
+[master 27ce28f9a1d3] Revert "rwsem-support-optimistic-spinning-checkpatch-fixes"
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+$ git revert fe2038c57c03
+[master 3bd6099f941b] Revert "rwsem: Support optimistic spinning"
+ 3 files changed, 36 insertions(+), 249 deletions(-)
projects / karo-tx-linux.git / commitdiff