--- /dev/null
+$ date -R
+Tue, 08 Mar 2016 08:00:59 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 21b27a74ec0f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
+Merging origin/master (f6cede5b49e8 Linux 4.5-rc7)
+$ git merge origin/master
+Updating 21b27a74ec0f..f6cede5b49e8
+Fast-forward
+ Makefile | 2 +-
+ arch/arm/boot/compressed/Makefile | 2 ++
+ arch/arm/boot/dts/r8a7791-porter.dts | 1 -
+ arch/arm/kernel/Makefile | 1 +
+ arch/arm/mm/pageattr.c | 3 +++
+ 5 files changed, 7 insertions(+), 2 deletions(-)
+Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (fc77dbd34c5c Linux 4.5-rc6)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (f474c8c857d9 ARM: 8544/1: set_memory_xx fixes)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
+$ git merge mips-fixes/mips-fixes
+Already up-to-date.
+Merging powerpc-fixes/fixes (37c5e942bb2e powerpc/fsl-book3e: Avoid lbarx on e5500)
+$ git merge powerpc-fixes/fixes
+Already up-to-date.
+Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
+$ git merge powerpc-merge-mpe/fixes
+Already up-to-date.
+Merging sparc/master (f983cd32cd5d Merge branch 'parisc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (cec05562fb1d vmxnet3: avoid calling pskb_may_pull with interrupts disabled)
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 10 +++
+ drivers/net/can/spi/mcp251x.c | 2 +-
+ drivers/net/can/usb/gs_usb.c | 24 +++----
+ drivers/net/ethernet/3com/3c59x.c | 2 +-
+ drivers/net/ethernet/altera/altera_tse_main.c | 1 -
+ drivers/net/ethernet/aurora/nb8800.c | 14 +++-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 36 ++++------
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 22 +++---
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 12 ++--
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 6 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 +-
+ drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 2 +-
+ drivers/net/ethernet/cavium/thunder/nic.h | 9 +++
+ drivers/net/ethernet/cavium/thunder/nic_main.c | 6 ++
+ drivers/net/ethernet/cavium/thunder/nic_reg.h | 2 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 9 ++-
+ drivers/net/ethernet/emulex/benet/be_main.c | 16 +++--
+ drivers/net/ethernet/ethoc.c | 1 -
+ drivers/net/ethernet/freescale/fman/fman.c | 4 +-
+ drivers/net/ethernet/freescale/gianfar.c | 4 +-
+ drivers/net/ethernet/hisilicon/Kconfig | 1 +
+ drivers/net/ethernet/ibm/ibmveth.c | 5 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 62 ++++++++--------
+ drivers/net/ethernet/ibm/ibmvnic.h | 4 +-
+ drivers/net/ethernet/jme.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 14 +++-
+ drivers/net/ethernet/mellanox/mlx4/port.c | 20 +++---
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 18 +++--
+ drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 25 ++++---
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 36 +++++++---
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 82 ++++++++++++----------
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 8 +--
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 19 ++---
+ drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 1 -
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +-
+ drivers/net/ethernet/moxa/moxart_ether.c | 4 +-
+ drivers/net/ethernet/qualcomm/qca_spi.c | 2 +-
+ drivers/net/ethernet/realtek/r8169.c | 18 +++--
+ drivers/net/ethernet/renesas/ravb_main.c | 4 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 10 +--
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 11 +--
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 9 ++-
+ drivers/net/ethernet/synopsys/dwc_eth_qos.c | 45 ++++++++----
+ drivers/net/phy/micrel.c | 28 +++++++-
+ drivers/net/ppp/ppp_generic.c | 10 ++-
+ drivers/net/usb/ax88172a.c | 1 -
+ drivers/net/usb/cdc_ncm.c | 6 +-
+ drivers/net/usb/qmi_wwan.c | 7 +-
+ drivers/net/usb/usbnet.c | 7 ++
+ drivers/net/vmxnet3/vmxnet3_drv.c | 73 ++++++++++++-------
+ drivers/net/vrf.c | 13 ++--
+ drivers/net/vxlan.c | 8 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 +
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 +
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 9 +++
+ drivers/of/of_mdio.c | 1 +
+ drivers/ssb/Kconfig | 1 +
+ include/linux/mlx5/mlx5_ifc.h | 4 +-
+ include/linux/skbuff.h | 24 +++++++
+ include/linux/stmmac.h | 1 +
+ include/net/iw_handler.h | 6 ++
+ include/uapi/linux/bpf.h | 3 +
+ net/bridge/br_fdb.c | 15 ++--
+ net/core/filter.c | 6 +-
+ net/core/rtnetlink.c | 6 ++
+ net/core/skbuff.c | 22 +++++-
+ net/ipv4/igmp.c | 3 +-
+ net/ipv4/ip_output.c | 5 +-
+ net/ipv4/ip_tunnel.c | 3 +-
+ net/ipv4/tcp_metrics.c | 2 +-
+ net/ipv4/udp_tunnel.c | 2 +
+ net/ipv6/exthdrs_core.c | 6 +-
+ net/ipv6/ip6_gre.c | 2 +
+ net/ipv6/ip6_tunnel.c | 2 +
+ net/ipv6/mcast.c | 3 +-
+ net/mac80211/agg-rx.c | 2 +-
+ net/mac80211/ieee80211_i.h | 2 +-
+ net/mac80211/rc80211_minstrel.c | 2 +-
+ net/mac80211/rc80211_minstrel_ht.c | 16 +++--
+ net/mac80211/rx.c | 37 +++++++---
+ net/sched/act_ipt.c | 2 +
+ net/sctp/ipv6.c | 2 +
+ net/sctp/proc.c | 10 +--
+ net/switchdev/switchdev.c | 5 +-
+ net/tipc/socket.c | 33 +++++----
+ net/tipc/subscr.c | 3 +-
+ net/wireless/core.c | 2 +
+ net/wireless/nl80211.c | 2 +-
+ net/wireless/sme.c | 6 ++
+ net/wireless/wext-core.c | 52 +++++++++++---
+ 93 files changed, 690 insertions(+), 368 deletions(-)
+Merging ipsec/master (3ed01df4ff79 xfrm: Reset encapsulation field of the skb before transformation)
+$ git merge ipsec/master
+Merge made by the 'recursive' strategy.
+ include/net/netns/xfrm.h | 1 +
+ net/core/flow.c | 14 +++++++++++++-
+ net/ipv4/ip_vti.c | 13 +++++++++++++
+ net/xfrm/xfrm_output.c | 3 +++
+ 4 files changed, 30 insertions(+), 1 deletion(-)
+Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
+$ git merge ipvs/master
+Merge made by the 'recursive' strategy.
+ include/net/ip_vs.h | 17 +++++++++++++++++
+ net/netfilter/ipvs/ip_vs_core.c | 38 +++++++++++++++++++++++++++++---------
+ net/netfilter/ipvs/ip_vs_pe_sip.c | 6 +++---
+ net/netfilter/nfnetlink_acct.c | 3 +++
+ 4 files changed, 52 insertions(+), 12 deletions(-)
+Merging wireless-drivers/master (10da848f67a7 ssb: host_soc depends on sprom)
+$ git merge wireless-drivers/master
+Already up-to-date.
+Merging mac80211/master (2af8c4dc2e9c mac80211_hwsim: treat as part of mac80211 for MAINTAINERS)
+$ git merge mac80211/master
+Already up-to-date.
+Merging sound-current/for-linus (ad09ef2cce91 Merge tag 'asoc-fix-v4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ include/trace/events/asoc.h | 8 +++----
+ sound/soc/codecs/ab8500-codec.c | 8 +++----
+ sound/soc/codecs/adau17x1.h | 6 ++---
+ sound/soc/codecs/cs42l51.c | 8 +++----
+ sound/soc/codecs/da732x.c | 8 +++----
+ sound/soc/codecs/max98088.c | 2 +-
+ sound/soc/codecs/max98095.c | 4 ++--
+ sound/soc/codecs/tlv320dac33.c | 9 ++++---
+ sound/soc/codecs/wl1273.c | 13 +++++-----
+ sound/soc/codecs/wm8753.c | 6 ++---
+ sound/soc/codecs/wm8904.c | 4 ++--
+ sound/soc/codecs/wm8958-dsp2.c | 8 +++----
+ sound/soc/codecs/wm8983.c | 14 +++++------
+ sound/soc/codecs/wm8985.c | 14 +++++------
+ sound/soc/codecs/wm8994.c | 4 ++--
+ sound/soc/codecs/wm8996.c | 2 +-
+ sound/soc/codecs/wm9081.c | 8 +++----
+ sound/soc/codecs/wm9713.c | 2 +-
+ sound/soc/codecs/wm_adsp.c | 8 +++----
+ sound/soc/fsl/fsl_ssi.c | 42 ++++++++++++++++-----------------
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 6 ++++-
+ sound/soc/intel/boards/mfld_machine.c | 16 ++++++-------
+ sound/soc/intel/skylake/skl-topology.c | 2 +-
+ sound/soc/omap/n810.c | 18 +++++++-------
+ sound/soc/omap/rx51.c | 18 +++++++-------
+ sound/soc/pxa/corgi.c | 12 +++++-----
+ sound/soc/pxa/magician.c | 6 ++---
+ sound/soc/pxa/poodle.c | 12 +++++-----
+ sound/soc/pxa/spitz.c | 12 +++++-----
+ sound/soc/pxa/tosa.c | 12 +++++-----
+ sound/soc/qcom/lpass-cpu.c | 1 -
+ sound/soc/samsung/i2s.c | 21 ++++++++++-------
+ sound/soc/soc-dapm.c | 8 +++----
+ 33 files changed, 162 insertions(+), 160 deletions(-)
+Merging pci-current/for-linus (1195c103f6c9 PCI: layerscape: Fix MSG TLP drop setting)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (861c3849222b Merge tag 'usb-serial-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (f6cede5b49e8 Linux 4.5-rc7)
+$ git merge usb-serial-fixes/usb-linus
+Already up-to-date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Already up-to-date.
+Merging staging.current/staging-linus (fc77dbd34c5c Linux 4.5-rc6)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (fc77dbd34c5c Linux 4.5-rc6)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
+$ git merge ide/master
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
+$ git merge kselftest-fixes/fixes
+Already up-to-date.
+Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up-to-date.
+Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
+$ git merge ftrace-fixes/for-next-urgent
+Already up-to-date.
+Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
+$ git merge mfd-fixes/for-mfd-fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (2f791908a70e drm/i915: Fix bogus dig_port_map[] assignment for pre-HSW)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/intel_audio.c | 3 +++
+ drivers/gpu/drm/i915/intel_ddi.c | 1 -
+ drivers/gpu/drm/i915/intel_dp.c | 1 -
+ drivers/gpu/drm/i915/intel_hdmi.c | 2 --
+ 4 files changed, 3 insertions(+), 4 deletions(-)
+Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
+$ git merge asm-generic/master
+Removing include/asm-generic/io-64-nonatomic-lo-hi.h
+Removing include/asm-generic/io-64-nonatomic-hi-lo.h
+Merge made by the 'recursive' strategy.
+ arch/arc/include/asm/page.h | 3 ---
+ arch/arm/include/asm/page-nommu.h | 3 ---
+ arch/frv/include/asm/page.h | 3 ---
+ arch/m68k/include/asm/page_mm.h | 3 ---
+ arch/m68k/include/asm/page_no.h | 3 ---
+ arch/openrisc/include/asm/page.h | 3 ---
+ drivers/dma/idma64.h | 2 +-
+ drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 +-
+ include/asm-generic/bug.h | 2 +-
+ include/asm-generic/io-64-nonatomic-hi-lo.h | 2 --
+ include/asm-generic/io-64-nonatomic-lo-hi.h | 2 --
+ include/asm-generic/page.h | 3 ---
+ 13 files changed, 4 insertions(+), 29 deletions(-)
+ delete mode 100644 include/asm-generic/io-64-nonatomic-hi-lo.h
+ delete mode 100644 include/asm-generic/io-64-nonatomic-lo-hi.h
+Merging arc/for-next (a34cc6460c61 ARC: [intc-*] switch to linear domain)
+$ git merge arc/for-next
+Removing arch/arc/kernel/clk.c
+Removing arch/arc/include/asm/clk.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/timer/snps,arc-timer.txt | 26 +++
+ .../devicetree/bindings/timer/snps,archs-gfrc.txt | 14 ++
+ .../devicetree/bindings/timer/snps,archs-rtc.txt | 14 ++
+ arch/arc/Kconfig | 4 +-
+ arch/arc/boot/dts/abilis_tb10x.dtsi | 14 ++
+ arch/arc/boot/dts/axc001.dtsi | 14 +-
+ arch/arc/boot/dts/axc003.dtsi | 16 +-
+ arch/arc/boot/dts/axc003_idu.dtsi | 14 +-
+ arch/arc/boot/dts/nsim_700.dts | 10 +-
+ arch/arc/boot/dts/nsim_hs.dts | 8 +-
+ arch/arc/boot/dts/nsim_hs_idu.dts | 8 +-
+ arch/arc/boot/dts/nsimosci.dts | 6 +
+ arch/arc/boot/dts/nsimosci_hs.dts | 8 +-
+ arch/arc/boot/dts/nsimosci_hs_idu.dts | 8 +-
+ arch/arc/boot/dts/skeleton.dtsi | 14 ++
+ arch/arc/boot/dts/skeleton_hs.dtsi | 52 +++++
+ arch/arc/boot/dts/skeleton_hs_idu.dtsi | 46 +++++
+ arch/arc/boot/dts/vdk_axc003.dtsi | 14 +-
+ arch/arc/boot/dts/vdk_axc003_idu.dtsi | 12 +-
+ arch/arc/include/asm/clk.h | 22 --
+ arch/arc/include/asm/cmpxchg.h | 2 +-
+ arch/arc/include/asm/entry-compact.h | 2 +-
+ arch/arc/include/asm/irq.h | 13 --
+ arch/arc/include/asm/pgtable.h | 2 +-
+ arch/arc/kernel/Makefile | 2 +-
+ arch/arc/kernel/clk.c | 21 --
+ arch/arc/kernel/devtree.c | 13 +-
+ arch/arc/kernel/intc-arcv2.c | 15 +-
+ arch/arc/kernel/intc-compact.c | 17 +-
+ arch/arc/kernel/irq.c | 50 +----
+ arch/arc/kernel/mcip.c | 4 +-
+ arch/arc/kernel/setup.c | 17 +-
+ arch/arc/kernel/smp.c | 17 +-
+ arch/arc/kernel/stacktrace.c | 2 +-
+ arch/arc/kernel/time.c | 224 ++++++++++++++-------
+ arch/arc/mm/cache.c | 2 +-
+ arch/arc/mm/highmem.c | 2 +-
+ arch/arc/mm/tlb.c | 8 +-
+ arch/arc/plat-axs10x/axs10x.c | 27 ++-
+ 39 files changed, 506 insertions(+), 258 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/timer/snps,arc-timer.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/snps,archs-gfrc.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/snps,archs-rtc.txt
+ create mode 100644 arch/arc/boot/dts/skeleton_hs.dtsi
+ create mode 100644 arch/arc/boot/dts/skeleton_hs_idu.dtsi
+ delete mode 100644 arch/arc/include/asm/clk.h
+ delete mode 100644 arch/arc/kernel/clk.c
+Merging arm/for-next (1b3bf847977c Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next)
+$ git merge arm/for-next
+Auto-merging drivers/nvdimm/bus.c
+Removing arch/arm/boot/compressed/piggy.xzkern.S
+Removing arch/arm/boot/compressed/piggy.lzo.S
+Removing arch/arm/boot/compressed/piggy.lzma.S
+Removing arch/arm/boot/compressed/piggy.lz4.S
+Auto-merging arch/arm/boot/compressed/piggy.S
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-attributes.txt | 26 ++
+ Documentation/driver-model/porting.txt | 6 +-
+ arch/arm/Kconfig | 5 +-
+ arch/arm/Makefile | 1 -
+ arch/arm/boot/Makefile | 10 +-
+ arch/arm/boot/compressed/.gitignore | 6 +-
+ arch/arm/boot/compressed/Makefile | 31 +-
+ arch/arm/boot/compressed/{piggy.gzip.S => piggy.S} | 2 +-
+ arch/arm/boot/compressed/piggy.lz4.S | 6 -
+ arch/arm/boot/compressed/piggy.lzma.S | 6 -
+ arch/arm/boot/compressed/piggy.lzo.S | 6 -
+ arch/arm/boot/compressed/piggy.xzkern.S | 6 -
+ arch/arm/common/sa1111.c | 2 +-
+ arch/arm/include/asm/Kbuild | 1 -
+ arch/arm/include/asm/div64.h | 14 +-
+ arch/arm/include/asm/memory.h | 35 +--
+ arch/arm/include/asm/mmu_context.h | 14 +-
+ arch/arm/include/asm/sections.h | 8 +
+ arch/arm/include/asm/sparsemem.h | 7 +-
+ arch/arm/kernel/entry-armv.S | 8 +-
+ arch/arm/kernel/hibernate.c | 4 +-
+ arch/arm/kernel/hyp-stub.S | 24 ++
+ arch/arm/kernel/irq.c | 2 +-
+ arch/arm/kernel/machine_kexec.c | 16 +-
+ arch/arm/kernel/module.c | 2 +-
+ arch/arm/kernel/reboot.c | 2 +-
+ arch/arm/kernel/topology.c | 4 +-
+ arch/arm/kernel/vmlinux-xip.lds.S | 316 +++++++++++++++++++++
+ arch/arm/kernel/vmlinux.lds.S | 60 ++--
+ arch/arm/mach-davinci/include/mach/uncompress.h | 2 +-
+ arch/arm/mach-footbridge/Kconfig | 1 -
+ arch/arm/mach-keystone/keystone.c | 2 +-
+ arch/arm/mach-ks8695/include/mach/uncompress.h | 2 +-
+ arch/arm/mach-netx/include/mach/uncompress.h | 2 +-
+ arch/arm/mach-omap1/include/mach/uncompress.h | 2 +-
+ arch/arm/mach-rpc/include/mach/uncompress.h | 2 +-
+ arch/arm/mach-sa1100/include/mach/uncompress.h | 2 +-
+ arch/arm/mach-w90x900/include/mach/uncompress.h | 2 +-
+ arch/arm/mm/Kconfig | 36 +--
+ arch/arm/mm/cache-tauros2.c | 32 ++-
+ arch/arm/mm/dma-mapping.c | 248 ++++++++++++----
+ arch/arm/mm/idmap.c | 2 +-
+ arch/arm/mm/init.c | 24 +-
+ arch/arm/mm/mmu.c | 8 +-
+ arch/arm/mm/proc-v7.S | 2 +-
+ arch/arm/plat-orion/time.c | 13 +
+ arch/arm64/kernel/psci.c | 99 +------
+ drivers/base/dd.c | 24 +-
+ drivers/clk/clkdev.c | 31 +-
+ drivers/firmware/psci.c | 120 ++++++++
+ drivers/media/v4l2-core/videobuf2-dma-contig.c | 33 ++-
+ drivers/nvdimm/bus.c | 2 +-
+ include/linux/clkdev.h | 3 +-
+ include/linux/device.h | 7 +-
+ include/linux/dma-attrs.h | 1 +
+ include/linux/psci.h | 3 +
+ include/media/videobuf2-dma-contig.h | 11 +-
+ 57 files changed, 969 insertions(+), 377 deletions(-)
+ rename arch/arm/boot/compressed/{piggy.gzip.S => piggy.S} (67%)
+ delete mode 100644 arch/arm/boot/compressed/piggy.lz4.S
+ delete mode 100644 arch/arm/boot/compressed/piggy.lzma.S
+ delete mode 100644 arch/arm/boot/compressed/piggy.lzo.S
+ delete mode 100644 arch/arm/boot/compressed/piggy.xzkern.S
+ create mode 100644 arch/arm/include/asm/sections.h
+ create mode 100644 arch/arm/kernel/vmlinux-xip.lds.S
+Merging arm-perf/for-next/perf (fe638401a091 arm64: perf: Extend ARMV8_EVTYPE_MASK to include PMCR.LC)
+$ git merge arm-perf/for-next/perf
+Auto-merging drivers/bus/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/cci.txt | 2 +
+ Documentation/devicetree/bindings/arm/pmu.txt | 11 +
+ arch/arm/kernel/perf_event_v7.c | 13 +-
+ arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 5 +
+ arch/arm64/kernel/perf_event.c | 122 ++++-
+ drivers/bus/Kconfig | 10 +-
+ drivers/bus/arm-cci.c | 621 ++++++++++++++++++--------
+ drivers/perf/arm_pmu.c | 110 ++++-
+ include/linux/perf/arm_pmu.h | 2 +
+ 9 files changed, 668 insertions(+), 228 deletions(-)
+Merging arm-soc/for-next (2379bf18edfb arm-soc: document merges)
+$ git merge arm-soc/for-next
+Removing drivers/rtc/rtc-max77802.c
+Auto-merging drivers/dma/pxa_dma.c
+Removing arch/arm/plat-versatile/clock.c
+Removing arch/arm/mach-zynq/Makefile.boot
+Removing arch/arm/mach-ux500/Makefile.boot
+Removing arch/arm/mach-u300/Makefile.boot
+Removing arch/arm/mach-spear/Makefile.boot
+Removing arch/arm/mach-s3c64xx/Makefile.boot
+Removing arch/arm/mach-realview/Makefile.boot
+Removing arch/arm/mach-prima2/Makefile.boot
+Removing arch/arm/mach-orion5x/Makefile.boot
+Removing arch/arm/mach-omap2/Makefile.boot
+Removing arch/arm/mach-nspire/Makefile.boot
+Removing arch/arm/mach-mv78xx0/Makefile.boot
+Removing arch/arm/mach-mmp/Makefile.boot
+Removing arch/arm/mach-lpc32xx/timer.c
+Removing arch/arm/mach-lpc32xx/clock.c
+Auto-merging arch/arm/mach-keystone/keystone.c
+Removing arch/arm/mach-keystone/Makefile.boot
+Removing arch/arm/mach-integrator/Makefile.boot
+Removing arch/arm/mach-exynos/Makefile.boot
+Removing arch/arm/mach-cns3xxx/Makefile.boot
+Removing arch/arm/include/asm/clkdev.h
+Auto-merging arch/arm/include/asm/Kbuild
+Removing arch/arm/configs/realview-smp_defconfig
+Removing arch/arm/boot/dts/kirkwood-lswxl.dts
+Removing arch/arm/boot/dts/kirkwood-lswvl.dts
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/arm/marvell/marvell,kirkwood.txt
+Merge made by the 'recursive' strategy.
+ Documentation/arm/Marvell/README | 165 +-
+ Documentation/arm/sunxi/README | 1 -
+ Documentation/devicetree/bindings/arm/arm-boards | 1 +
+ Documentation/devicetree/bindings/arm/axis.txt | 29 +
+ .../bindings/arm/bcm/brcm,vulcan-soc.txt | 10 +
+ Documentation/devicetree/bindings/arm/cpus.txt | 2 +
+ .../devicetree/bindings/arm/keystone/keystone.txt | 5 +
+ .../arm/{ => marvell}/armada-370-xp-pmsu.txt | 0
+ .../bindings/arm/{ => marvell}/armada-370-xp.txt | 0
+ .../bindings/arm/{ => marvell}/armada-375.txt | 0
+ .../bindings/arm/marvell/armada-37xx.txt | 16 +
+ .../{ => marvell}/armada-380-mpcore-soc-ctrl.txt | 0
+ .../bindings/arm/{ => marvell}/armada-38x.txt | 0
+ .../bindings/arm/{ => marvell}/armada-39x.txt | 0
+ .../arm/{ => marvell}/armada-cpu-reset.txt | 0
+ .../arm/{ => marvell}/coherency-fabric.txt | 0
+ .../bindings/arm/{ => marvell}/kirkwood.txt | 0
+ .../bindings/arm/{ => marvell}/marvell,berlin.txt | 0
+ .../bindings/arm/{ => marvell}/marvell,dove.txt | 0
+ .../arm/{ => marvell}/marvell,kirkwood.txt | 7 +-
+ .../arm/{ => marvell}/mvebu-cpu-config.txt | 0
+ .../arm/{ => marvell}/mvebu-system-controller.txt | 0
+ Documentation/devicetree/bindings/arm/mediatek.txt | 4 +
+ .../devicetree/bindings/arm/{ => nxp}/lpc32xx.txt | 0
+ .../devicetree/bindings/arm/omap/omap.txt | 2 +-
+ Documentation/devicetree/bindings/arm/qcom.txt | 51 +
+ Documentation/devicetree/bindings/arm/sunxi.txt | 1 +
+ .../devicetree/bindings/ata/ahci-platform.txt | 1 +
+ Documentation/devicetree/bindings/bus/ti-gpmc.txt | 5 +
+ .../devicetree/bindings/display/arm,hdlcd.txt | 79 +
+ Documentation/devicetree/bindings/dma/mmp-dma.txt | 2 +
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 2 +
+ .../devicetree/bindings/pci/layerscape-pci.txt | 2 +-
+ .../pinctrl/marvell,armada-370-pinctrl.txt | 5 +-
+ .../bindings/reset/img,pistachio-reset.txt | 55 +
+ .../devicetree/bindings/serial/mtk-uart.txt | 1 +
+ .../bindings/soc/rockchip/power_domain.txt | 21 +
+ .../bindings/timer/mediatek,mtk-timer.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ .../devicetree/bindings/watchdog/arm,sp805.txt | 17 +
+ MAINTAINERS | 31 +-
+ arch/arm/Kconfig | 14 +-
+ arch/arm/Kconfig.debug | 9 +
+ arch/arm/Makefile | 1 +
+ arch/arm/arm-soc-for-next-contents.txt | 265 +++
+ arch/arm/boot/dts/Makefile | 33 +-
+ arch/arm/boot/dts/alpine.dtsi | 10 +
+ arch/arm/boot/dts/am335x-baltos-ir5221.dts | 9 +-
+ arch/arm/boot/dts/am335x-chilisom.dtsi | 8 +-
+ arch/arm/boot/dts/am335x-cm-t335.dts | 180 +-
+ arch/arm/boot/dts/am335x-evm.dts | 7 +-
+ arch/arm/boot/dts/am335x-igep0033.dtsi | 8 +-
+ arch/arm/boot/dts/am335x-phycore-som.dtsi | 8 +-
+ arch/arm/boot/dts/am335x-sl50.dts | 24 +-
+ arch/arm/boot/dts/am33xx.dtsi | 2 +
+ arch/arm/boot/dts/am4372.dtsi | 18 +-
+ arch/arm/boot/dts/am437x-cm-t43.dts | 11 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts | 8 +-
+ arch/arm/boot/dts/am43x-epos-evm.dts | 10 +-
+ arch/arm/boot/dts/am57xx-beagle-x15.dts | 7 +-
+ arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +-
+ arch/arm/boot/dts/arm-realview-pb1176.dts | 118 ++
+ arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 +-
+ arch/arm/boot/dts/armada-370-db.dts | 27 +
+ arch/arm/boot/dts/armada-370-mirabox.dts | 2 +-
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +-
+ arch/arm/boot/dts/armada-370-synology-ds213j.dts | 2 +-
+ arch/arm/boot/dts/armada-375.dtsi | 2 +-
+ arch/arm/boot/dts/armada-385-db-ap.dts | 3 +
+ arch/arm/boot/dts/armada-388-gp.dts | 36 +-
+ arch/arm/boot/dts/armada-38x.dtsi | 30 +-
+ arch/arm/boot/dts/armada-xp-db.dts | 28 +
+ arch/arm/boot/dts/artpec6-devboard.dts | 64 +
+ arch/arm/boot/dts/artpec6.dtsi | 236 +++
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 92 +
+ arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 9 +
+ arch/arm/boot/dts/bcm-nsp.dtsi | 205 ++-
+ arch/arm/boot/dts/bcm2835-rpi-a.dts | 24 +
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 16 +
+ arch/arm/boot/dts/bcm283x.dtsi | 43 +-
+ arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 111 ++
+ arch/arm/boot/dts/cros-ec-keyboard.dtsi | 1 +
+ arch/arm/boot/dts/dm8148-evm.dts | 58 +
+ arch/arm/boot/dts/dm814x-clocks.dtsi | 4 +-
+ arch/arm/boot/dts/dm814x.dtsi | 21 +
+ arch/arm/boot/dts/dm8168-evm.dts | 8 +-
+ arch/arm/boot/dts/dm816x.dtsi | 9 +
+ arch/arm/boot/dts/dra62x-j5eco-evm.dts | 58 +
+ arch/arm/boot/dts/dra7-dspeve-thermal.dtsi | 27 +
+ arch/arm/boot/dts/dra7-evm.dts | 9 +-
+ arch/arm/boot/dts/dra7-iva-thermal.dtsi | 27 +
+ arch/arm/boot/dts/dra7.dtsi | 102 +-
+ arch/arm/boot/dts/dra72-evm.dts | 9 +-
+ arch/arm/boot/dts/dra74x.dtsi | 1 -
+ arch/arm/boot/dts/dra7xx-clocks.dtsi | 24 +
+ arch/arm/boot/dts/emev2.dtsi | 39 +-
+ arch/arm/boot/dts/exynos-syscon-restart.dtsi | 27 +
+ arch/arm/boot/dts/exynos3250-monk.dts | 6 +-
+ arch/arm/boot/dts/exynos3250-rinato.dts | 6 +-
+ arch/arm/boot/dts/exynos3250.dtsi | 15 +-
+ arch/arm/boot/dts/exynos4.dtsi | 20 +-
+ arch/arm/boot/dts/exynos4210-origen.dts | 10 +-
+ arch/arm/boot/dts/exynos4210-smdkv310.dts | 2 +-
+ arch/arm/boot/dts/exynos4210-trats.dts | 2 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-origen.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-smdk4412.dts | 2 +-
+ arch/arm/boot/dts/exynos4412-trats2.dts | 4 +-
+ arch/arm/boot/dts/exynos5.dtsi | 20 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 12 +-
+ arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +-
+ arch/arm/boot/dts/exynos5250-spring.dts | 4 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 406 +++++
+ arch/arm/boot/dts/exynos5410-smdk5410.dts | 41 +
+ arch/arm/boot/dts/exynos5410.dtsi | 62 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 11 +-
+ arch/arm/boot/dts/exynos5420-cpus.dtsi | 126 ++
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 13 +-
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 9 +
+ arch/arm/boot/dts/exynos5420.dtsi | 170 +-
+ arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 46 +-
+ arch/arm/boot/dts/exynos5422-cpus.dtsi | 164 +-
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 8 +
+ arch/arm/boot/dts/exynos5800-peach-pi.dts | 13 +-
+ arch/arm/boot/dts/exynos5800.dtsi | 108 ++
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 +-
+ arch/arm/boot/dts/imx25.dtsi | 37 +-
+ arch/arm/boot/dts/imx28-apf28dev.dts | 2 +-
+ arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 4 +-
+ arch/arm/boot/dts/imx28-tx28.dts | 4 +-
+ .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 2 +-
+ arch/arm/boot/dts/imx35.dtsi | 8 +-
+ arch/arm/boot/dts/imx51-babbage.dts | 2 +-
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 2 +-
+ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 2 +-
+ arch/arm/boot/dts/imx51-pinfunc.h | 1 -
+ arch/arm/boot/dts/imx53-ard.dts | 6 +-
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 16 +-
+ arch/arm/boot/dts/imx53-tx53-x03x.dts | 2 +-
+ arch/arm/boot/dts/imx53-tx53-x13x.dts | 42 +-
+ arch/arm/boot/dts/imx53-tx53.dtsi | 4 +-
+ arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 2 +-
+ arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 2 +-
+ arch/arm/boot/dts/imx6q-apalis-ixora.dts | 272 +++
+ arch/arm/boot/dts/imx6q-b450v3.dts | 88 +
+ arch/arm/boot/dts/imx6q-b650v3.dts | 88 +
+ arch/arm/boot/dts/imx6q-b850v3.dts | 157 ++
+ arch/arm/boot/dts/imx6q-ba16.dtsi | 632 +++++++
+ arch/arm/boot/dts/imx6q-bx50v3.dtsi | 225 +++
+ arch/arm/boot/dts/imx6q-evi.dts | 502 ++++++
+ arch/arm/boot/dts/imx6q-gk802.dts | 2 +-
+ arch/arm/boot/dts/imx6q-icore-rqs.dts | 78 +
+ arch/arm/boot/dts/imx6q-tbs2910.dts | 318 ++--
+ arch/arm/boot/dts/imx6q-tx6q-1110.dts | 2 +-
+ arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +-
+ arch/arm/boot/dts/imx6q.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 984 +++++++++++
+ arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 4 +-
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 15 +-
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 8 +-
+ arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 411 +++++
+ arch/arm/boot/dts/imx6qdl-microsom.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 7 +-
+ arch/arm/boot/dts/imx6qdl-tx6.dtsi | 13 +-
+ arch/arm/boot/dts/imx6qdl-udoo.dtsi | 57 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 8 +-
+ arch/arm/boot/dts/imx6qp-sabreauto.dts | 93 +
+ arch/arm/boot/dts/imx6qp-sabresd.dts | 93 +
+ arch/arm/boot/dts/imx6qp.dtsi | 86 +
+ arch/arm/boot/dts/imx6sl-warp.dts | 2 +-
+ arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +-
+ arch/arm/boot/dts/imx6sx-sdb.dtsi | 18 +-
+ arch/arm/boot/dts/imx6ul-14x14-evk.dts | 5 +-
+ arch/arm/boot/dts/imx6ul-pinfunc.h | 1836 ++++++++++----------
+ arch/arm/boot/dts/imx6ul.dtsi | 220 ++-
+ arch/arm/boot/dts/imx7d-sbc-imx7.dts | 2 +-
+ arch/arm/boot/dts/imx7d-sdb.dts | 2 +-
+ arch/arm/boot/dts/imx7d.dtsi | 9 +
+ arch/arm/boot/dts/keystone-k2g-evm.dts | 32 +
+ arch/arm/boot/dts/keystone-k2g.dtsi | 89 +
+ arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 192 ++
+ .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 186 ++
+ arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts | 135 ++
+ arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 57 +
+ arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 57 +
+ arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 112 ++
+ arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 116 ++
+ arch/arm/boot/dts/kirkwood-linkstation.dtsi | 202 +++
+ arch/arm/boot/dts/kirkwood-lswvl.dts | 302 ----
+ arch/arm/boot/dts/kirkwood-lswxl.dts | 302 ----
+ arch/arm/boot/dts/kirkwood-openrd-client.dts | 6 +-
+ arch/arm/boot/dts/kirkwood-openrd.dtsi | 41 +-
+ arch/arm/boot/dts/kirkwood.dtsi | 2 +-
+ arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 268 +++
+ arch/arm/boot/dts/logicpd-som-lv.dtsi | 265 +++
+ arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 168 +-
+ arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 43 +-
+ arch/arm/boot/dts/lpc32xx.dtsi | 150 +-
+ arch/arm/boot/dts/ls1021a.dtsi | 44 +
+ arch/arm/boot/dts/mt2701.dtsi | 12 +
+ arch/arm/boot/dts/mt7623-evb.dts | 33 +
+ arch/arm/boot/dts/mt7623.dtsi | 147 ++
+ arch/arm/boot/dts/mvebu-linkstation-fan.dtsi | 72 +
+ .../boot/dts/mvebu-linkstation-gpio-simple.dtsi | 105 ++
+ arch/arm/boot/dts/omap3-beagle.dts | 5 +-
+ arch/arm/boot/dts/omap3-cm-t3x.dtsi | 6 +-
+ arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 4 +
+ arch/arm/boot/dts/omap3-evm-37xx.dts | 8 +-
+ arch/arm/boot/dts/omap3-gta04.dtsi | 4 +
+ arch/arm/boot/dts/omap3-igep.dtsi | 10 +-
+ arch/arm/boot/dts/omap3-igep0020-common.dtsi | 4 +-
+ arch/arm/boot/dts/omap3-igep0030-common.dtsi | 45 +
+ arch/arm/boot/dts/omap3-ldp.dts | 10 +-
+ arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 6 +-
+ arch/arm/boot/dts/omap3-n9.dts | 4 +
+ arch/arm/boot/dts/omap3-n900.dts | 44 +-
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 93 +
+ arch/arm/boot/dts/omap3-n950.dts | 33 +
+ arch/arm/boot/dts/omap3-overo-base.dtsi | 6 +-
+ arch/arm/boot/dts/omap3-pandora-common.dtsi | 4 +
+ arch/arm/boot/dts/omap3-sniper.dts | 254 +++
+ arch/arm/boot/dts/omap3-tao3530.dtsi | 6 +-
+ arch/arm/boot/dts/omap3.dtsi | 2 +
+ arch/arm/boot/dts/omap3430-sdp.dts | 6 +-
+ arch/arm/boot/dts/omap34xx.dtsi | 6 +
+ arch/arm/boot/dts/omap36xx.dtsi | 6 +
+ arch/arm/boot/dts/omap5.dtsi | 27 +-
+ arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 87 +
+ arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 243 +--
+ arch/arm/boot/dts/orion5x-linkstation.dtsi | 180 ++
+ arch/arm/boot/dts/phy3250.dts | 32 +
+ arch/arm/boot/dts/pxa27x.dtsi | 1 +
+ arch/arm/boot/dts/pxa3xx.dtsi | 3 +-
+ arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 276 +++
+ arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 27 +
+ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 26 +-
+ arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 208 +++
+ arch/arm/boot/dts/qcom-apq8064.dtsi | 128 +-
+ arch/arm/boot/dts/qcom-apq8084.dtsi | 14 +
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 12 +
+ arch/arm/boot/dts/qcom-msm8660.dtsi | 20 +
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 135 +-
+ arch/arm/boot/dts/qcom-pm8841.dtsi | 4 +-
+ arch/arm/boot/dts/qcom-pm8941.dtsi | 20 +-
+ arch/arm/boot/dts/r7s72100.dtsi | 177 +-
+ arch/arm/boot/dts/r8a73a4.dtsi | 241 +--
+ arch/arm/boot/dts/r8a7740.dtsi | 161 +-
+ arch/arm/boot/dts/r8a7778-bockw.dts | 13 +
+ arch/arm/boot/dts/r8a7778.dtsi | 144 +-
+ arch/arm/boot/dts/r8a7779-marzen.dts | 13 +
+ arch/arm/boot/dts/r8a7779.dtsi | 135 +-
+ arch/arm/boot/dts/r8a7790-lager.dts | 45 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 498 +++---
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 13 +
+ arch/arm/boot/dts/r8a7791-porter.dts | 165 ++
+ arch/arm/boot/dts/r8a7791.dtsi | 554 +++---
+ arch/arm/boot/dts/r8a7793-gose.dts | 304 ++++
+ arch/arm/boot/dts/r8a7793.dtsi | 791 +++++++--
+ arch/arm/boot/dts/r8a7794-alt.dts | 59 +
+ arch/arm/boot/dts/r8a7794-silk.dts | 122 ++
+ arch/arm/boot/dts/r8a7794.dtsi | 393 +++--
+ arch/arm/boot/dts/rk3036-kylin.dts | 104 ++
+ arch/arm/boot/dts/rk3036.dtsi | 69 +-
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 19 +-
+ arch/arm/boot/dts/rk3066a-marsboard.dts | 16 +
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 18 +-
+ arch/arm/boot/dts/rk3066a.dtsi | 24 +-
+ arch/arm/boot/dts/rk3188-radxarock.dts | 2 +-
+ arch/arm/boot/dts/rk3188.dtsi | 2 +
+ arch/arm/boot/dts/rk3288-evb.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-firefly.dtsi | 26 +-
+ arch/arm/boot/dts/rk3288-popmetal.dts | 2 +-
+ arch/arm/boot/dts/rk3288-r89.dts | 2 +-
+ arch/arm/boot/dts/rk3288-rock2-som.dtsi | 26 +
+ arch/arm/boot/dts/rk3288-rock2-square.dts | 48 +-
+ arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-veyron.dtsi | 7 +-
+ arch/arm/boot/dts/rk3288.dtsi | 48 +
+ arch/arm/boot/dts/rk3xxx.dtsi | 3 +
+ arch/arm/boot/dts/s5pv210-aquila.dts | 4 +-
+ arch/arm/boot/dts/s5pv210-goni.dts | 4 +-
+ arch/arm/boot/dts/s5pv210-smdkv210.dts | 2 +-
+ arch/arm/boot/dts/sama5d2.dtsi | 91 +-
+ arch/arm/boot/dts/sh73a0.dtsi | 186 +-
+ arch/arm/boot/dts/spear1310-evb.dts | 2 +-
+ arch/arm/boot/dts/spear1340-evb.dts | 2 +-
+ arch/arm/boot/dts/spear320-hmi.dts | 4 +-
+ arch/arm/boot/dts/stm32429i-eval.dts | 52 +-
+ arch/arm/boot/dts/stm32f429-disco.dts | 13 +
+ arch/arm/boot/dts/stm32f429.dtsi | 213 +++
+ arch/arm/boot/dts/stm32f469-disco.dts | 75 +
+ arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 34 +
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 9 +
+ .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts | 86 +-
+ arch/arm/boot/dts/sun4i-a10-mk802.dts | 33 +
+ arch/arm/boot/dts/sun5i-r8-chip.dts | 4 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 10 +
+ arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 6 +-
+ arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 125 ++
+ arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 287 +++
+ arch/arm/boot/dts/sun7i-a20-mk808c.dts | 35 +
+ arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 32 +
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +-
+ arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 79 +-
+ .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 64 +
+ arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 65 +
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 228 +++
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 57 +
+ arch/arm/boot/dts/sun8i-h3.dtsi | 64 +-
+ arch/arm/boot/dts/sun8i-q8-common.dtsi | 83 +-
+ arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 6 +
+ arch/arm/boot/dts/sun9i-a80-optimus.dts | 28 +-
+ arch/arm/boot/dts/sun9i-a80.dtsi | 11 +-
+ arch/arm/boot/dts/sunxi-itead-core-common.dtsi | 136 ++
+ arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 94 +-
+ arch/arm/boot/dts/vf-colibri.dtsi | 76 +-
+ arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 40 +-
+ arch/arm/boot/dts/vf500-colibri.dtsi | 40 +-
+ arch/arm/boot/dts/vf500.dtsi | 49 +-
+ arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 42 +-
+ arch/arm/boot/dts/vf610-colibri.dtsi | 40 +-
+ arch/arm/boot/dts/vf610-twr.dts | 44 +-
+ arch/arm/boot/dts/vf610.dtsi | 40 +-
+ arch/arm/boot/dts/vfxxx.dtsi | 102 +-
+ arch/arm/boot/dts/zynq-parallella.dts | 2 +-
+ arch/arm/boot/dts/zynq-zc702.dts | 2 +-
+ arch/arm/boot/dts/zynq-zc706.dts | 2 +-
+ arch/arm/boot/dts/zynq-zed.dts | 2 +-
+ arch/arm/boot/dts/zynq-zybo.dts | 13 +-
+ arch/arm/configs/bcm2835_defconfig | 11 +-
+ arch/arm/configs/dram_0x00000000.config | 1 +
+ arch/arm/configs/exynos_defconfig | 10 +-
+ arch/arm/configs/imx_v4_v5_defconfig | 14 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 23 +-
+ arch/arm/configs/mini2440_defconfig | 1 +
+ arch/arm/configs/multi_v5_defconfig | 3 +-
+ arch/arm/configs/multi_v7_defconfig | 28 +-
+ arch/arm/configs/mvebu_v5_defconfig | 1 +
+ arch/arm/configs/mvebu_v7_defconfig | 2 +
+ arch/arm/configs/mxs_defconfig | 7 +-
+ arch/arm/configs/omap2plus_defconfig | 13 +-
+ arch/arm/configs/pxa_defconfig | 1 +
+ arch/arm/configs/realview-smp_defconfig | 105 --
+ arch/arm/configs/realview_defconfig | 5 +
+ arch/arm/configs/s3c2410_defconfig | 1 +
+ arch/arm/configs/sama5_defconfig | 1 +
+ arch/arm/configs/shmobile_defconfig | 3 +-
+ arch/arm/configs/socfpga_defconfig | 2 +-
+ arch/arm/configs/stm32_defconfig | 1 +
+ arch/arm/configs/sunxi_defconfig | 13 +
+ arch/arm/include/asm/Kbuild | 1 +
+ arch/arm/include/asm/clkdev.h | 31 -
+ arch/arm/include/debug/at91.S | 4 +-
+ arch/arm/include/debug/imx.S | 3 +
+ arch/arm/include/debug/palmchip.S | 11 +
+ arch/arm/include/debug/zynq.S | 4 +-
+ arch/arm/mach-alpine/Kconfig | 1 +
+ arch/arm/mach-artpec/Kconfig | 20 +
+ arch/arm/mach-artpec/Makefile | 1 +
+ arch/arm/mach-artpec/board-artpec6.c | 72 +
+ arch/arm/mach-at91/Kconfig | 1 +
+ arch/arm/mach-at91/at91rm9200.c | 2 -
+ arch/arm/mach-at91/at91sam9.c | 2 -
+ arch/arm/mach-at91/generic.h | 13 +-
+ arch/arm/mach-at91/pm.c | 70 +-
+ arch/arm/mach-at91/sama5.c | 2 +-
+ arch/arm/mach-bcm/bcm63xx_pmb.c | 2 -
+ arch/arm/mach-bcm/platsmp.c | 2 +-
+ arch/arm/mach-cns3xxx/Makefile.boot | 3 -
+ arch/arm/mach-cns3xxx/cns3xxx.h | 6 -
+ arch/arm/mach-davinci/Kconfig | 22 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 8 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 7 +
+ arch/arm/mach-davinci/board-mityomapl138.c | 2 +-
+ arch/arm/mach-davinci/devices-da8xx.c | 46 +
+ arch/arm/mach-davinci/dm355.c | 20 +
+ arch/arm/mach-davinci/dm365.c | 22 +
+ arch/arm/mach-davinci/dm644x.c | 12 +
+ arch/arm/mach-davinci/dm646x.c | 11 +
+ arch/arm/mach-dove/Kconfig | 2 +-
+ arch/arm/mach-exynos/Kconfig | 1 +
+ arch/arm/mach-exynos/Makefile.boot | 2 -
+ arch/arm/mach-imx/3ds_debugboard.c | 30 +-
+ arch/arm/mach-imx/Kconfig | 4 +-
+ arch/arm/mach-imx/Makefile | 2 +-
+ arch/arm/mach-imx/anatop.c | 18 +-
+ arch/arm/mach-imx/avic.c | 30 +-
+ arch/arm/mach-imx/common.h | 1 +
+ arch/arm/mach-imx/cpu-imx27.c | 3 +-
+ arch/arm/mach-imx/cpu-imx31.c | 2 +-
+ arch/arm/mach-imx/cpu-imx35.c | 2 +-
+ arch/arm/mach-imx/cpu.c | 16 +-
+ arch/arm/mach-imx/epit.c | 22 +-
+ arch/arm/mach-imx/headsmp.S | 2 +
+ arch/arm/mach-imx/iomux-imx31.c | 12 +-
+ arch/arm/mach-imx/iomux-v1.c | 4 +-
+ arch/arm/mach-imx/iomux-v3.c | 6 +-
+ arch/arm/mach-imx/mach-armadillo5x0.c | 4 +-
+ arch/arm/mach-imx/mach-imx25.c | 1 +
+ arch/arm/mach-imx/mach-imx51.c | 5 +-
+ arch/arm/mach-imx/mach-imx6q.c | 8 +-
+ arch/arm/mach-imx/mach-mx27ads.c | 6 +-
+ arch/arm/mach-imx/mach-mx31ads.c | 16 +-
+ arch/arm/mach-imx/mach-mx31moboard.c | 2 +-
+ arch/arm/mach-imx/mach-qong.c | 6 +-
+ arch/arm/mach-imx/mxc.h | 5 +
+ arch/arm/mach-imx/pm-imx25.c | 37 +
+ arch/arm/mach-imx/pm-imx27.c | 4 +-
+ arch/arm/mach-imx/pm-imx3.c | 4 +-
+ arch/arm/mach-imx/pm-imx5.c | 26 +-
+ arch/arm/mach-imx/pm-imx6.c | 8 +-
+ arch/arm/mach-imx/src.c | 2 +-
+ arch/arm/mach-imx/system.c | 10 +-
+ arch/arm/mach-imx/tzic.c | 34 +-
+ arch/arm/mach-integrator/Kconfig | 6 -
+ arch/arm/mach-integrator/Makefile.boot | 4 -
+ arch/arm/mach-keystone/Makefile.boot | 1 -
+ arch/arm/mach-keystone/keystone.c | 1 +
+ arch/arm/mach-ks8695/board-og.c | 2 +-
+ arch/arm/mach-ks8695/cpu.c | 2 +-
+ arch/arm/mach-lpc32xx/Makefile | 3 +-
+ arch/arm/mach-lpc32xx/clock.c | 1284 --------------
+ arch/arm/mach-lpc32xx/phy3250.c | 53 -
+ arch/arm/mach-lpc32xx/serial.c | 3 -
+ arch/arm/mach-lpc32xx/timer.c | 144 --
+ arch/arm/mach-mediatek/Kconfig | 4 +
+ arch/arm/mach-mediatek/mediatek.c | 1 +
+ arch/arm/mach-mediatek/platsmp.c | 8 +
+ arch/arm/mach-mmp/Makefile.boot | 1 -
+ arch/arm/mach-mv78xx0/Kconfig | 3 +-
+ arch/arm/mach-mv78xx0/Makefile.boot | 3 -
+ arch/arm/mach-mv78xx0/common.c | 5 +-
+ arch/arm/mach-mvebu/Kconfig | 6 +-
+ arch/arm/mach-mvebu/coherency.c | 2 +-
+ arch/arm/mach-mvebu/platsmp.c | 1 +
+ arch/arm/mach-netx/Kconfig | 3 -
+ arch/arm/mach-nspire/Makefile.boot | 0
+ arch/arm/mach-omap1/dma.c | 45 +
+ arch/arm/mach-omap2/Makefile.boot | 3 -
+ arch/arm/mach-omap2/control.c | 21 +-
+ arch/arm/mach-omap2/cpuidle34xx.c | 69 +-
+ arch/arm/mach-omap2/dma.c | 117 ++
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 +-
+ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 14 +-
+ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 129 +-
+ arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 47 +-
+ arch/arm/mach-omap2/prm7xx.h | 1 +
+ arch/arm/mach-omap2/soc.h | 23 +-
+ arch/arm/mach-orion5x/Kconfig | 18 +-
+ arch/arm/mach-orion5x/Makefile.boot | 3 -
+ arch/arm/mach-prima2/Kconfig | 1 +
+ arch/arm/mach-prima2/Makefile.boot | 3 -
+ arch/arm/mach-pxa/Kconfig | 3 +-
+ arch/arm/mach-pxa/devices.c | 3 +-
+ arch/arm/mach-pxa/eseries.c | 4 +-
+ arch/arm/mach-pxa/gumstix.c | 6 +-
+ arch/arm/mach-pxa/include/mach/pxa2xx-regs.h | 8 +-
+ arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 2 +-
+ arch/arm/mach-pxa/pm.h | 3 +
+ arch/arm/mach-pxa/pxa-dt.c | 24 -
+ arch/arm/mach-pxa/pxa25x.c | 2 +-
+ arch/arm/mach-pxa/pxa27x.c | 8 +-
+ arch/arm/mach-pxa/pxa3xx.c | 11 +-
+ arch/arm/mach-pxa/spitz.c | 2 +-
+ arch/arm/mach-pxa/zeus.c | 2 +-
+ arch/arm/mach-realview/Makefile.boot | 9 -
+ arch/arm/mach-s3c24xx/Kconfig | 6 +-
+ arch/arm/mach-s3c24xx/mach-gta02.c | 2 +
+ arch/arm/mach-s3c64xx/Makefile.boot | 2 -
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 38 +-
+ arch/arm/mach-shmobile/Kconfig | 15 +-
+ arch/arm/mach-shmobile/common.h | 5 +-
+ arch/arm/mach-shmobile/cpufreq.c | 2 +
+ arch/arm/mach-shmobile/emev2.h | 6 +
+ arch/arm/mach-shmobile/headsmp-scu.S | 2 +-
+ arch/arm/mach-shmobile/platsmp-scu.c | 10 +-
+ arch/arm/mach-shmobile/setup-emev2.c | 22 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c | 39 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 7 +-
+ arch/arm/mach-shmobile/smp-emev2.c | 5 +-
+ arch/arm/mach-shmobile/smp-r8a7779.c | 3 +-
+ arch/arm/mach-shmobile/smp-sh73a0.c | 3 +-
+ arch/arm/mach-shmobile/suspend.c | 2 +
+ arch/arm/mach-shmobile/timer.c | 2 +
+ arch/arm/mach-socfpga/platsmp.c | 2 +
+ arch/arm/mach-spear/Makefile.boot | 3 -
+ arch/arm/mach-stm32/board-dt.c | 1 +
+ arch/arm/mach-sunxi/sunxi.c | 1 +
+ arch/arm/mach-u300/Makefile.boot | 4 -
+ arch/arm/mach-ux500/Makefile.boot | 3 -
+ arch/arm/mach-ux500/cpu-db8500.c | 4 +-
+ arch/arm/mach-versatile/Kconfig | 3 +
+ arch/arm/mach-versatile/versatile_dt.c | 15 -
+ arch/arm/mach-zynq/Makefile.boot | 3 -
+ arch/arm/mach-zynq/common.c | 3 +-
+ arch/arm/mach-zynq/slcr.c | 4 +
+ arch/arm/plat-pxa/include/plat/dma.h | 2 +-
+ arch/arm/plat-versatile/Kconfig | 3 -
+ arch/arm/plat-versatile/Makefile | 1 -
+ arch/arm/plat-versatile/clock.c | 74 -
+ arch/arm64/Kconfig.platforms | 36 +-
+ arch/arm64/boot/dts/Makefile | 1 +
+ arch/arm64/boot/dts/al/Makefile | 5 +
+ arch/arm64/boot/dts/al/alpine-v2-evp.dts | 53 +
+ arch/arm64/boot/dts/al/alpine-v2.dtsi | 236 +++
+ arch/arm64/boot/dts/amd/Makefile | 4 +-
+ arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts | 87 +
+ arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts | 91 +
+ arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 104 +-
+ arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi | 117 ++
+ arch/arm64/boot/dts/amd/husky.dts | 83 +
+ arch/arm64/boot/dts/apm/apm-merlin.dts | 3 +-
+ arch/arm64/boot/dts/apm/apm-mustang.dts | 3 +-
+ arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 27 +-
+ arch/arm64/boot/dts/apm/apm-storm.dtsi | 22 +
+ arch/arm64/boot/dts/arm/Makefile | 4 +-
+ arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts | 30 +
+ arch/arm64/boot/dts/arm/foundation-v8.dts | 227 +--
+ arch/arm64/boot/dts/arm/foundation-v8.dtsi | 228 +++
+ arch/arm64/boot/dts/arm/juno-base.dtsi | 68 +-
+ arch/arm64/boot/dts/arm/juno-r1.dts | 25 +-
+ arch/arm64/boot/dts/arm/juno-r2.dts | 183 ++
+ arch/arm64/boot/dts/broadcom/Makefile | 1 +
+ arch/arm64/boot/dts/broadcom/ns2-svk.dts | 12 +
+ arch/arm64/boot/dts/broadcom/ns2.dtsi | 140 ++
+ arch/arm64/boot/dts/broadcom/vulcan-eval.dts | 33 +
+ arch/arm64/boot/dts/broadcom/vulcan.dtsi | 144 ++
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +
+ arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 14 +-
+ arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 18 +
+ arch/arm64/boot/dts/hisilicon/hip05.dtsi | 92 +-
+ arch/arm64/boot/dts/marvell/Makefile | 4 +
+ arch/arm64/boot/dts/marvell/armada-371x.dtsi | 53 +
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 86 +
+ arch/arm64/boot/dts/marvell/armada-372x.dtsi | 63 +
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 131 ++
+ arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 3 +
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 16 +
+ arch/arm64/boot/dts/qcom/Makefile | 1 +
+ .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 14 +
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 170 +-
+ arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 238 ++-
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 48 +-
+ arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 21 +
+ arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 30 +
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 269 +++
+ arch/arm64/boot/dts/qcom/pm8004.dtsi | 19 +
+ arch/arm64/boot/dts/qcom/pm8916.dtsi | 10 +-
+ arch/arm64/boot/dts/qcom/pm8994.dtsi | 62 +
+ arch/arm64/boot/dts/qcom/pmi8994.dtsi | 19 +
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 139 ++
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 531 +++++-
+ arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 +-
+ arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi | 88 +
+ arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 1 +
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 61 +-
+ arch/arm64/configs/defconfig | 36 +
+ arch/arm64/include/asm/cputype.h | 3 +
+ drivers/bus/sunxi-rsb.c | 4 +-
+ drivers/clk/at91/clk-generated.c | 95 +-
+ drivers/clk/at91/clk-h32mx.c | 40 +-
+ drivers/clk/at91/clk-main.c | 324 ++--
+ drivers/clk/at91/clk-master.c | 94 +-
+ drivers/clk/at91/clk-peripheral.c | 137 +-
+ drivers/clk/at91/clk-pll.c | 150 +-
+ drivers/clk/at91/clk-plldiv.c | 44 +-
+ drivers/clk/at91/clk-programmable.c | 96 +-
+ drivers/clk/at91/clk-slow.c | 35 +-
+ drivers/clk/at91/clk-smd.c | 56 +-
+ drivers/clk/at91/clk-system.c | 96 +-
+ drivers/clk/at91/clk-usb.c | 123 +-
+ drivers/clk/at91/clk-utmi.c | 80 +-
+ drivers/clk/at91/pmc.c | 426 +----
+ drivers/clk/at91/pmc.h | 98 +-
+ drivers/clk/imx/clk-imx6q.c | 132 +-
+ drivers/clk/imx/clk-imx6ul.c | 65 +-
+ drivers/clk/pxa/clk-pxa25x.c | 12 +-
+ drivers/clk/pxa/clk-pxa27x.c | 34 +-
+ drivers/clk/pxa/clk-pxa3xx.c | 3 +-
+ drivers/cpufreq/pxa2xx-cpufreq.c | 2 +-
+ drivers/cpufreq/s5pv210-cpufreq.c | 2 -
+ drivers/dma/pxa_dma.c | 39 +-
+ drivers/firmware/arm_scpi.c | 17 +-
+ drivers/hwmon/scpi-hwmon.c | 14 +-
+ drivers/irqchip/Kconfig | 5 +
+ drivers/irqchip/Makefile | 2 +-
+ drivers/irqchip/irq-armada-370-xp.c | 156 +-
+ drivers/memory/omap-gpmc.c | 30 +
+ drivers/reset/Makefile | 1 +
+ drivers/reset/core.c | 10 +-
+ drivers/reset/hisilicon/hi6220_reset.c | 6 +-
+ drivers/reset/reset-ath79.c | 2 +-
+ drivers/reset/reset-berlin.c | 5 +-
+ drivers/reset/reset-lpc18xx.c | 2 +-
+ drivers/reset/reset-pistachio.c | 154 ++
+ drivers/reset/reset-socfpga.c | 2 +-
+ drivers/reset/reset-sunxi.c | 2 +-
+ drivers/reset/reset-zynq.c | 2 +-
+ drivers/reset/sti/reset-syscfg.c | 2 +-
+ drivers/rtc/Kconfig | 10 -
+ drivers/rtc/Makefile | 1 -
+ drivers/rtc/rtc-max77686.c | 362 +++-
+ drivers/rtc/rtc-max77802.c | 502 ------
+ drivers/soc/mediatek/mtk-pmic-wrap.c | 41 +-
+ drivers/soc/mediatek/mtk-scpsys.c | 60 +-
+ drivers/soc/rockchip/pm_domains.c | 34 +
+ drivers/soc/sunxi/sunxi_sram.c | 5 +-
+ drivers/soc/ti/knav_qmss.h | 4 +-
+ drivers/soc/ti/knav_qmss_acc.c | 14 +-
+ drivers/soc/ti/knav_qmss_queue.c | 22 +-
+ drivers/usb/gadget/udc/atmel_usba_udc.c | 20 +-
+ drivers/usb/gadget/udc/atmel_usba_udc.h | 2 +
+ include/dt-bindings/clock/imx6qdl-clock.h | 16 +-
+ include/dt-bindings/clock/imx6ul-clock.h | 149 +-
+ include/dt-bindings/clock/r8a7793-clock.h | 2 +
+ include/dt-bindings/clock/r8a7794-clock.h | 1 +
+ include/dt-bindings/clock/rk3188-cru-common.h | 1 +
+ include/dt-bindings/pinctrl/stm32f429-pinfunc.h | 1239 +++++++++++++
+ include/dt-bindings/power/rk3368-power.h | 28 +
+ include/dt-bindings/reset/pistachio-resets.h | 36 +
+ include/linux/clk/at91_pmc.h | 12 -
+ include/linux/omap-gpmc.h | 5 +
+ include/linux/platform_data/mmp_dma.h | 1 +
+ include/linux/reset-controller.h | 2 +-
+ include/linux/scpi_protocol.h | 3 +-
+ 640 files changed, 26160 insertions(+), 9113 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/axis.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-370-xp-pmsu.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-370-xp.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-375.txt (100%)
+ create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-380-mpcore-soc-ctrl.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-38x.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-39x.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/armada-cpu-reset.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/coherency-fabric.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/kirkwood.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/marvell,berlin.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/marvell,dove.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/marvell,kirkwood.txt (94%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/mvebu-cpu-config.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => marvell}/mvebu-system-controller.txt (100%)
+ rename Documentation/devicetree/bindings/arm/{ => nxp}/lpc32xx.txt (100%)
+ create mode 100644 Documentation/devicetree/bindings/arm/qcom.txt
+ create mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/img,pistachio-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/arm,sp805.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/artpec6-devboard.dts
+ create mode 100644 arch/arm/boot/dts/artpec6.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a.dts
+ create mode 100644 arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+ create mode 100644 arch/arm/boot/dts/dra7-dspeve-thermal.dtsi
+ create mode 100644 arch/arm/boot/dts/dra7-iva-thermal.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos-syscon-restart.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5420-cpus.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-b450v3.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-b650v3.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-b850v3.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-ba16.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6q-bx50v3.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6q-evi.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-icore-rqs.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qp-sabreauto.dts
+ create mode 100644 arch/arm/boot/dts/imx6qp-sabresd.dts
+ create mode 100644 arch/arm/boot/dts/imx6qp.dtsi
+ create mode 100644 arch/arm/boot/dts/keystone-k2g-evm.dts
+ create mode 100644 arch/arm/boot/dts/keystone-k2g.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi
+ delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts
+ delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts
+ create mode 100644 arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts
+ create mode 100644 arch/arm/boot/dts/logicpd-som-lv.dtsi
+ create mode 100644 arch/arm/boot/dts/mt7623-evb.dts
+ create mode 100644 arch/arm/boot/dts/mt7623.dtsi
+ create mode 100644 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi
+ create mode 100644 arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-sniper.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi
+ create mode 100644 arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+ create mode 100644 arch/arm/boot/dts/qcom-apq8064-pins.dtsi
+ create mode 100644 arch/arm/boot/dts/stm32f469-disco.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-a83t.dtsi
+ create mode 100644 arch/arm/boot/dts/sunxi-itead-core-common.dtsi
+ create mode 100644 arch/arm/configs/dram_0x00000000.config
+ delete mode 100644 arch/arm/configs/realview-smp_defconfig
+ delete mode 100644 arch/arm/include/asm/clkdev.h
+ create mode 100644 arch/arm/include/debug/palmchip.S
+ create mode 100644 arch/arm/mach-artpec/Kconfig
+ create mode 100644 arch/arm/mach-artpec/Makefile
+ create mode 100644 arch/arm/mach-artpec/board-artpec6.c
+ delete mode 100644 arch/arm/mach-cns3xxx/Makefile.boot
+ delete mode 100644 arch/arm/mach-exynos/Makefile.boot
+ create mode 100644 arch/arm/mach-imx/pm-imx25.c
+ delete mode 100644 arch/arm/mach-integrator/Makefile.boot
+ delete mode 100644 arch/arm/mach-keystone/Makefile.boot
+ delete mode 100644 arch/arm/mach-lpc32xx/clock.c
+ delete mode 100644 arch/arm/mach-lpc32xx/timer.c
+ delete mode 100644 arch/arm/mach-mmp/Makefile.boot
+ delete mode 100644 arch/arm/mach-mv78xx0/Makefile.boot
+ delete mode 100644 arch/arm/mach-nspire/Makefile.boot
+ delete mode 100644 arch/arm/mach-omap2/Makefile.boot
+ delete mode 100644 arch/arm/mach-orion5x/Makefile.boot
+ delete mode 100644 arch/arm/mach-prima2/Makefile.boot
+ delete mode 100644 arch/arm/mach-realview/Makefile.boot
+ delete mode 100644 arch/arm/mach-s3c64xx/Makefile.boot
+ create mode 100644 arch/arm/mach-shmobile/emev2.h
+ delete mode 100644 arch/arm/mach-spear/Makefile.boot
+ delete mode 100644 arch/arm/mach-u300/Makefile.boot
+ delete mode 100644 arch/arm/mach-ux500/Makefile.boot
+ delete mode 100644 arch/arm/mach-zynq/Makefile.boot
+ delete mode 100644 arch/arm/plat-versatile/clock.c
+ create mode 100644 arch/arm64/boot/dts/al/Makefile
+ create mode 100644 arch/arm64/boot/dts/al/alpine-v2-evp.dts
+ create mode 100644 arch/arm64/boot/dts/al/alpine-v2.dtsi
+ create mode 100644 arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
+ create mode 100644 arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
+ create mode 100644 arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
+ create mode 100644 arch/arm64/boot/dts/amd/husky.dts
+ create mode 100644 arch/arm64/boot/dts/arm/foundation-v8-gicv3.dts
+ create mode 100644 arch/arm64/boot/dts/arm/foundation-v8.dtsi
+ create mode 100644 arch/arm64/boot/dts/arm/juno-r2.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/vulcan-eval.dts
+ create mode 100644 arch/arm64/boot/dts/broadcom/vulcan.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-371x.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-3720-db.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-372x.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8996.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm8004.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pm8994.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pmi8994.dtsi
+ create mode 100644 arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi
+ create mode 100644 drivers/reset/reset-pistachio.c
+ delete mode 100644 drivers/rtc/rtc-max77802.c
+ create mode 100644 include/dt-bindings/pinctrl/stm32f429-pinfunc.h
+ create mode 100644 include/dt-bindings/power/rk3368-power.h
+ create mode 100644 include/dt-bindings/reset/pistachio-resets.h
+Merging at91/at91-next (c40abde4b32e Merge branch 'at91-4.6-dt' into at91-next)
+$ git merge at91/at91-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to DT)
+$ git merge bcm2835-dt/bcm2835-dt-next
+Already up-to-date.
+Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
+$ git merge bcm2835-soc/bcm2835-soc-next
+Already up-to-date.
+Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
+$ git merge bcm2835-drivers/bcm2835-drivers-next
+Already up-to-date.
+Merging bcm2835-defconfig/bcm2835-defconfig-next (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x)
+$ git merge bcm2835-defconfig/bcm2835-defconfig-next
+Already up-to-date.
+Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
+$ git merge berlin/berlin/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
+$ git merge cortex-m/for-next
+Already up-to-date.
+Merging imx-mxs/for-next (9e26d5f485d7 Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
+$ git merge keystone/next
+Resolved 'arch/arm/boot/dts/Makefile' using previous resolution.
+Auto-merging arch/arm/boot/dts/Makefile
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9d6aa599e9cf] Merge remote-tracking branch 'keystone/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/boot/dts/k2g-evm.dts | 32 ++++++++++++++++
+ arch/arm/boot/dts/k2g.dtsi | 89 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 121 insertions(+)
+ create mode 100644 arch/arm/boot/dts/k2g-evm.dts
+ create mode 100644 arch/arm/boot/dts/k2g.dtsi
+Merging mvebu/for-next (5be603bdf1a7 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/marvell/armada-7k-8k.txt | 24 +++
+ arch/arm64/boot/dts/marvell/Makefile | 1 +
+ arch/arm64/boot/dts/marvell/armada-7020.dtsi | 54 +++++
+ arch/arm64/boot/dts/marvell/armada-7040-db.dts | 92 ++++++++
+ arch/arm64/boot/dts/marvell/armada-7040.dtsi | 54 +++++
+ arch/arm64/boot/dts/marvell/armada-8020.dtsi | 54 +++++
+ arch/arm64/boot/dts/marvell/armada-8040.dtsi | 54 +++++
+ arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 71 ++++++
+ arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 84 ++++++++
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 237 +++++++++++++++++++++
+ 10 files changed, 725 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-7020.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-7040-db.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-7040.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-8020.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-8040.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+Merging omap/for-next (aec24f100558 Merge branch 'omap-for-v4.6/fixes-not-urgent' into for-next)
+$ git merge omap/for-next
+Resolved 'arch/arm/boot/dts/logicpd-torpedo-som.dtsi' using previous resolution.
+Auto-merging drivers/clk/Makefile
+Auto-merging arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4c76aac9d412] Merge remote-tracking branch 'omap/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/clock/ti/adpll.txt | 41 +
+ arch/arm/boot/dts/dm814x-clocks.dtsi | 243 ++++-
+ arch/arm/boot/dts/dra62x-clocks.dtsi | 26 +
+ arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 +
+ drivers/clk/Kconfig | 1 +
+ drivers/clk/Makefile | 2 +-
+ drivers/clk/ti/Kconfig | 6 +
+ drivers/clk/ti/Makefile | 6 +
+ drivers/clk/ti/adpll.c | 983 +++++++++++++++++++++
+ drivers/clk/ti/clk-814x.c | 53 ++
+ 10 files changed, 1331 insertions(+), 32 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/ti/adpll.txt
+ create mode 100644 drivers/clk/ti/Kconfig
+ create mode 100644 drivers/clk/ti/adpll.c
+Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe)
+$ git merge omap-pending/for-next
+Already up-to-date.
+Merging qcom/for-next (f17d0d578214 ARM: dts: msm8974: Add SCM firmware node)
+$ git merge qcom/for-next
+Resolved 'MAINTAINERS' using previous resolution.
+Auto-merging arch/arm/Makefile
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4b4994e381a6] Merge remote-tracking branch 'qcom/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++
+ MAINTAINERS | 3 +
+ arch/arm/Makefile | 3 +-
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 11 +
+ arch/arm/mach-qcom/Kconfig | 17 +-
+ drivers/firmware/qcom_scm-32.c | 82 +++++++
+ drivers/firmware/qcom_scm-64.c | 25 ++
+ drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++++-
+ drivers/firmware/qcom_scm.h | 12 +
+ drivers/soc/qcom/smd.c | 229 ++++++++++++-----
+ drivers/soc/qcom/smp2p.c | 2 +-
+ drivers/soc/qcom/spm.c | 8 +-
+ drivers/spmi/spmi-pmic-arb.c | 153 ++++++++----
+ include/linux/qcom_scm.h | 6 +
+ include/linux/soc/qcom/smd.h | 8 +-
+ include/linux/soc/qcom/smem_state.h | 35 +++
+ 16 files changed, 766 insertions(+), 124 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt
+Merging renesas/next (315df954e565 Merge branch 'heads/simple-pm-bus-for-v4.6' into next)
+$ git merge renesas/next
+Auto-merging drivers/bus/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/configs/shmobile_defconfig | 3 +++
+ drivers/bus/Kconfig | 2 +-
+ drivers/sh/pm_runtime.c | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+Merging rockchip/for-next (545d1b355f3a Merge branch 'v4.6-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Auto-merging drivers/clk/rockchip/clk-rk3368.c
+Auto-merging drivers/clk/rockchip/clk-rk3036.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/soc/rockchip/grf.txt | 35 +++++
+ arch/arm/boot/dts/rk3036-kylin.dts | 13 +-
+ arch/arm/boot/dts/rk3036.dtsi | 66 +++++++-
+ arch/arm/boot/dts/rk3066a-rayeager.dts | 2 -
+ arch/arm/boot/dts/rk3228-evb.dts | 8 +-
+ arch/arm/boot/dts/rk3228.dtsi | 69 ++++++++
+ arch/arm/boot/dts/rk3288-evb.dtsi | 1 -
+ arch/arm/boot/dts/rk3288-firefly.dtsi | 2 -
+ arch/arm/boot/dts/rk3288-popmetal.dts | 1 -
+ arch/arm/boot/dts/rk3288-veyron.dtsi | 4 +-
+ arch/arm/boot/dts/rk3288.dtsi | 7 +-
+ arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 4 +-
+ drivers/clk/rockchip/clk-cpu.c | 8 +-
+ drivers/clk/rockchip/clk-inverter.c | 8 +-
+ drivers/clk/rockchip/clk-mmc-phase.c | 8 +-
+ drivers/clk/rockchip/clk-pll.c | 5 +
+ drivers/clk/rockchip/clk-rk3036.c | 33 +---
+ drivers/clk/rockchip/clk-rk3188.c | 27 ++--
+ drivers/clk/rockchip/clk-rk3228.c | 56 ++-----
+ drivers/clk/rockchip/clk-rk3288.c | 38 ++---
+ drivers/clk/rockchip/clk-rk3368.c | 175 +++++++++++----------
+ drivers/clk/rockchip/clk.c | 64 +++++++-
+ drivers/clk/rockchip/clk.h | 28 ++++
+ drivers/soc/rockchip/pm_domains.c | 4 +
+ include/dt-bindings/clock/rk3228-cru.h | 12 ++
+ 27 files changed, 449 insertions(+), 231 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt
+Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
+$ git merge rpi/for-rpi-next
+Already up-to-date.
+Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
+$ git merge samsung/for-next
+Already up-to-date.
+Merging samsung-krzk/for-next (466369e4e14b Merge branch 'next/defconfig' into for-next)
+$ git merge samsung-krzk/for-next
+Resolved 'drivers/clk/Kconfig' using previous resolution.
+Auto-merging include/linux/soc/samsung/exynos-regs-pmu.h
+Auto-merging include/linux/soc/samsung/exynos-pmu.h
+Auto-merging drivers/clk/rockchip/clk.c
+Auto-merging drivers/clk/clk-gpio.c
+Auto-merging drivers/clk/Kconfig
+CONFLICT (content): Merge conflict in drivers/clk/Kconfig
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm64/Kconfig.platforms
+Auto-merging arch/arm/mach-s3c24xx/Kconfig
+Removing arch/arm/mach-exynos/pmu.c
+Auto-merging arch/arm/mach-exynos/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 62d9d1d520ef] Merge remote-tracking branch 'samsung-krzk/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/clock/xgene.txt | 2 +
+ MAINTAINERS | 1 +
+ arch/arm/mach-exynos/Kconfig | 4 +-
+ arch/arm/mach-exynos/Makefile | 2 +-
+ arch/arm/mach-exynos/common.h | 1 -
+ arch/arm/mach-exynos/exynos.c | 17 +-
+ arch/arm/mach-exynos/firmware.c | 2 -
+ arch/arm/mach-exynos/include/mach/map.h | 14 +-
+ arch/arm/mach-exynos/mcpm-exynos.c | 2 +-
+ arch/arm/mach-exynos/platsmp.c | 3 +-
+ arch/arm/mach-exynos/pm.c | 8 +-
+ arch/arm/mach-exynos/pmu.c | 967 ---------------------
+ arch/arm/mach-exynos/s5p-dev-mfc.c | 1 -
+ arch/arm/mach-exynos/suspend.c | 4 +-
+ arch/arm/mach-s3c24xx/Kconfig | 1 +
+ arch/arm/mach-s3c24xx/include/mach/io.h | 2 +-
+ arch/arm/mach-s3c24xx/include/mach/map.h | 11 -
+ arch/arm/mach-s3c64xx/Kconfig | 3 +-
+ arch/arm/plat-samsung/adc.c | 6 +-
+ arch/arm/plat-samsung/include/plat/map-s3c.h | 4 -
+ arch/arm/plat-samsung/include/plat/map-s5p.h | 5 -
+ arch/arm64/Kconfig.platforms | 11 +-
+ arch/arm64/boot/dts/exynos/Makefile | 2 +-
+ arch/arm64/configs/defconfig | 2 +-
+ drivers/clk/Kconfig | 8 +-
+ drivers/clk/clk-composite.c | 2 -
+ drivers/clk/clk-divider.c | 13 +-
+ drivers/clk/clk-fixed-factor.c | 2 -
+ drivers/clk/clk-fixed-rate.c | 2 -
+ drivers/clk/clk-fractional-divider.c | 2 -
+ drivers/clk/clk-gate.c | 2 -
+ drivers/clk/clk-gpio.c | 2 -
+ drivers/clk/clk-multiplier.c | 2 -
+ drivers/clk/clk-mux.c | 2 -
+ drivers/clk/clk-s2mps11.c | 108 +--
+ drivers/clk/clk-xgene.c | 105 ++-
+ drivers/clk/imx/clk-busy.c | 4 +-
+ drivers/clk/imx/clk-fixup-div.c | 5 +-
+ drivers/clk/imx/clk-fixup-mux.c | 2 -
+ drivers/clk/imx/clk-gate-exclusive.c | 2 +-
+ drivers/clk/mediatek/clk-gate.c | 8 +-
+ drivers/clk/mediatek/clk-gate.h | 2 +-
+ drivers/clk/mediatek/clk-mtk.c | 6 +-
+ drivers/clk/mvebu/common.c | 2 -
+ drivers/clk/mvebu/kirkwood.c | 2 -
+ drivers/clk/mxs/clk-div.c | 2 +-
+ drivers/clk/nxp/clk-lpc18xx-ccu.c | 4 +-
+ drivers/clk/rockchip/clk.c | 4 +-
+ drivers/clk/samsung/Kconfig | 19 +-
+ drivers/clk/samsung/Makefile | 4 +-
+ drivers/clk/st/clkgen-mux.c | 9 +-
+ drivers/clk/ti/composite.c | 2 -
+ drivers/clk/ti/divider.c | 2 -
+ drivers/clk/ti/gate.c | 2 -
+ drivers/clk/ti/mux.c | 2 -
+ drivers/soc/Kconfig | 1 +
+ drivers/soc/Makefile | 1 +
+ drivers/soc/samsung/Kconfig | 13 +
+ drivers/soc/samsung/Makefile | 2 +
+ drivers/soc/samsung/exynos-pmu.c | 141 +++
+ drivers/soc/samsung/exynos-pmu.h | 44 +
+ drivers/soc/samsung/exynos3250-pmu.c | 175 ++++
+ drivers/soc/samsung/exynos4-pmu.c | 222 +++++
+ drivers/soc/samsung/exynos5250-pmu.c | 195 +++++
+ drivers/soc/samsung/exynos5420-pmu.c | 280 ++++++
+ include/linux/clk-provider.h | 19 +
+ .../linux/soc/samsung}/exynos-pmu.h | 6 +-
+ .../linux/soc/samsung/exynos-regs-pmu.h | 6 +-
+ 68 files changed, 1278 insertions(+), 1235 deletions(-)
+ delete mode 100644 arch/arm/mach-exynos/pmu.c
+ create mode 100644 drivers/soc/samsung/Kconfig
+ create mode 100644 drivers/soc/samsung/Makefile
+ create mode 100644 drivers/soc/samsung/exynos-pmu.c
+ create mode 100644 drivers/soc/samsung/exynos-pmu.h
+ create mode 100644 drivers/soc/samsung/exynos3250-pmu.c
+ create mode 100644 drivers/soc/samsung/exynos4-pmu.c
+ create mode 100644 drivers/soc/samsung/exynos5250-pmu.c
+ create mode 100644 drivers/soc/samsung/exynos5420-pmu.c
+ rename {arch/arm/mach-exynos => include/linux/soc/samsung}/exynos-pmu.h (81%)
+ rename arch/arm/mach-exynos/regs-pmu.h => include/linux/soc/samsung/exynos-regs-pmu.h (99%)
+Merging sunxi/sunxi/for-next (73e5379b0442 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/config64-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/clock/sunxi.txt | 4 +
+ drivers/clk/sunxi/clk-a10-hosc.c | 3 +-
+ drivers/clk/sunxi/clk-a20-gmac.c | 2 -
+ drivers/clk/sunxi/clk-factors.c | 123 ++-
+ drivers/clk/sunxi/clk-factors.h | 26 +-
+ drivers/clk/sunxi/clk-mod0.c | 23 +-
+ drivers/clk/sunxi/clk-simple-gates.c | 4 +
+ drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 2 -
+ drivers/clk/sunxi/clk-sun6i-ar100.c | 235 ++----
+ drivers/clk/sunxi/clk-sun8i-apb0.c | 2 +-
+ drivers/clk/sunxi/clk-sun8i-bus-gates.c | 3 +-
+ drivers/clk/sunxi/clk-sun8i-mbus.c | 127 ++--
+ drivers/clk/sunxi/clk-sun9i-core.c | 86 +--
+ drivers/clk/sunxi/clk-sunxi.c | 863 ++++++++++------------
+ drivers/clk/sunxi/clk-usb.c | 24 +-
+ 15 files changed, 691 insertions(+), 836 deletions(-)
+Merging tegra/for-next (755f165105b1 Merge branch for-4.6/arm64 into for-next)
+$ git merge tegra/for-next
+Auto-merging arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 12 +-
+ arch/arm/boot/dts/tegra114-dalmore.dts | 2 +-
+ arch/arm/boot/dts/tegra114-roth.dts | 2 +-
+ arch/arm/boot/dts/tegra114-tn7.dts | 2 +-
+ arch/arm/boot/dts/tegra114.dtsi | 4 +-
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 28 +++-
+ arch/arm/boot/dts/tegra124-nyan.dtsi | 4 +-
+ arch/arm/boot/dts/tegra124-venice2.dts | 2 +-
+ arch/arm/boot/dts/tegra124.dtsi | 4 +-
+ arch/arm/boot/dts/tegra20-harmony.dts | 2 +-
+ arch/arm/boot/dts/tegra20-paz00.dts | 2 +-
+ arch/arm/boot/dts/tegra20-seaboard.dts | 4 +-
+ arch/arm/boot/dts/tegra20-trimslice.dts | 2 +-
+ arch/arm/boot/dts/tegra20-ventana.dts | 2 +-
+ arch/arm/boot/dts/tegra20-whistler.dts | 2 +-
+ arch/arm/boot/dts/tegra20.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30-apalis-eval.dts | 2 +-
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
+ arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +-
+ arch/arm/boot/dts/tegra30.dtsi | 2 +-
+ arch/arm/mach-tegra/platsmp.c | 16 +--
+ arch/arm64/boot/dts/nvidia/Makefile | 1 +
+ arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 4 +-
+ arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 26 ++++
+ arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 126 +++++++++++++++++
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +-
+ drivers/gpu/drm/tegra/drm.h | 2 +-
+ drivers/soc/tegra/Kconfig | 2 -
+ drivers/soc/tegra/pmc.c | 150 +++++++++++++--------
+ include/soc/tegra/pmc.h | 35 ++---
+ 31 files changed, 330 insertions(+), 120 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
+Merging arm64/for-next/core (ef769e320863 arm64: Fix misspellings in comments.)
+$ git merge arm64/for-next/core
+Resolved 'arch/arm64/include/asm/cputype.h' using previous resolution.
+Resolved 'arch/arm64/mm/init.c' using previous resolution.
+Auto-merging include/linux/efi.h
+Auto-merging arch/arm64/mm/init.c
+CONFLICT (content): Merge conflict in arch/arm64/mm/init.c
+Auto-merging arch/arm64/mm/fault.c
+Auto-merging arch/arm64/kernel/image.h
+Auto-merging arch/arm64/kernel/debug-monitors.c
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging arch/arm64/include/asm/kvm_arm.h
+Auto-merging arch/arm64/include/asm/cputype.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/cputype.h
+Auto-merging arch/arm64/boot/dts/nvidia/tegra210.dtsi
+Auto-merging arch/arm64/boot/dts/nvidia/tegra132.dtsi
+Auto-merging arch/arm64/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 335d4c53a481] Merge remote-tracking branch 'arm64/for-next/core'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm64/booting.txt | 20 +-
+ Documentation/arm64/silicon-errata.txt | 1 +
+ .../features/vm/huge-vmap/arch-support.txt | 2 +-
+ arch/arm/include/asm/kvm_asm.h | 2 +
+ arch/arm/kvm/arm.c | 8 +-
+ arch/arm64/Kconfig | 104 ++++
+ arch/arm64/Kconfig.debug | 6 +-
+ arch/arm64/Makefile | 10 +-
+ arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 +-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +-
+ arch/arm64/include/asm/acpi.h | 19 +-
+ arch/arm64/include/asm/alternative.h | 63 +++
+ arch/arm64/include/asm/assembler.h | 26 +-
+ arch/arm64/include/asm/atomic_lse.h | 38 +-
+ arch/arm64/include/asm/boot.h | 6 +
+ arch/arm64/include/asm/brk-imm.h | 25 +
+ arch/arm64/include/asm/bug.h | 2 +-
+ arch/arm64/include/asm/cpu.h | 1 +
+ arch/arm64/include/asm/cpufeature.h | 41 +-
+ arch/arm64/include/asm/cputype.h | 31 +-
+ arch/arm64/include/asm/debug-monitors.h | 14 +-
+ arch/arm64/include/asm/elf.h | 24 +-
+ arch/arm64/include/asm/fixmap.h | 11 +
+ arch/arm64/include/asm/ftrace.h | 2 +-
+ arch/arm64/include/asm/futex.h | 12 +-
+ arch/arm64/include/asm/hardirq.h | 2 +-
+ arch/arm64/include/asm/kasan.h | 5 +-
+ arch/arm64/include/asm/kernel-pgtable.h | 12 +
+ arch/arm64/include/asm/kvm_arm.h | 2 +-
+ arch/arm64/include/asm/kvm_asm.h | 2 +
+ arch/arm64/include/asm/kvm_host.h | 12 +-
+ arch/arm64/include/asm/kvm_mmu.h | 2 +-
+ arch/arm64/include/asm/lse.h | 1 +
+ arch/arm64/include/asm/memory.h | 65 ++-
+ arch/arm64/include/asm/mmu_context.h | 64 ++-
+ arch/arm64/include/asm/module.h | 17 +
+ arch/arm64/include/asm/pgalloc.h | 26 +-
+ arch/arm64/include/asm/pgtable-prot.h | 92 ++++
+ arch/arm64/include/asm/pgtable.h | 175 +++----
+ arch/arm64/include/asm/processor.h | 9 +-
+ arch/arm64/include/asm/ptrace.h | 33 +-
+ arch/arm64/include/asm/smp.h | 46 ++
+ arch/arm64/include/asm/sysreg.h | 23 +-
+ arch/arm64/include/asm/uaccess.h | 82 ++--
+ arch/arm64/include/asm/word-at-a-time.h | 7 +-
+ arch/arm64/include/uapi/asm/hwcap.h | 2 +
+ arch/arm64/include/uapi/asm/ptrace.h | 1 +
+ arch/arm64/kernel/Makefile | 3 +
+ arch/arm64/kernel/acpi_parking_protocol.c | 141 ++++++
+ arch/arm64/kernel/armv8_deprecated.c | 7 +-
+ arch/arm64/kernel/asm-offsets.c | 2 +
+ arch/arm64/kernel/cpu_errata.c | 27 +-
+ arch/arm64/kernel/cpu_ops.c | 27 +-
+ arch/arm64/kernel/cpufeature.c | 270 ++++++-----
+ arch/arm64/kernel/cpuinfo.c | 3 +
+ arch/arm64/kernel/debug-monitors.c | 23 +-
+ arch/arm64/kernel/efi-entry.S | 3 +-
+ arch/arm64/kernel/fpsimd.c | 2 +-
+ arch/arm64/kernel/head.S | 167 ++++++-
+ arch/arm64/kernel/image.h | 45 +-
+ arch/arm64/kernel/kaslr.c | 177 +++++++
+ arch/arm64/kernel/kgdb.c | 4 +-
+ arch/arm64/kernel/module-plts.c | 201 ++++++++
+ arch/arm64/kernel/module.c | 25 +-
+ arch/arm64/kernel/module.lds | 3 +
+ arch/arm64/kernel/process.c | 16 +
+ arch/arm64/kernel/ptrace.c | 80 +++-
+ arch/arm64/kernel/setup.c | 36 ++
+ arch/arm64/kernel/signal.c | 4 +-
+ arch/arm64/kernel/signal32.c | 4 +-
+ arch/arm64/kernel/smp.c | 99 +++-
+ arch/arm64/kernel/suspend.c | 20 +-
+ arch/arm64/kernel/vdso/vdso.S | 3 +-
+ arch/arm64/kernel/vmlinux.lds.S | 30 +-
+ arch/arm64/kvm/hyp.S | 6 +-
+ arch/arm64/kvm/hyp/debug-sr.c | 1 +
+ arch/arm64/kvm/sys_regs.c | 2 +-
+ arch/arm64/lib/Makefile | 13 +-
+ arch/arm64/lib/clear_user.S | 12 +-
+ arch/arm64/lib/copy_from_user.S | 12 +-
+ arch/arm64/lib/copy_in_user.S | 20 +-
+ arch/arm64/lib/copy_page.S | 63 ++-
+ arch/arm64/lib/copy_to_user.S | 12 +-
+ arch/arm64/lib/memcmp.S | 2 +-
+ arch/arm64/mm/context.c | 54 ++-
+ arch/arm64/mm/dump.c | 21 +-
+ arch/arm64/mm/extable.c | 2 +-
+ arch/arm64/mm/fault.c | 34 +-
+ arch/arm64/mm/init.c | 130 ++++-
+ arch/arm64/mm/kasan_init.c | 72 ++-
+ arch/arm64/mm/mmu.c | 526 +++++++++++++--------
+ arch/arm64/mm/pageattr.c | 46 +-
+ arch/arm64/mm/proc.S | 40 ++
+ arch/x86/include/asm/efi.h | 2 +
+ drivers/firmware/efi/libstub/Makefile | 2 +-
+ drivers/firmware/efi/libstub/arm-stub.c | 40 +-
+ drivers/firmware/efi/libstub/arm64-stub.c | 78 ++-
+ drivers/firmware/efi/libstub/efi-stub-helper.c | 7 +-
+ drivers/firmware/efi/libstub/efistub.h | 7 +
+ drivers/firmware/efi/libstub/fdt.c | 14 +
+ drivers/firmware/efi/libstub/random.c | 135 ++++++
+ drivers/of/fdt.c | 19 +-
+ include/asm-generic/fixmap.h | 12 +-
+ include/linux/efi.h | 6 +-
+ lib/extable.c | 50 +-
+ scripts/sortextable.c | 10 +-
+ 106 files changed, 3128 insertions(+), 896 deletions(-)
+ create mode 100644 arch/arm64/include/asm/brk-imm.h
+ create mode 100644 arch/arm64/include/asm/pgtable-prot.h
+ create mode 100644 arch/arm64/kernel/acpi_parking_protocol.c
+ create mode 100644 arch/arm64/kernel/kaslr.c
+ create mode 100644 arch/arm64/kernel/module-plts.c
+ create mode 100644 arch/arm64/kernel/module.lds
+ create mode 100644 drivers/firmware/efi/libstub/random.c
+Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
+$ git merge cris/for-next
+Already up-to-date.
+Merging h8300/h8300-next (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
+$ git merge h8300/h8300-next
+Merge made by the 'recursive' strategy.
+ arch/h8300/boot/dts/edosk2674.dts | 6 +++---
+ arch/h8300/boot/dts/h8300h_sim.dts | 4 ++--
+ arch/h8300/boot/dts/h8s_sim.dts | 4 ++--
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev())
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ drivers/zorro/zorro-sysfs.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging m68knommu/for-next (a3595962d824 m68knommu: remove obsolete 68360 support)
+$ git merge m68knommu/for-next
+Removing arch/m68k/include/asm/m68360_regs.h
+Removing arch/m68k/include/asm/m68360_quicc.h
+Removing arch/m68k/include/asm/m68360_pram.h
+Removing arch/m68k/include/asm/m68360_enet.h
+Removing arch/m68k/include/asm/m68360.h
+Removing arch/m68k/include/asm/commproc.h
+Removing arch/m68k/68360/ints.c
+Removing arch/m68k/68360/head-rom.S
+Removing arch/m68k/68360/head-ram.S
+Removing arch/m68k/68360/entry.S
+Removing arch/m68k/68360/config.c
+Removing arch/m68k/68360/commproc.c
+Removing arch/m68k/68360/Makefile
+Merge made by the 'recursive' strategy.
+ arch/m68k/68360/Makefile | 12 -
+ arch/m68k/68360/commproc.c | 309 ----------------
+ arch/m68k/68360/config.c | 169 ---------
+ arch/m68k/68360/entry.S | 164 ---------
+ arch/m68k/68360/head-ram.S | 402 ---------------------
+ arch/m68k/68360/head-rom.S | 413 ----------------------
+ arch/m68k/68360/ints.c | 138 --------
+ arch/m68k/Kconfig.cpu | 7 -
+ arch/m68k/Kconfig.debug | 2 +-
+ arch/m68k/Kconfig.machine | 6 -
+ arch/m68k/Makefile | 3 -
+ arch/m68k/coldfire/device.c | 4 +-
+ arch/m68k/include/asm/commproc.h | 664 -----------------------------------
+ arch/m68k/include/asm/m68360.h | 13 -
+ arch/m68k/include/asm/m68360_enet.h | 177 ----------
+ arch/m68k/include/asm/m68360_pram.h | 431 -----------------------
+ arch/m68k/include/asm/m68360_quicc.h | 362 -------------------
+ arch/m68k/include/asm/m68360_regs.h | 408 ---------------------
+ arch/m68k/kernel/early_printk.c | 8 +-
+ arch/m68k/kernel/setup_no.c | 7 -
+ 20 files changed, 7 insertions(+), 3692 deletions(-)
+ delete mode 100644 arch/m68k/68360/Makefile
+ delete mode 100644 arch/m68k/68360/commproc.c
+ delete mode 100644 arch/m68k/68360/config.c
+ delete mode 100644 arch/m68k/68360/entry.S
+ delete mode 100644 arch/m68k/68360/head-ram.S
+ delete mode 100644 arch/m68k/68360/head-rom.S
+ delete mode 100644 arch/m68k/68360/ints.c
+ delete mode 100644 arch/m68k/include/asm/commproc.h
+ delete mode 100644 arch/m68k/include/asm/m68360.h
+ delete mode 100644 arch/m68k/include/asm/m68360_enet.h
+ delete mode 100644 arch/m68k/include/asm/m68360_pram.h
+ delete mode 100644 arch/m68k/include/asm/m68360_quicc.h
+ delete mode 100644 arch/m68k/include/asm/m68360_regs.h
+Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
+$ git merge metag/for-next
+Auto-merging arch/metag/kernel/ftrace.c
+Merge made by the 'recursive' strategy.
+ arch/metag/kernel/ftrace.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
+$ git merge microblaze/next
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/unistd.h | 2 +-
+ arch/microblaze/include/uapi/asm/unistd.h | 3 +++
+ arch/microblaze/kernel/syscall_table.S | 3 +++
+ 3 files changed, 7 insertions(+), 1 deletion(-)
+Merging mips/mips-for-linux-next (2de9a0968d70 MIPS: traps: Correct the SIGTRAP debug ABI in `do_watch' and `do_trap_or_bp')
+$ git merge mips/mips-for-linux-next
+Auto-merging drivers/firmware/broadcom/bcm47xx_sprom.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mips/cavium/ciu3.txt | 27 +
+ arch/mips/Kconfig | 4 +-
+ arch/mips/alchemy/common/dbdma.c | 4 +-
+ arch/mips/ath79/Kconfig | 12 -
+ arch/mips/ath79/setup.c | 13 +-
+ arch/mips/bcm47xx/Makefile | 2 +-
+ arch/mips/bcm47xx/bcm47xx_private.h | 3 -
+ arch/mips/bcm47xx/setup.c | 2 +-
+ arch/mips/boot/compressed/Makefile | 12 +-
+ arch/mips/boot/dts/qca/Makefile | 3 -
+ arch/mips/cavium-octeon/csrc-octeon.c | 13 +-
+ .../executive/cvmx-interrupt-decodes.c | 14 +-
+ arch/mips/cavium-octeon/executive/cvmx-pko.c | 2 +-
+ arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 72 +--
+ arch/mips/cavium-octeon/executive/octeon-model.c | 82 ++-
+ arch/mips/cavium-octeon/octeon-irq.c | 679 ++++++++++++++++++++-
+ arch/mips/cavium-octeon/octeon-platform.c | 94 ++-
+ arch/mips/cavium-octeon/setup.c | 86 ++-
+ arch/mips/cavium-octeon/smp.c | 153 ++++-
+ arch/mips/configs/ci20_defconfig | 14 +-
+ arch/mips/dec/int-handler.S | 2 +-
+ arch/mips/fw/arc/memory.c | 2 +-
+ arch/mips/include/asm/cpu.h | 2 +
+ arch/mips/include/asm/highmem.h | 4 +-
+ arch/mips/include/asm/irq_regs.h | 10 +
+ .../asm/mach-cavium-octeon/kernel-entry-init.h | 2 +-
+ .../include/asm/mach-generic/kernel-entry-init.h | 2 +-
+ arch/mips/include/asm/mach-ip27/irq.h | 2 +-
+ .../mips/include/asm/mach-ip27/kernel-entry-init.h | 2 +-
+ arch/mips/include/asm/mach-jz4740/gpio.h | 2 +-
+ arch/mips/include/asm/mips-cm.h | 2 +-
+ arch/mips/include/asm/mips-r2-to-r6-emul.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-bootinfo.h | 16 +-
+ arch/mips/include/asm/octeon/cvmx-ciu3-defs.h | 353 +++++++++++
+ arch/mips/include/asm/octeon/cvmx-config.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-coremask.h | 89 +++
+ arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1 +
+ arch/mips/include/asm/octeon/cvmx-mio-defs.h | 410 ++++++++++++-
+ arch/mips/include/asm/octeon/cvmx-sysinfo.h | 37 +-
+ arch/mips/include/asm/octeon/cvmx.h | 29 +-
+ arch/mips/include/asm/octeon/octeon-feature.h | 19 +-
+ arch/mips/include/asm/octeon/octeon-model.h | 5 +
+ arch/mips/include/asm/octeon/octeon.h | 25 +
+ arch/mips/include/asm/pci/bridge.h | 18 +-
+ arch/mips/include/asm/sgi/hpc3.h | 2 +-
+ arch/mips/include/asm/sgiarcs.h | 4 +-
+ arch/mips/include/asm/sn/ioc3.h | 2 +-
+ arch/mips/include/asm/sn/sn0/hubio.h | 2 +-
+ arch/mips/include/asm/uaccess.h | 2 +-
+ arch/mips/kernel/cpu-probe.c | 2 +
+ arch/mips/kernel/mips-cm.c | 2 +-
+ arch/mips/kernel/mips-r2-to-r6-emul.c | 12 +-
+ arch/mips/kernel/perf_event_mipsxx.c | 2 +-
+ arch/mips/kernel/pm-cps.c | 2 +-
+ arch/mips/kernel/process.c | 2 +-
+ arch/mips/kernel/traps.c | 20 +-
+ arch/mips/kvm/tlb.c | 2 +-
+ arch/mips/kvm/trap_emul.c | 2 +-
+ arch/mips/lantiq/xway/reset.c | 2 +-
+ arch/mips/loongson64/loongson-3/smp.c | 1 -
+ arch/mips/math-emu/ieee754dp.c | 6 +-
+ arch/mips/math-emu/ieee754sp.c | 6 +-
+ arch/mips/mm/sc-ip22.c | 2 +-
+ arch/mips/mm/tlb-r4k.c | 5 +
+ arch/mips/mm/tlbex.c | 2 +-
+ arch/mips/pmcs-msp71xx/msp_setup.c | 2 +-
+ arch/mips/ralink/reset.c | 2 +-
+ arch/mips/sgi-ip27/ip27-memory.c | 2 +-
+ arch/mips/vr41xx/common/pmu.c | 2 +-
+ drivers/firmware/broadcom/Kconfig | 11 +
+ drivers/firmware/broadcom/Makefile | 1 +
+ .../firmware/broadcom/bcm47xx_sprom.c | 27 +-
+ include/linux/bcm47xx_sprom.h | 24 +
+ 73 files changed, 2157 insertions(+), 325 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu3.txt
+ create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu3-defs.h
+ create mode 100644 arch/mips/include/asm/octeon/cvmx-coremask.h
+ rename arch/mips/bcm47xx/sprom.c => drivers/firmware/broadcom/bcm47xx_sprom.c (98%)
+ create mode 100644 include/linux/bcm47xx_sprom.h
+Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
+$ git merge nios2/for-next
+Already up-to-date.
+Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (ee3b93ebfbed powerpc/mm: Move hash64 tlbflush code into a new header)
+$ git merge powerpc/next
+Auto-merging mm/huge_memory.c
+Removing arch/powerpc/platforms/powernv/pci-p5ioc2.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/powerpc/include/asm/book3s/64/mmu-hash.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 16 +-
+ arch/powerpc/Kconfig | 2 +-
+ arch/powerpc/boot/rs6000.h | 2 +-
+ arch/powerpc/boot/treeboot-akebono.c | 2 +-
+ arch/powerpc/boot/treeboot-currituck.c | 2 +-
+ arch/powerpc/boot/treeboot-iss4xx.c | 2 +-
+ arch/powerpc/configs/powernv_defconfig | 313 +++++++++++++++++++
+ arch/powerpc/crypto/aes-spe-core.S | 4 +-
+ arch/powerpc/crypto/aes-spe-glue.c | 2 +-
+ arch/powerpc/include/asm/atomic.h | 159 ++++++----
+ .../asm/{mmu-hash32.h => book3s/32/mmu-hash.h} | 0
+ arch/powerpc/include/asm/book3s/64/hash-4k.h | 36 +--
+ arch/powerpc/include/asm/book3s/64/hash-64k.h | 57 ++--
+ arch/powerpc/include/asm/book3s/64/hash.h | 68 ++--
+ .../asm/{mmu-hash64.h => book3s/64/mmu-hash.h} | 4 +
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 36 ++-
+ arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 94 ++++++
+ arch/powerpc/include/asm/cmpxchg.h | 237 ++++++++++----
+ arch/powerpc/include/asm/cputable.h | 20 +-
+ arch/powerpc/include/asm/hugetlb.h | 2 +-
+ arch/powerpc/include/asm/hydra.h | 2 +-
+ arch/powerpc/include/asm/io.h | 2 +-
+ arch/powerpc/include/asm/machdep.h | 6 +-
+ arch/powerpc/include/asm/mmu.h | 5 +-
+ arch/powerpc/include/asm/module.h | 2 +-
+ arch/powerpc/include/asm/nohash/64/pgtable.h | 3 +
+ arch/powerpc/include/asm/opal.h | 3 +
+ arch/powerpc/include/asm/page.h | 111 +------
+ arch/powerpc/include/asm/pci-bridge.h | 7 +-
+ arch/powerpc/include/asm/pgalloc-64.h | 42 ++-
+ arch/powerpc/include/asm/pgtable-types.h | 103 ++++++
+ arch/powerpc/include/asm/pmac_feature.h | 2 +-
+ arch/powerpc/include/asm/processor.h | 2 +
+ arch/powerpc/include/asm/reg.h | 16 +-
+ arch/powerpc/include/asm/reg_booke.h | 2 +-
+ arch/powerpc/include/asm/smu.h | 2 +-
+ arch/powerpc/include/asm/switch_to.h | 13 +-
+ arch/powerpc/include/asm/tlbflush.h | 92 +-----
+ arch/powerpc/include/asm/uninorth.h | 2 +-
+ arch/powerpc/include/asm/xics.h | 2 +-
+ arch/powerpc/include/uapi/asm/epapr_hcalls.h | 4 +-
+ arch/powerpc/kernel/asm-offsets.c | 2 +
+ arch/powerpc/kernel/cpu_setup_power.S | 49 ++-
+ arch/powerpc/kernel/cputable.c | 27 ++
+ arch/powerpc/kernel/eeh.c | 2 +-
+ arch/powerpc/kernel/entry_64.S | 21 +-
+ arch/powerpc/kernel/fpu.S | 25 +-
+ arch/powerpc/kernel/head_44x.S | 2 +-
+ arch/powerpc/kernel/idle_power7.S | 2 +-
+ arch/powerpc/kernel/kgdb.c | 4 +
+ arch/powerpc/kernel/mce_power.c | 17 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 4 -
+ arch/powerpc/kernel/process.c | 168 +++++++++-
+ arch/powerpc/kernel/signal.c | 4 +-
+ arch/powerpc/kernel/signal.h | 2 +-
+ arch/powerpc/kernel/traps.c | 12 +-
+ arch/powerpc/kernel/vector.S | 45 +--
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 2 +-
+ arch/powerpc/kvm/book3s_64_mmu.c | 2 +-
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +-
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +-
+ arch/powerpc/kvm/book3s_64_vio.c | 2 +-
+ arch/powerpc/kvm/book3s_64_vio_hv.c | 2 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 2 +-
+ arch/powerpc/kvm/book3s_xics.c | 2 +-
+ arch/powerpc/kvm/booke.c | 2 +-
+ arch/powerpc/kvm/e500mc.c | 2 +-
+ arch/powerpc/mm/hash64_4k.c | 4 +-
+ arch/powerpc/mm/hash64_64k.c | 7 +-
+ arch/powerpc/mm/hash_utils_64.c | 87 ++++--
+ arch/powerpc/mm/hugetlbpage-hash64.c | 5 +-
+ arch/powerpc/mm/hugetlbpage.c | 3 +-
+ arch/powerpc/mm/init_64.c | 68 ++--
+ arch/powerpc/mm/mem.c | 10 +-
+ arch/powerpc/mm/mmu_decl.h | 3 +-
+ arch/powerpc/mm/pgtable_64.c | 11 +-
+ arch/powerpc/mm/tlb_low_64e.S | 2 +-
+ arch/powerpc/mm/tlb_nohash_low.S | 4 +-
+ arch/powerpc/oprofile/op_model_cell.c | 4 +-
+ arch/powerpc/perf/hv-24x7.h | 2 +-
+ arch/powerpc/perf/hv-gpci.c | 43 +--
+ arch/powerpc/perf/power8-pmu.c | 2 +-
+ arch/powerpc/platforms/52xx/mpc52xx_pci.c | 2 +-
+ arch/powerpc/platforms/85xx/mpc85xx_cds.c | 2 +-
+ arch/powerpc/platforms/powermac/cache.S | 2 +-
+ arch/powerpc/platforms/powermac/feature.c | 6 +-
+ arch/powerpc/platforms/powernv/Makefile | 2 +-
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 60 ++--
+ arch/powerpc/platforms/powernv/idle.c | 6 +-
+ arch/powerpc/platforms/powernv/npu-dma.c | 2 +-
+ arch/powerpc/platforms/powernv/opal-msglog.c | 34 +-
+ arch/powerpc/platforms/powernv/opal.c | 7 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 347 +++++++++++----------
+ arch/powerpc/platforms/powernv/pci-p5ioc2.c | 271 ----------------
+ arch/powerpc/platforms/powernv/pci.c | 17 +-
+ arch/powerpc/platforms/powernv/pci.h | 152 +++++----
+ arch/powerpc/platforms/powernv/subcore.c | 2 +-
+ arch/powerpc/platforms/ps3/gelic_udbg.c | 72 ++---
+ arch/powerpc/platforms/ps3/interrupt.c | 2 +-
+ arch/powerpc/platforms/pseries/hvconsole.c | 2 +-
+ arch/powerpc/platforms/pseries/lpar.c | 9 +-
+ arch/powerpc/platforms/pseries/setup.c | 2 +-
+ arch/powerpc/sysdev/fsl_pci.c | 2 +-
+ arch/powerpc/sysdev/fsl_rmu.c | 2 +-
+ arch/powerpc/sysdev/i8259.c | 2 +-
+ arch/powerpc/sysdev/mpic.c | 4 +-
+ arch/powerpc/xmon/xmon.c | 120 ++++++-
+ include/linux/atomic.h | 10 +
+ include/linux/bug.h | 9 +
+ include/linux/huge_mm.h | 3 -
+ mm/huge_memory.c | 17 +-
+ tools/testing/selftests/powerpc/Makefile | 5 +-
+ tools/testing/selftests/powerpc/basic_asm.h | 70 +++++
+ tools/testing/selftests/powerpc/math/.gitignore | 6 +
+ tools/testing/selftests/powerpc/math/Makefile | 19 ++
+ tools/testing/selftests/powerpc/math/fpu_asm.S | 198 ++++++++++++
+ tools/testing/selftests/powerpc/math/fpu_preempt.c | 113 +++++++
+ tools/testing/selftests/powerpc/math/fpu_signal.c | 135 ++++++++
+ tools/testing/selftests/powerpc/math/fpu_syscall.c | 90 ++++++
+ tools/testing/selftests/powerpc/math/vmx_asm.S | 235 ++++++++++++++
+ tools/testing/selftests/powerpc/math/vmx_preempt.c | 112 +++++++
+ tools/testing/selftests/powerpc/math/vmx_signal.c | 156 +++++++++
+ tools/testing/selftests/powerpc/math/vmx_syscall.c | 91 ++++++
+ .../selftests/powerpc/tm/tm-signal-msr-resv.c | 2 +-
+ 125 files changed, 3222 insertions(+), 1322 deletions(-)
+ create mode 100644 arch/powerpc/configs/powernv_defconfig
+ rename arch/powerpc/include/asm/{mmu-hash32.h => book3s/32/mmu-hash.h} (100%)
+ rename arch/powerpc/include/asm/{mmu-hash64.h => book3s/64/mmu-hash.h} (99%)
+ create mode 100644 arch/powerpc/include/asm/book3s/64/tlbflush-hash.h
+ create mode 100644 arch/powerpc/include/asm/pgtable-types.h
+ delete mode 100644 arch/powerpc/platforms/powernv/pci-p5ioc2.c
+ create mode 100644 tools/testing/selftests/powerpc/basic_asm.h
+ create mode 100644 tools/testing/selftests/powerpc/math/.gitignore
+ create mode 100644 tools/testing/selftests/powerpc/math/Makefile
+ create mode 100644 tools/testing/selftests/powerpc/math/fpu_asm.S
+ create mode 100644 tools/testing/selftests/powerpc/math/fpu_preempt.c
+ create mode 100644 tools/testing/selftests/powerpc/math/fpu_signal.c
+ create mode 100644 tools/testing/selftests/powerpc/math/fpu_syscall.c
+ create mode 100644 tools/testing/selftests/powerpc/math/vmx_asm.S
+ create mode 100644 tools/testing/selftests/powerpc/math/vmx_preempt.c
+ create mode 100644 tools/testing/selftests/powerpc/math/vmx_signal.c
+ create mode 100644 tools/testing/selftests/powerpc/math/vmx_syscall.c
+Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
+$ git merge powerpc-mpe/next
+Already up-to-date.
+Merging fsl/next (ea6370d23c91 powerpc/fsl: Update fman dt binding with pcs-phy and tbi-phy)
+$ git merge fsl/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/powerpc/fsl/fman.txt | 40 +++
+ Documentation/devicetree/bindings/soc/fsl/rcpm.txt | 63 ++++
+ arch/powerpc/Kconfig | 2 +-
+ arch/powerpc/include/asm/cacheflush.h | 2 -
+ arch/powerpc/include/asm/checksum.h | 62 +++-
+ arch/powerpc/include/asm/cputable.h | 8 +
+ arch/powerpc/include/asm/cputhreads.h | 15 +
+ arch/powerpc/include/asm/fsl_pm.h | 51 +++
+ arch/powerpc/include/asm/smp.h | 4 +
+ arch/powerpc/kernel/asm-offsets.c | 1 +
+ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 112 ++++++
+ arch/powerpc/kernel/cputable.c | 4 +
+ arch/powerpc/kernel/head_64.S | 97 +++++
+ arch/powerpc/kernel/head_fsl_booke.S | 74 ----
+ arch/powerpc/kernel/smp.c | 7 +-
+ arch/powerpc/lib/Makefile | 3 +-
+ arch/powerpc/lib/checksum_32.S | 394 +++++++++++++--------
+ arch/powerpc/lib/checksum_64.S | 27 --
+ ...{checksum_wrappers_64.c => checksum_wrappers.c} | 0
+ arch/powerpc/lib/ppc_ksyms.c | 2 -
+ arch/powerpc/mm/tlb_nohash.c | 4 +-
+ arch/powerpc/platforms/85xx/Kconfig | 1 +
+ arch/powerpc/platforms/85xx/Makefile | 1 +
+ arch/powerpc/platforms/85xx/common.c | 3 +
+ arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c | 106 ++++++
+ arch/powerpc/platforms/85xx/smp.c | 312 ++++++++--------
+ arch/powerpc/platforms/85xx/smp.h | 1 +
+ arch/powerpc/sysdev/Kconfig | 5 +
+ arch/powerpc/sysdev/Makefile | 1 +
+ arch/powerpc/sysdev/fsl_rcpm.c | 385 ++++++++++++++++++++
+ include/linux/fsl/guts.h | 105 ++++++
+ 31 files changed, 1451 insertions(+), 441 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/soc/fsl/rcpm.txt
+ create mode 100644 arch/powerpc/include/asm/fsl_pm.h
+ rename arch/powerpc/lib/{checksum_wrappers_64.c => checksum_wrappers.c} (100%)
+ create mode 100644 arch/powerpc/platforms/85xx/mpc85xx_pm_ops.c
+ create mode 100644 arch/powerpc/sysdev/fsl_rcpm.c
+Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging s390/features (988b86e69ded s390/pci: add ioctl interface for CLP)
+$ git merge s390/features
+Removing arch/s390/oprofile/backtrace.c
+Merge made by the 'recursive' strategy.
+ arch/s390/Kconfig | 8 +-
+ arch/s390/include/asm/clp.h | 27 ++++
+ arch/s390/include/asm/pci.h | 3 +-
+ arch/s390/include/asm/pci_clp.h | 30 +---
+ arch/s390/include/asm/percpu.h | 1 -
+ arch/s390/include/asm/pgtable.h | 35 ++---
+ arch/s390/include/asm/processor.h | 12 ++
+ arch/s390/include/asm/setup.h | 2 +
+ arch/s390/include/asm/xor.h | 21 ++-
+ arch/s390/include/uapi/asm/clp.h | 28 ++++
+ arch/s390/kernel/cpcmd.c | 3 +-
+ arch/s390/kernel/debug.c | 6 +-
+ arch/s390/kernel/dis.c | 17 +-
+ arch/s390/kernel/dumpstack.c | 93 +++++------
+ arch/s390/kernel/entry.S | 1 +
+ arch/s390/kernel/irq.c | 3 +-
+ arch/s390/kernel/perf_cpum_sf.c | 9 +-
+ arch/s390/kernel/perf_event.c | 56 +------
+ arch/s390/kernel/setup.c | 1 +
+ arch/s390/kernel/stacktrace.c | 93 +++--------
+ arch/s390/kernel/time.c | 6 +-
+ arch/s390/kernel/traps.c | 21 +--
+ arch/s390/lib/Makefile | 2 +-
+ arch/s390/lib/xor.c | 134 ++++++++++++++++
+ arch/s390/mm/extmem.c | 16 +-
+ arch/s390/mm/fault.c | 15 +-
+ arch/s390/mm/pageattr.c | 8 +-
+ arch/s390/mm/pgtable.c | 17 --
+ arch/s390/oprofile/Makefile | 2 +-
+ arch/s390/oprofile/backtrace.c | 78 ----------
+ arch/s390/oprofile/init.c | 21 ++-
+ arch/s390/pci/pci.c | 6 +-
+ arch/s390/pci/pci_clp.c | 247 +++++++++++++++++++++++++++--
+ arch/s390/pci/pci_debug.c | 5 +-
+ arch/s390/pci/pci_dma.c | 21 +--
+ arch/s390/pci/pci_event.c | 13 +-
+ drivers/pci/hotplug/s390_pci_hpc.c | 8 +-
+ drivers/s390/block/dasd_alias.c | 290 ++++++++++++++++++++--------------
+ drivers/s390/block/dasd_devmap.c | 10 +-
+ drivers/s390/block/dasd_diag.c | 69 ++++----
+ drivers/s390/block/dasd_eckd.c | 311 +++++++++++++++++--------------------
+ drivers/s390/block/dasd_fba.c | 28 ++--
+ drivers/s390/block/dasd_genhd.c | 4 +-
+ drivers/s390/block/dasd_int.h | 9 +-
+ drivers/s390/block/dasd_ioctl.c | 38 +----
+ drivers/s390/block/dasd_proc.c | 5 +-
+ drivers/s390/block/dcssblk.c | 13 +-
+ drivers/s390/char/monreader.c | 10 +-
+ drivers/s390/char/sclp_cmd.c | 27 ++--
+ drivers/s390/char/sclp_cpi_sys.c | 6 +-
+ drivers/s390/char/tape_core.c | 4 +-
+ drivers/s390/char/vmlogrdr.c | 6 +-
+ drivers/s390/cio/blacklist.c | 9 +-
+ drivers/s390/cio/ccwreq.c | 13 +-
+ drivers/s390/cio/cio.c | 2 +-
+ drivers/s390/cio/device.c | 23 ++-
+ drivers/s390/net/lcs.c | 4 +-
+ drivers/s390/net/qeth_l3_main.c | 2 +-
+ 58 files changed, 1091 insertions(+), 861 deletions(-)
+ create mode 100644 arch/s390/include/uapi/asm/clp.h
+ create mode 100644 arch/s390/lib/xor.c
+ delete mode 100644 arch/s390/oprofile/backtrace.c
+Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (1edbdfe03982 tile: Fix misspellings in comments.)
+$ git merge tile/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 4 ++--
+ arch/tile/include/hv/drv_mpipe_intf.h | 26 +++++++++++++-------------
+ arch/tile/kernel/kgdb.c | 12 ++++++------
+ arch/tile/kernel/pci_gx.c | 2 +-
+ 4 files changed, 22 insertions(+), 22 deletions(-)
+Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
+$ git merge uml/linux-next
+Already up-to-date.
+Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
+$ git merge xtensa/for_next
+Auto-merging arch/xtensa/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Kconfig | 16 +++++++++
+ arch/xtensa/include/asm/io.h | 16 +++++++--
+ arch/xtensa/include/asm/processor.h | 12 +++----
+ arch/xtensa/include/asm/timex.h | 9 ++---
+ arch/xtensa/kernel/traps.c | 27 +++++++++++++++
+ arch/xtensa/mm/Makefile | 2 +-
+ arch/xtensa/mm/ioremap.c | 68 +++++++++++++++++++++++++++++++++++++
+ 7 files changed, 133 insertions(+), 17 deletions(-)
+ create mode 100644 arch/xtensa/mm/ioremap.c
+Merging btrfs/next (5e33a2bd7ca7 Btrfs: do not collect ordered extents when logging that inode exists)
+$ git merge btrfs/next
+Auto-merging fs/btrfs/root-tree.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/btrfs.txt | 19 +-
+ fs/btrfs/backref.c | 12 +-
+ fs/btrfs/ctree.c | 36 ++--
+ fs/btrfs/ctree.h | 69 +++++--
+ fs/btrfs/delayed-inode.c | 3 +-
+ fs/btrfs/delayed-ref.c | 12 +-
+ fs/btrfs/dev-replace.c | 132 +++++++------
+ fs/btrfs/dev-replace.h | 7 +-
+ fs/btrfs/disk-io.c | 68 ++++---
+ fs/btrfs/extent-tree.c | 38 ++--
+ fs/btrfs/extent_io.c | 40 ++--
+ fs/btrfs/extent_io.h | 5 +-
+ fs/btrfs/extent_map.c | 3 +-
+ fs/btrfs/file-item.c | 92 ++++++----
+ fs/btrfs/file.c | 155 +++++++++-------
+ fs/btrfs/inode.c | 326 +++++++++++++++++++++++----------
+ fs/btrfs/ioctl.c | 34 ++--
+ fs/btrfs/ordered-data.c | 3 +-
+ fs/btrfs/print-tree.c | 23 ++-
+ fs/btrfs/reada.c | 268 +++++++++++++--------------
+ fs/btrfs/root-tree.c | 2 +-
+ fs/btrfs/scrub.c | 30 +--
+ fs/btrfs/send.c | 36 ++--
+ fs/btrfs/super.c | 48 ++++-
+ fs/btrfs/tests/btrfs-tests.c | 6 -
+ fs/btrfs/tests/free-space-tree-tests.c | 1 +
+ fs/btrfs/transaction.c | 13 +-
+ fs/btrfs/tree-log.c | 99 ++++++++--
+ fs/btrfs/tree-log.h | 2 +
+ fs/btrfs/volumes.c | 47 ++---
+ fs/btrfs/xattr.c | 67 ++++---
+ 31 files changed, 1046 insertions(+), 650 deletions(-)
+Merging btrfs-kdave/for-next (a3116483930c Merge branch 'for-next-4.6-20160229' into for-next-20160229)
+$ git merge btrfs-kdave/for-next
+Auto-merging fs/btrfs/ioctl.c
+Merge made by the 'recursive' strategy.
+ fs/btrfs/dev-replace.c | 28 +---
+ fs/btrfs/ioctl.c | 58 +++++++-
+ fs/btrfs/volumes.c | 321 ++++++++++++++++++++++-----------------------
+ fs/btrfs/volumes.h | 7 +-
+ include/uapi/linux/btrfs.h | 15 ++-
+ 5 files changed, 232 insertions(+), 197 deletions(-)
+Merging ceph/master (cd8140c673d9 libceph: don't spam dmesg with stray reply warnings)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (f983cd32cd5d Merge branch 'parisc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
+$ git merge cifs/for-next
+Already up-to-date.
+Merging configfs/for-next (1ae1602de028 configfs: switch ->default groups to a linked list)
+$ git merge configfs/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/configfs/configfs.txt | 11 +-
+ drivers/infiniband/core/cma_configfs.c | 31 ++--
+ drivers/target/iscsi/iscsi_target_configfs.c | 75 +++------
+ drivers/target/target_core_configfs.c | 203 +++++-------------------
+ drivers/target/target_core_fabric_configfs.c | 194 ++++++----------------
+ drivers/target/target_core_internal.h | 1 -
+ drivers/target/target_core_stat.c | 41 ++---
+ drivers/usb/gadget/configfs.c | 36 ++---
+ drivers/usb/gadget/function/f_mass_storage.c | 6 +-
+ drivers/usb/gadget/function/f_rndis.c | 5 +-
+ drivers/usb/gadget/function/uvc_configfs.c | 198 +++++++++--------------
+ fs/configfs/dir.c | 44 +++--
+ fs/configfs/inode.c | 8 +-
+ fs/configfs/item.c | 1 +
+ fs/dlm/config.c | 38 +----
+ fs/ocfs2/cluster/nodemanager.c | 22 +--
+ include/linux/configfs.h | 11 +-
+ include/target/target_core_base.h | 3 -
+ 18 files changed, 291 insertions(+), 637 deletions(-)
+Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/main.c
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/main.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Merging ext3/for_next (ab73ef46398e quota: Fix possible GPF due to uninitialised pointers)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext4/super.c | 4 +-
+ fs/ocfs2/ocfs2_trace.h | 2 +
+ fs/ocfs2/quota_global.c | 25 ++
+ fs/quota/dquot.c | 54 +++-
+ fs/quota/quota.c | 70 ++++-
+ fs/quota/quota_tree.c | 67 ++++-
+ fs/quota/quota_v2.c | 6 +
+ fs/reiserfs/super.c | 1 +
+ fs/udf/dir.c | 13 +-
+ fs/udf/namei.c | 29 +-
+ fs/udf/super.c | 38 +--
+ fs/udf/udfdecl.h | 21 +-
+ fs/udf/unicode.c | 630 ++++++++++++++++-------------------------
+ fs/xfs/libxfs/xfs_quota_defs.h | 3 +-
+ fs/xfs/xfs_dquot.c | 129 ++++++++-
+ fs/xfs/xfs_file.c | 82 ++++--
+ fs/xfs/xfs_inode.h | 2 +
+ fs/xfs/xfs_qm.c | 55 +++-
+ fs/xfs/xfs_qm.h | 48 +++-
+ fs/xfs/xfs_qm_syscalls.c | 27 +-
+ fs/xfs/xfs_quotaops.c | 36 ++-
+ fs/xfs/xfs_trans_dquot.c | 15 +-
+ include/linux/dqblk_qtree.h | 2 +
+ include/linux/quota.h | 5 +
+ include/linux/quotaops.h | 3 +
+ include/uapi/linux/dqblk_xfs.h | 1 +
+ include/uapi/linux/quota.h | 14 +
+ 27 files changed, 862 insertions(+), 520 deletions(-)
+Merging ext4/dev (d89b5f6318c2 jbd2: save some atomic ops in __JI_COMMIT_RUNNING handling)
+$ git merge ext4/dev
+Auto-merging fs/ext4/super.c
+Merge made by the 'recursive' strategy.
+ fs/ext2/ext2.h | 3 +
+ fs/ext2/super.c | 25 +-
+ fs/ext2/xattr.c | 139 +++---
+ fs/ext2/xattr.h | 21 +-
+ fs/ext4/extents.c | 4 +-
+ fs/ext4/ialloc.c | 10 +
+ fs/ext4/mballoc.c | 32 +-
+ fs/ext4/move_extent.c | 1 +
+ fs/ext4/super.c | 19 +-
+ fs/ext4/xattr.c | 166 ++++---
+ fs/ext4/xattr.h | 3 +-
+ fs/jbd2/commit.c | 49 +--
+ fs/jbd2/journal.c | 26 +-
+ fs/jbd2/recovery.c | 31 +-
+ fs/jbd2/revoke.c | 60 +--
+ fs/mbcache.c | 1093 +++++++++++++++--------------------------------
+ include/linux/jbd2.h | 16 +-
+ include/linux/mbcache.h | 93 ++--
+ 18 files changed, 670 insertions(+), 1121 deletions(-)
+Merging f2fs/dev (836b158ba9f2 f2fs crypto: sync ext4_lookup and ext4_file_open)
+$ git merge f2fs/dev
+Auto-merging include/linux/dcache.h
+Removing fs/f2fs/f2fs_crypto.h
+Removing fs/f2fs/crypto_policy.c
+Removing fs/f2fs/crypto_key.c
+Removing fs/f2fs/crypto.c
+Auto-merging fs/crypto/fname.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 14 +
+ fs/Kconfig | 2 +
+ fs/Makefile | 1 +
+ fs/crypto/Kconfig | 18 +
+ fs/crypto/Makefile | 3 +
+ fs/crypto/crypto.c | 556 +++++++++++++++++++++++++++++
+ fs/{f2fs/crypto_fname.c => crypto/fname.c} | 245 ++++++-------
+ fs/crypto/keyinfo.c | 278 +++++++++++++++
+ fs/crypto/policy.c | 229 ++++++++++++
+ fs/f2fs/Kconfig | 10 +-
+ fs/f2fs/Makefile | 2 -
+ fs/f2fs/checkpoint.c | 71 ++--
+ fs/f2fs/crypto.c | 491 -------------------------
+ fs/f2fs/crypto_key.c | 254 -------------
+ fs/f2fs/crypto_policy.c | 209 -----------
+ fs/f2fs/data.c | 428 +++++++++++-----------
+ fs/f2fs/dir.c | 72 ++--
+ fs/f2fs/extent_cache.c | 176 ++++-----
+ fs/f2fs/f2fs.h | 267 +++++---------
+ fs/f2fs/f2fs_crypto.h | 151 --------
+ fs/f2fs/file.c | 114 +++---
+ fs/f2fs/gc.c | 245 +++++++------
+ fs/f2fs/inline.c | 43 +--
+ fs/f2fs/inode.c | 15 +-
+ fs/f2fs/namei.c | 166 +++++----
+ fs/f2fs/node.c | 212 ++++++++---
+ fs/f2fs/node.h | 26 +-
+ fs/f2fs/recovery.c | 14 +-
+ fs/f2fs/segment.c | 386 ++++++++++++--------
+ fs/f2fs/segment.h | 5 +-
+ fs/f2fs/super.c | 191 ++++++----
+ fs/f2fs/trace.c | 6 +-
+ fs/f2fs/xattr.c | 6 +-
+ include/linux/dcache.h | 2 +
+ include/linux/f2fs_fs.h | 34 +-
+ include/linux/fs.h | 8 +
+ include/linux/fscrypto.h | 433 ++++++++++++++++++++++
+ include/trace/events/f2fs.h | 12 +-
+ include/uapi/linux/fs.h | 18 +
+ 39 files changed, 3088 insertions(+), 2325 deletions(-)
+ create mode 100644 fs/crypto/Kconfig
+ create mode 100644 fs/crypto/Makefile
+ create mode 100644 fs/crypto/crypto.c
+ rename fs/{f2fs/crypto_fname.c => crypto/fname.c} (60%)
+ create mode 100644 fs/crypto/keyinfo.c
+ create mode 100644 fs/crypto/policy.c
+ delete mode 100644 fs/f2fs/crypto.c
+ delete mode 100644 fs/f2fs/crypto_key.c
+ delete mode 100644 fs/f2fs/crypto_policy.c
+ delete mode 100644 fs/f2fs/f2fs_crypto.h
+ create mode 100644 include/linux/fscrypto.h
+Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
+$ git merge fscache/fscache
+Merge made by the 'recursive' strategy.
+Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/for-next (a63be4e6d0e9 GFS2: Eliminate parameter non_block on gfs2_inode_lookup)
+$ git merge gfs2/for-next
+Auto-merging fs/gfs2/inode.c
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 2 +-
+ fs/gfs2/dir.c | 6 ++---
+ fs/gfs2/export.c | 2 +-
+ fs/gfs2/glock.c | 10 +++++++-
+ fs/gfs2/incore.h | 1 +
+ fs/gfs2/inode.c | 71 +++++++++-------------------------------------------
+ fs/gfs2/inode.h | 5 ++--
+ fs/gfs2/ops_fstype.c | 2 +-
+ fs/gfs2/super.c | 26 +++++++++++--------
+ 9 files changed, 46 insertions(+), 79 deletions(-)
+Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging nfs/linux-next (ecf782868399 Merge branch 'multipath')
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/callback.h | 3 +-
+ fs/nfs/callback_proc.c | 69 ++---
+ fs/nfs/callback_xdr.c | 12 +-
+ fs/nfs/nfs4proc.c | 63 ++++-
+ fs/nfs/nfs4session.c | 54 +++-
+ fs/nfs/nfs4session.h | 8 +
+ fs/nfs/pnfs_nfs.c | 16 +-
+ include/linux/sunrpc/clnt.h | 18 +-
+ include/linux/sunrpc/sched.h | 32 +--
+ include/linux/sunrpc/xprt.h | 22 +-
+ include/linux/sunrpc/xprtmultipath.h | 69 +++++
+ net/sunrpc/Makefile | 3 +-
+ net/sunrpc/auth_gss/auth_gss.c | 4 +-
+ net/sunrpc/clnt.c | 328 ++++++++++++++++++------
+ net/sunrpc/rpcb_clnt.c | 10 +-
+ net/sunrpc/sched.c | 2 +
+ net/sunrpc/xprt.c | 42 ++--
+ net/sunrpc/xprtmultipath.c | 475 +++++++++++++++++++++++++++++++++++
+ net/sunrpc/xprtsock.c | 4 +-
+ 19 files changed, 1049 insertions(+), 185 deletions(-)
+ create mode 100644 include/linux/sunrpc/xprtmultipath.h
+ create mode 100644 net/sunrpc/xprtmultipath.c
+Merging nfsd/nfsd-next (9e01cf8c39f6 nfsd: add SCSI layout support)
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfs/blocklayout/extent_tree.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/nfs/pnfs-scsi-server.txt | 22 +
+ fs/nfs/blocklayout/blocklayout.c | 59 ++-
+ fs/nfs/blocklayout/blocklayout.h | 14 +-
+ fs/nfs/blocklayout/dev.c | 144 ++++++-
+ fs/nfs/blocklayout/extent_tree.c | 44 +-
+ fs/nfs/blocklayout/rpc_pipefs.c | 2 +-
+ fs/nfsd/Kconfig | 26 +-
+ fs/nfsd/Makefile | 4 +-
+ fs/nfsd/blocklayout.c | 298 ++++++++++++--
+ fs/nfsd/blocklayoutxdr.c | 65 ++-
+ fs/nfsd/blocklayoutxdr.h | 14 +
+ fs/nfsd/nfs4layouts.c | 31 +-
+ fs/nfsd/nfs4proc.c | 9 +-
+ fs/nfsd/nfs4state.c | 29 +-
+ fs/nfsd/nfs4xdr.c | 15 +-
+ fs/nfsd/pnfs.h | 8 +
+ fs/xfs/Makefile | 3 +-
+ fs/xfs/xfs_export.c | 2 +-
+ fs/xfs/xfs_pnfs.h | 2 +-
+ include/linux/nfs4.h | 19 +
+ include/linux/sunrpc/auth.h | 7 +
+ include/linux/sunrpc/rpc_rdma.h | 1 +
+ include/linux/sunrpc/svc_rdma.h | 20 +-
+ net/sunrpc/auth_null.c | 4 +-
+ net/sunrpc/auth_unix.c | 6 +-
+ net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 17 +-
+ net/sunrpc/xprtrdma/svc_rdma_marshal.c | 64 ++-
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 60 ++-
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 196 ++++++---
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 445 +++++++--------------
+ 30 files changed, 1087 insertions(+), 543 deletions(-)
+ create mode 100644 Documentation/filesystems/nfs/pnfs-scsi-server.txt
+Merging orangefs/for-next (9d9e7ba9ee8f Orangefs: improve gossip statements)
+$ git merge orangefs/for-next
+Auto-merging fs/Makefile
+Auto-merging fs/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++
+ Documentation/filesystems/orangefs.txt | 406 +++++++
+ MAINTAINERS | 8 +
+ fs/Kconfig | 1 +
+ fs/Makefile | 1 +
+ fs/orangefs/Kconfig | 6 +
+ fs/orangefs/Makefile | 10 +
+ fs/orangefs/acl.c | 175 +++
+ fs/orangefs/dcache.c | 139 +++
+ fs/orangefs/devorangefs-req.c | 925 +++++++++++++++
+ fs/orangefs/dir.c | 429 +++++++
+ fs/orangefs/downcall.h | 133 +++
+ fs/orangefs/file.c | 690 +++++++++++
+ fs/orangefs/inode.c | 487 ++++++++
+ fs/orangefs/namei.c | 459 +++++++
+ fs/orangefs/orangefs-bufmap.c | 569 +++++++++
+ fs/orangefs/orangefs-bufmap.h | 47 +
+ fs/orangefs/orangefs-cache.c | 161 +++
+ fs/orangefs/orangefs-debug.h | 92 ++
+ fs/orangefs/orangefs-debugfs.c | 457 +++++++
+ fs/orangefs/orangefs-debugfs.h | 3 +
+ fs/orangefs/orangefs-dev-proto.h | 62 +
+ fs/orangefs/orangefs-kernel.h | 665 +++++++++++
+ fs/orangefs/orangefs-mod.c | 277 +++++
+ fs/orangefs/orangefs-sysfs.c | 1773 ++++++++++++++++++++++++++++
+ fs/orangefs/orangefs-sysfs.h | 2 +
+ fs/orangefs/orangefs-utils.c | 1208 +++++++++++++++++++
+ fs/orangefs/protocol.h | 452 +++++++
+ fs/orangefs/super.c | 544 +++++++++
+ fs/orangefs/symlink.c | 32 +
+ fs/orangefs/upcall.h | 246 ++++
+ fs/orangefs/waitqueue.c | 357 ++++++
+ fs/orangefs/xattr.c | 540 +++++++++
+ 33 files changed, 11443 insertions(+)
+ create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs
+ create mode 100644 Documentation/filesystems/orangefs.txt
+ create mode 100644 fs/orangefs/Kconfig
+ create mode 100644 fs/orangefs/Makefile
+ create mode 100644 fs/orangefs/acl.c
+ create mode 100644 fs/orangefs/dcache.c
+ create mode 100644 fs/orangefs/devorangefs-req.c
+ create mode 100644 fs/orangefs/dir.c
+ create mode 100644 fs/orangefs/downcall.h
+ create mode 100644 fs/orangefs/file.c
+ create mode 100644 fs/orangefs/inode.c
+ create mode 100644 fs/orangefs/namei.c
+ create mode 100644 fs/orangefs/orangefs-bufmap.c
+ create mode 100644 fs/orangefs/orangefs-bufmap.h
+ create mode 100644 fs/orangefs/orangefs-cache.c
+ create mode 100644 fs/orangefs/orangefs-debug.h
+ create mode 100644 fs/orangefs/orangefs-debugfs.c
+ create mode 100644 fs/orangefs/orangefs-debugfs.h
+ create mode 100644 fs/orangefs/orangefs-dev-proto.h
+ create mode 100644 fs/orangefs/orangefs-kernel.h
+ create mode 100644 fs/orangefs/orangefs-mod.c
+ create mode 100644 fs/orangefs/orangefs-sysfs.c
+ create mode 100644 fs/orangefs/orangefs-sysfs.h
+ create mode 100644 fs/orangefs/orangefs-utils.c
+ create mode 100644 fs/orangefs/protocol.h
+ create mode 100644 fs/orangefs/super.c
+ create mode 100644 fs/orangefs/symlink.c
+ create mode 100644 fs/orangefs/upcall.h
+ create mode 100644 fs/orangefs/waitqueue.c
+ create mode 100644 fs/orangefs/xattr.c
+$ git am -3 ../patches/0001-orangfs-update-for-follow_link-to-get_link-change.patch
+Applying: orangfs: update for follow_link to get_link change
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/orangefs/symlink.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 856362eda37f] Merge remote-tracking branch 'orangefs/for-next'
+ Date: Tue Mar 8 10:11:56 2016 +1100
+Merging overlayfs/overlayfs-next (b81de061fa59 ovl: copy new uid/gid into overlayfs runtime inode)
+$ git merge overlayfs/overlayfs-next
+Merge made by the 'recursive' strategy.
+ fs/overlayfs/dir.c | 10 +++++++++-
+ fs/overlayfs/inode.c | 2 ++
+ fs/overlayfs/super.c | 13 ++++++++-----
+ 3 files changed, 19 insertions(+), 6 deletions(-)
+Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (e4f6daac2033 ubi: Fix out of bounds write in volume update code)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (3c1a79f5fff9 Merge branch 'xfs-misc-fixes-4.6-2' into for-next)
+$ git merge xfs/for-next
+Resolved 'fs/xfs/xfs_aops.c' using previous resolution.
+Auto-merging include/linux/fs.h
+Auto-merging fs/xfs/xfs_export.c
+Auto-merging fs/xfs/xfs_bmap_util.c
+Auto-merging fs/xfs/xfs_aops.h
+Auto-merging fs/xfs/xfs_aops.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
+Auto-merging fs/ocfs2/aops.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/direct-io.c
+Auto-merging fs/dax.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 095dabb209a0] Merge remote-tracking branch 'xfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/dax.c | 9 +-
+ fs/direct-io.c | 9 +-
+ fs/ext4/ext4.h | 30 +-
+ fs/ext4/inode.c | 24 +-
+ fs/ext4/page-io.c | 10 -
+ fs/ocfs2/aops.c | 7 +-
+ fs/xfs/libxfs/xfs_alloc_btree.c | 2 -
+ fs/xfs/libxfs/xfs_attr_sf.h | 16 -
+ fs/xfs/libxfs/xfs_bmap.c | 12 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c | 5 +-
+ fs/xfs/libxfs/xfs_btree.c | 32 +-
+ fs/xfs/libxfs/xfs_da_format.h | 16 +
+ fs/xfs/libxfs/xfs_dir2.c | 12 +-
+ fs/xfs/libxfs/xfs_ialloc_btree.c | 12 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 170 ++++---
+ fs/xfs/libxfs/xfs_inode_buf.h | 38 +-
+ fs/xfs/libxfs/xfs_inode_fork.c | 3 +-
+ fs/xfs/libxfs/xfs_log_format.h | 19 +-
+ fs/xfs/libxfs/xfs_rtbitmap.c | 32 +-
+ fs/xfs/libxfs/xfs_sb.h | 1 -
+ fs/xfs/libxfs/xfs_shared.h | 1 +
+ fs/xfs/xfs_aops.c | 1007 ++++++++++++++------------------------
+ fs/xfs/xfs_aops.h | 4 +-
+ fs/xfs/xfs_attr_list.c | 19 +-
+ fs/xfs/xfs_bmap_util.c | 8 +-
+ fs/xfs/xfs_buf.c | 2 +-
+ fs/xfs/xfs_buf.h | 26 +-
+ fs/xfs/xfs_buf_item.c | 10 +-
+ fs/xfs/xfs_dir2_readdir.c | 2 +-
+ fs/xfs/xfs_discard.c | 2 +-
+ fs/xfs/xfs_export.c | 2 +-
+ fs/xfs/xfs_file.c | 6 +-
+ fs/xfs/xfs_filestream.c | 4 +-
+ fs/xfs/xfs_fsops.h | 1 -
+ fs/xfs/xfs_icache.c | 43 +-
+ fs/xfs/xfs_inode.c | 174 +++----
+ fs/xfs/xfs_inode.h | 8 +-
+ fs/xfs/xfs_inode_item.c | 82 +++-
+ fs/xfs/xfs_ioctl.c | 121 ++++-
+ fs/xfs/xfs_iops.c | 59 +--
+ fs/xfs/xfs_itable.c | 22 +-
+ fs/xfs/xfs_log.c | 20 +-
+ fs/xfs/xfs_log_recover.c | 346 +++++++------
+ fs/xfs/xfs_mount.c | 24 +-
+ fs/xfs/xfs_mount.h | 6 +-
+ fs/xfs/xfs_rtalloc.c | 2 +-
+ fs/xfs/xfs_super.c | 525 +++++++++++---------
+ fs/xfs/xfs_super.h | 4 +-
+ fs/xfs/xfs_trace.h | 9 +-
+ fs/xfs/xfs_trans.h | 1 -
+ fs/xfs/xfs_trans_ail.c | 5 +-
+ fs/xfs/xfs_trans_buf.c | 10 +-
+ fs/xfs/xfs_trans_inode.c | 14 +-
+ include/linux/fs.h | 2 +-
+ 54 files changed, 1546 insertions(+), 1484 deletions(-)
+Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
+$ git merge file-locks/linux-next
+Already up-to-date.
+Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
+$ git merge vfs/for-next
+Merge made by the 'recursive' strategy.
+Merging pci/next (938ab77dbd2e Merge branches 'pci/enumeration', 'pci/resource', 'pci/virtualization' and 'pci/vpd' into next)
+$ git merge pci/next
+Auto-merging include/linux/pci.h
+Removing include/asm-generic/pci-bridge.h
+Auto-merging drivers/pci/host/pci-layerscape.c
+Auto-merging drivers/misc/cxl/pci.c
+Auto-merging arch/x86/pci/common.c
+Auto-merging arch/powerpc/include/asm/pci-bridge.h
+Merge made by the 'recursive' strategy.
+ arch/alpha/include/asm/pci.h | 1 -
+ arch/arm/include/asm/pci.h | 3 -
+ arch/arm64/include/asm/Kbuild | 3 -
+ arch/arm64/include/asm/pci.h | 1 -
+ arch/arm64/kernel/pci.c | 2 -
+ arch/ia64/pci/fixup.c | 21 ++-
+ arch/ia64/sn/kernel/io_acpi_init.c | 22 +--
+ arch/ia64/sn/kernel/io_init.c | 51 +++---
+ arch/mips/include/asm/pci.h | 1 -
+ arch/mips/pci/fixup-loongson3.c | 19 ++-
+ arch/powerpc/include/asm/pci-bridge.h | 1 -
+ arch/unicore32/include/asm/pci.h | 2 -
+ arch/x86/pci/common.c | 1 -
+ arch/x86/pci/fixup.c | 28 +++-
+ drivers/ata/pata_macio.c | 2 +-
+ drivers/char/agp/uninorth-agp.c | 1 -
+ drivers/gpu/drm/radeon/radeon_combios.c | 1 -
+ drivers/ide/pdc202xx_new.c | 1 -
+ drivers/ide/pmac.c | 1 -
+ drivers/macintosh/macio_asic.c | 1 -
+ drivers/misc/cxl/pci.c | 1 -
+ drivers/net/ethernet/sun/sungem.c | 1 -
+ drivers/net/ethernet/toshiba/spider_net.c | 1 -
+ drivers/of/of_pci.c | 1 -
+ drivers/pci/access.c | 240 +++++++++++++++++++----------
+ drivers/pci/bus.c | 7 +-
+ drivers/pci/host/pci-imx6.c | 137 +++++++---------
+ drivers/pci/host/pci-layerscape.c | 1 +
+ drivers/pci/host/pcie-designware.c | 15 +-
+ drivers/pci/host/pcie-rcar.c | 14 +-
+ drivers/pci/iov.c | 4 -
+ drivers/pci/pci-label.c | 2 +-
+ drivers/pci/pci-sysfs.c | 35 ++---
+ drivers/pci/pci.c | 1 -
+ drivers/pci/pci.h | 16 +-
+ drivers/pci/pcie/aer/aer_inject.c | 61 +++++---
+ drivers/pci/pcie/pme.c | 11 +-
+ drivers/pci/probe.c | 24 ++-
+ drivers/pci/quirks.c | 44 ++++++
+ drivers/pci/remove.c | 1 -
+ drivers/pci/rom.c | 83 +++-------
+ drivers/pci/setup-bus.c | 1 -
+ drivers/pci/setup-res.c | 6 +
+ drivers/scsi/mac53c94.c | 2 +-
+ drivers/scsi/mesh.c | 2 +-
+ drivers/usb/core/hcd-pci.c | 1 -
+ drivers/video/fbdev/aty/aty128fb.c | 1 -
+ drivers/video/fbdev/aty/radeon_base.c | 1 -
+ drivers/video/fbdev/imsttfb.c | 1 -
+ drivers/video/fbdev/matrox/matroxfb_base.h | 1 -
+ drivers/video/fbdev/offb.c | 4 -
+ include/asm-generic/pci-bridge.h | 74 ---------
+ include/linux/ioport.h | 4 +-
+ include/linux/pci.h | 50 +++++-
+ sound/ppc/pmac.c | 1 -
+ 55 files changed, 535 insertions(+), 477 deletions(-)
+ delete mode 100644 include/asm-generic/pci-bridge.h
+Merging hid/for-next (9634fbb88959 Merge branch 'for-4.6/multitouch' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hid/Kconfig | 6 +
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-cmedia.c | 168 ++++++++++
+ drivers/hid/hid-core.c | 103 ++++--
+ drivers/hid/hid-corsair.c | 3 +
+ drivers/hid/hid-dr.c | 4 +-
+ drivers/hid/hid-ids.h | 10 +-
+ drivers/hid/hid-lg.c | 10 +-
+ drivers/hid/hid-logitech-hidpp.c | 701 +++++++++++++++++++++++++++++++++------
+ drivers/hid/hid-multitouch.c | 8 +
+ drivers/hid/hid-rmi.c | 11 +
+ drivers/hid/hid-sony.c | 182 +++++-----
+ drivers/hid/hid-thingm.c | 110 +++---
+ drivers/hid/usbhid/hid-quirks.c | 2 +
+ drivers/hid/wacom_sys.c | 363 ++++++++++----------
+ drivers/hid/wacom_wac.c | 249 +++++++-------
+ 16 files changed, 1336 insertions(+), 595 deletions(-)
+ create mode 100644 drivers/hid/hid-cmedia.c
+Merging i2c/i2c/for-next (3bf58bb5da86 i2c: imx: remove extra spaces.)
+$ git merge i2c/i2c/for-next
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-platform-i2c-demux-pinctrl | 23 +
+ .../devicetree/bindings/i2c/i2c-demux-pinctrl.txt | 135 +++
+ Documentation/devicetree/bindings/i2c/i2c-xiic.txt | 3 +
+ drivers/i2c/busses/Kconfig | 10 +-
+ drivers/i2c/busses/i2c-bcm-iproc.c | 177 ++--
+ drivers/i2c/busses/i2c-designware-baytrail.c | 5 -
+ drivers/i2c/busses/i2c-designware-core.c | 22 +-
+ drivers/i2c/busses/i2c-designware-core.h | 2 -
+ drivers/i2c/busses/i2c-imx.c | 12 +-
+ drivers/i2c/busses/i2c-mt65xx.c | 42 +
+ drivers/i2c/busses/i2c-piix4.c | 48 +-
+ drivers/i2c/busses/i2c-qup.c | 977 ++++++++++++++++++++-
+ drivers/i2c/busses/i2c-rcar.c | 2 +-
+ drivers/i2c/busses/i2c-tegra.c | 4 +-
+ drivers/i2c/busses/i2c-xiic.c | 88 +-
+ drivers/i2c/i2c-boardinfo.c | 6 +-
+ drivers/i2c/i2c-core.c | 30 +-
+ drivers/i2c/i2c-dev.c | 14 +-
+ drivers/i2c/i2c-mux.c | 8 +-
+ drivers/i2c/i2c-smbus.c | 8 +-
+ drivers/i2c/i2c-stub.c | 8 +-
+ drivers/i2c/muxes/Kconfig | 9 +
+ drivers/i2c/muxes/Makefile | 2 +
+ drivers/i2c/muxes/i2c-demux-pinctrl.c | 272 ++++++
+ 24 files changed, 1722 insertions(+), 185 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt
+ create mode 100644 drivers/i2c/muxes/i2c-demux-pinctrl.c
+Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/max34440 | 6 +++---
+ drivers/hwmon/emc2103.c | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
+$ git merge dmi/master
+Merge made by the 'recursive' strategy.
+Merging hwmon-staging/hwmon-next (709066acdd12 hwmon: (adm1275) Add support for ADM1278)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging arch/arm/boot/dts/vfxxx.dtsi
+Auto-merging Documentation/hwmon/max34440
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/hwmon/ntc_thermistor.txt | 1 +
+ .../devicetree/bindings/iio/iio-bindings.txt | 2 +-
+ Documentation/hwmon/adm1275 | 29 +++-
+ Documentation/hwmon/lm25066 | 2 +-
+ Documentation/hwmon/ltc2990 | 43 ++++++
+ Documentation/hwmon/max16064 | 2 +-
+ Documentation/hwmon/max34440 | 2 +-
+ Documentation/hwmon/max8688 | 2 +-
+ Documentation/hwmon/ntc_thermistor | 4 +-
+ Documentation/hwmon/pmbus | 2 +-
+ Documentation/hwmon/zl6100 | 2 +-
+ arch/arm/boot/dts/imx23.dtsi | 2 +-
+ arch/arm/boot/dts/imx28.dtsi | 2 +-
+ arch/arm/boot/dts/vfxxx.dtsi | 5 +
+ drivers/hwmon/Kconfig | 16 +-
+ drivers/hwmon/Makefile | 3 +-
+ drivers/hwmon/iio_hwmon.c | 11 +-
+ drivers/hwmon/ltc2990.c | 161 +++++++++++++++++++++
+ drivers/hwmon/ntc_thermistor.c | 44 ++++++
+ drivers/hwmon/pmbus/Kconfig | 4 +-
+ drivers/hwmon/pmbus/adm1275.c | 56 ++++++-
+ drivers/hwmon/{vexpress.c => vexpress-hwmon.c} | 0
+ include/linux/platform_data/ntc_thermistor.h | 1 +
+ 23 files changed, 373 insertions(+), 23 deletions(-)
+ create mode 100644 Documentation/hwmon/ltc2990
+ create mode 100644 drivers/hwmon/ltc2990.c
+ rename drivers/hwmon/{vexpress.c => vexpress-hwmon.c} (100%)
+Merging v4l-dvb/master (65e667aa737a Merge branch 'patchwork' into to_next)
+$ git merge v4l-dvb/master
+Auto-merging include/dt-bindings/media/tvp5150.h
+Auto-merging drivers/staging/media/mx3/mx3_camera.c
+Removing drivers/staging/media/mn88473/TODO
+Removing drivers/staging/media/mn88473/Makefile
+Removing drivers/staging/media/mn88473/Kconfig
+Auto-merging drivers/media/dvb-frontends/mn88473_priv.h
+Auto-merging drivers/media/dvb-frontends/mn88473.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/DocBook/media/v4l/pixfmt-yuv422m.xml
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/device-drivers.tmpl | 1 +
+ Documentation/DocBook/media/v4l/controls.xml | 58 +
+ .../DocBook/media/v4l/media-ioc-g-topology.xml | 3 -
+ Documentation/DocBook/media/v4l/media-types.xml | 81 +-
+ Documentation/DocBook/media/v4l/pixfmt-y12i.xml | 49 +
+ Documentation/DocBook/media/v4l/pixfmt-y8i.xml | 80 +
+ Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml | 26 +-
+ .../v4l/{pixfmt-yvu420m.xml => pixfmt-yuv422m.xml} | 106 +-
+ Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml | 177 ++
+ Documentation/DocBook/media/v4l/pixfmt-z16.xml | 81 +
+ Documentation/DocBook/media/v4l/pixfmt.xml | 13 +-
+ .../DocBook/media/v4l/vidioc-query-dv-timings.xml | 14 +-
+ .../DocBook/media/v4l/vidioc-querystd.xml | 10 +
+ .../devicetree/bindings/media/i2c/mt9v032.txt | 2 +
+ .../devicetree/bindings/media/i2c/tvp5150.txt | 45 +
+ .../devicetree/bindings/media/rcar_vin.txt | 1 +
+ .../devicetree/bindings/media/renesas,jpu.txt | 13 +-
+ .../devicetree/bindings/media/renesas,vsp1.txt | 34 +-
+ Documentation/devicetree/bindings/media/ti-cal.txt | 72 +
+ Documentation/dvb/README.dvb-usb | 2 +-
+ Documentation/video4linux/CARDLIST.saa7134 | 1 +
+ Documentation/video4linux/v4l2-controls.txt | 1 -
+ MAINTAINERS | 12 +-
+ drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 +-
+ drivers/media/common/b2c2/flexcop.c | 4 +-
+ drivers/media/common/cypress_firmware.c | 2 +-
+ drivers/media/common/cypress_firmware.h | 2 +-
+ drivers/media/common/siano/smscoreapi.c | 4 +-
+ drivers/media/common/siano/smsdvb-main.c | 7 -
+ drivers/media/dvb-core/dvb-usb-ids.h | 9 +-
+ drivers/media/dvb-core/dvb_frontend.c | 218 +--
+ drivers/media/dvb-core/dvb_frontend.h | 3 +-
+ drivers/media/dvb-core/dvbdev.c | 15 +-
+ drivers/media/dvb-frontends/Kconfig | 8 +
+ drivers/media/dvb-frontends/Makefile | 1 +
+ drivers/media/dvb-frontends/af9013.c | 8 +-
+ drivers/media/dvb-frontends/af9033.c | 7 +-
+ drivers/media/dvb-frontends/as102_fe.c | 4 +-
+ drivers/media/dvb-frontends/atbm8830.c | 4 +-
+ drivers/media/dvb-frontends/au8522.h | 1 -
+ drivers/media/dvb-frontends/au8522_decoder.c | 7 +-
+ drivers/media/dvb-frontends/au8522_dig.c | 4 +-
+ drivers/media/dvb-frontends/au8522_priv.h | 11 +-
+ drivers/media/dvb-frontends/bcm3510.c | 4 +-
+ drivers/media/dvb-frontends/bcm3510.h | 2 +-
+ drivers/media/dvb-frontends/bcm3510_priv.h | 2 +-
+ drivers/media/dvb-frontends/cx22700.c | 4 +-
+ drivers/media/dvb-frontends/cx22702.c | 4 +-
+ drivers/media/dvb-frontends/cx24110.c | 4 +-
+ drivers/media/dvb-frontends/cx24117.c | 4 +-
+ drivers/media/dvb-frontends/cx24120.c | 8 +-
+ drivers/media/dvb-frontends/cx24123.c | 4 +-
+ drivers/media/dvb-frontends/cxd2820r_c.c | 4 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c | 20 +-
+ drivers/media/dvb-frontends/cxd2820r_priv.h | 9 +-
+ drivers/media/dvb-frontends/cxd2820r_t.c | 4 +-
+ drivers/media/dvb-frontends/cxd2820r_t2.c | 6 +-
+ drivers/media/dvb-frontends/cxd2841er.c | 4 +-
+ drivers/media/dvb-frontends/dib0070.c | 2 +-
+ drivers/media/dvb-frontends/dib0090.c | 16 +-
+ drivers/media/dvb-frontends/dib3000.h | 6 +-
+ drivers/media/dvb-frontends/dib3000mb.c | 17 +-
+ drivers/media/dvb-frontends/dib3000mb_priv.h | 2 +-
+ drivers/media/dvb-frontends/dib3000mc.c | 10 +-
+ drivers/media/dvb-frontends/dib3000mc.h | 2 +-
+ drivers/media/dvb-frontends/dib7000m.c | 8 +-
+ drivers/media/dvb-frontends/dib7000p.c | 10 +-
+ drivers/media/dvb-frontends/dib8000.c | 77 +-
+ drivers/media/dvb-frontends/dib9000.c | 31 +-
+ drivers/media/dvb-frontends/dibx000_common.c | 2 +-
+ drivers/media/dvb-frontends/drx39xyj/drxj.c | 11 +-
+ drivers/media/dvb-frontends/dvb_dummy_fe.c | 7 +-
+ drivers/media/dvb-frontends/hd29l2.c | 4 +-
+ drivers/media/dvb-frontends/l64781.c | 4 +-
+ drivers/media/dvb-frontends/lg2160.c | 62 +-
+ drivers/media/dvb-frontends/lgdt3305.c | 4 +-
+ drivers/media/dvb-frontends/lgdt3306a.c | 4 +-
+ drivers/media/dvb-frontends/lgdt330x.c | 5 +-
+ drivers/media/dvb-frontends/lgs8gl5.c | 5 +-
+ drivers/media/dvb-frontends/lgs8gxx.c | 13 +-
+ drivers/media/dvb-frontends/m88ds3103.c | 4 +-
+ drivers/media/dvb-frontends/m88rs2000.c | 5 +-
+ drivers/media/dvb-frontends/mb86a20s.c | 11 -
+ .../mn88473 => media/dvb-frontends}/mn88473.c | 388 ++--
+ drivers/media/dvb-frontends/mn88473.h | 14 +-
+ .../mn88473 => media/dvb-frontends}/mn88473_priv.h | 7 +-
+ drivers/media/dvb-frontends/mt312.c | 4 +-
+ drivers/media/dvb-frontends/mt352.c | 4 +-
+ drivers/media/dvb-frontends/or51132.c | 4 +-
+ drivers/media/dvb-frontends/rtl2830.c | 7 +-
+ drivers/media/dvb-frontends/rtl2832.c | 155 +-
+ drivers/media/dvb-frontends/rtl2832.h | 4 +-
+ drivers/media/dvb-frontends/rtl2832_priv.h | 1 -
+ drivers/media/dvb-frontends/s5h1409.c | 4 +-
+ drivers/media/dvb-frontends/s5h1411.c | 4 +-
+ drivers/media/dvb-frontends/s5h1420.c | 4 +-
+ drivers/media/dvb-frontends/s921.c | 4 +-
+ drivers/media/dvb-frontends/si2165.c | 28 +-
+ drivers/media/dvb-frontends/stb0899_drv.c | 4 +-
+ drivers/media/dvb-frontends/stb6100.c | 2 +-
+ drivers/media/dvb-frontends/stv0297.c | 4 +-
+ drivers/media/dvb-frontends/stv0299.c | 8 +-
+ drivers/media/dvb-frontends/stv0367.c | 8 +-
+ drivers/media/dvb-frontends/stv0900_core.c | 11 +-
+ drivers/media/dvb-frontends/stv6110x.c | 4 +-
+ drivers/media/dvb-frontends/stv6110x.h | 4 +-
+ drivers/media/dvb-frontends/stv6110x_priv.h | 2 +-
+ drivers/media/dvb-frontends/tc90522.c | 10 +-
+ drivers/media/dvb-frontends/tda10021.c | 4 +-
+ drivers/media/dvb-frontends/tda10023.c | 4 +-
+ drivers/media/dvb-frontends/tda10048.c | 4 +-
+ drivers/media/dvb-frontends/tda1004x.c | 4 +-
+ drivers/media/dvb-frontends/tda10071.c | 4 +-
+ drivers/media/dvb-frontends/tda10086.c | 4 +-
+ drivers/media/dvb-frontends/tda8083.c | 4 +-
+ drivers/media/dvb-frontends/ts2020.c | 4 +
+ drivers/media/dvb-frontends/ves1820.c | 4 +-
+ drivers/media/dvb-frontends/ves1x93.c | 4 +-
+ drivers/media/dvb-frontends/zl10353.c | 4 +-
+ drivers/media/i2c/adv7511.c | 43 +-
+ drivers/media/i2c/adv7604.c | 230 +--
+ drivers/media/i2c/adv7842.c | 20 +
+ drivers/media/i2c/msp3400-driver.c | 14 +
+ drivers/media/i2c/msp3400-driver.h | 5 +
+ drivers/media/i2c/mt9v011.c | 15 +
+ drivers/media/i2c/mt9v032.c | 28 +
+ drivers/media/i2c/ov2659.c | 8 +-
+ drivers/media/i2c/ov9650.c | 4 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 4 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 -
+ drivers/media/i2c/s5k5baf.c | 5 +-
+ drivers/media/i2c/saa7115.c | 19 +
+ drivers/media/i2c/soc_camera/mt9m001.c | 2 +-
+ drivers/media/i2c/soc_camera/mt9t031.c | 2 +-
+ drivers/media/i2c/soc_camera/mt9v022.c | 2 +-
+ drivers/media/i2c/tc358743.c | 55 +-
+ drivers/media/i2c/tvp514x.c | 6 +-
+ drivers/media/i2c/tvp5150.c | 452 ++++-
+ drivers/media/i2c/tvp7002.c | 6 +-
+ drivers/media/i2c/vpx3220.c | 2 +-
+ drivers/media/media-device.c | 145 +-
+ drivers/media/media-devnode.c | 1 +
+ drivers/media/media-entity.c | 74 +-
+ drivers/media/pci/b2c2/flexcop-pci.c | 2 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 53 +-
+ drivers/media/pci/bt8xx/dst.c | 4 +-
+ drivers/media/pci/bt8xx/dvb-bt8xx.c | 4 +-
+ drivers/media/pci/cx23885/cx23885-dvb.c | 19 +-
+ drivers/media/pci/cx88/cx88-dvb.c | 3 +-
+ drivers/media/pci/ddbridge/ddbridge-core.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-queue.c | 2 +-
+ drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 7 +-
+ drivers/media/pci/ngene/ngene-cards.c | 2 +-
+ drivers/media/pci/pt3/pt3.c | 3 +-
+ drivers/media/pci/saa7134/saa7134-cards.c | 1851 +++++++++----------
+ drivers/media/pci/saa7134/saa7134-core.c | 195 +-
+ drivers/media/pci/saa7134/saa7134-dvb.c | 9 +-
+ drivers/media/pci/saa7134/saa7134-empress.c | 3 +-
+ drivers/media/pci/saa7134/saa7134-go7007.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-input.c | 21 +
+ drivers/media/pci/saa7134/saa7134-tvaudio.c | 13 +-
+ drivers/media/pci/saa7134/saa7134-video.c | 108 +-
+ drivers/media/pci/saa7134/saa7134.h | 46 +-
+ drivers/media/pci/ttpci/av7110.c | 15 +-
+ drivers/media/pci/ttpci/budget.c | 36 +-
+ drivers/media/platform/Kconfig | 22 +-
+ drivers/media/platform/Makefile | 3 +-
+ drivers/media/platform/coda/coda-bit.c | 2 +-
+ drivers/media/platform/coda/coda-common.c | 106 +-
+ drivers/media/platform/coda/coda.h | 3 +-
+ drivers/media/platform/davinci/dm644x_ccdc.c | 2 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 20 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 10 +-
+ drivers/media/platform/omap3isp/isp.c | 226 +--
+ drivers/media/platform/omap3isp/isp.h | 4 -
+ drivers/media/platform/omap3isp/ispccdc.c | 2 +-
+ drivers/media/platform/omap3isp/isppreview.c | 14 +-
+ drivers/media/platform/omap3isp/ispvideo.c | 116 +-
+ drivers/media/platform/omap3isp/ispvideo.h | 1 -
+ drivers/media/platform/omap3isp/omap3isp.h | 8 +-
+ drivers/media/platform/rcar_jpu.c | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 12 +
+ drivers/media/platform/soc_camera/Kconfig | 29 +-
+ drivers/media/platform/soc_camera/Makefile | 3 -
+ drivers/media/platform/soc_camera/atmel-isi.c | 4 +-
+ drivers/media/platform/soc_camera/pxa_camera.c | 478 +++--
+ drivers/media/platform/soc_camera/rcar_vin.c | 41 +-
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 14 +-
+ .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 2 +-
+ drivers/media/platform/ti-vpe/Makefile | 4 +
+ drivers/media/platform/ti-vpe/cal.c | 1947 ++++++++++++++++++++
+ drivers/media/platform/ti-vpe/cal_regs.h | 479 +++++
+ drivers/media/platform/vim2m.c | 2 +-
+ drivers/media/platform/vivid/vivid-osd.c | 2 +-
+ drivers/media/platform/vivid/vivid-tpg.c | 32 +
+ drivers/media/platform/vivid/vivid-tpg.h | 2 +
+ drivers/media/platform/vivid/vivid-vid-common.c | 39 +-
+ drivers/media/platform/vsp1/Makefile | 3 +-
+ drivers/media/platform/vsp1/vsp1.h | 29 +-
+ drivers/media/platform/vsp1/vsp1_bru.c | 33 +-
+ drivers/media/platform/vsp1/vsp1_bru.h | 3 +-
+ drivers/media/platform/vsp1/vsp1_dl.c | 305 +++
+ drivers/media/platform/vsp1/vsp1_dl.h | 42 +
+ drivers/media/platform/vsp1/vsp1_drm.c | 597 ++++++
+ drivers/media/platform/vsp1/vsp1_drm.h | 49 +
+ drivers/media/platform/vsp1/vsp1_drv.c | 382 ++--
+ drivers/media/platform/vsp1/vsp1_entity.c | 31 +-
+ drivers/media/platform/vsp1/vsp1_entity.h | 14 +-
+ drivers/media/platform/vsp1/vsp1_hsit.c | 2 +-
+ drivers/media/platform/vsp1/vsp1_lif.c | 11 +-
+ drivers/media/platform/vsp1/vsp1_lut.c | 7 +-
+ drivers/media/platform/vsp1/vsp1_pipe.c | 426 +++++
+ drivers/media/platform/vsp1/vsp1_pipe.h | 134 ++
+ drivers/media/platform/vsp1/vsp1_regs.h | 32 +-
+ drivers/media/platform/vsp1/vsp1_rpf.c | 88 +-
+ drivers/media/platform/vsp1/vsp1_rwpf.h | 29 +-
+ drivers/media/platform/vsp1/vsp1_sru.c | 9 +-
+ drivers/media/platform/vsp1/vsp1_uds.c | 8 +-
+ drivers/media/platform/vsp1/vsp1_video.c | 518 +-----
+ drivers/media/platform/vsp1/vsp1_video.h | 111 +-
+ drivers/media/platform/vsp1/vsp1_wpf.c | 98 +-
+ drivers/media/radio/radio-si476x.c | 4 +-
+ drivers/media/radio/tea575x.c | 21 +-
+ drivers/media/radio/wl128x/fmdrv_common.c | 2 +-
+ drivers/media/rc/ati_remote.c | 47 +-
+ drivers/media/rc/igorplugusb.c | 17 +-
+ drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 56 +-
+ drivers/media/rc/lirc_dev.c | 7 +-
+ drivers/media/rc/nuvoton-cir.c | 337 ++--
+ drivers/media/rc/nuvoton-cir.h | 15 +-
+ drivers/media/rc/rc-core-priv.h | 6 +-
+ drivers/media/rc/rc-ir-raw.c | 23 +-
+ drivers/media/rc/rc-main.c | 48 +-
+ drivers/media/rc/sunxi-cir.c | 1 +
+ drivers/media/tuners/m88rs6000t.c | 11 +-
+ drivers/media/tuners/r820t.c | 2 +-
+ drivers/media/tuners/si2157.c | 39 +-
+ drivers/media/tuners/si2157.h | 5 +
+ drivers/media/tuners/si2157_priv.h | 8 +
+ drivers/media/tuners/tuner-xc2028.c | 6 +-
+ drivers/media/tuners/xc4000.c | 2 +-
+ drivers/media/usb/airspy/airspy.c | 11 +-
+ drivers/media/usb/as102/as102_drv.h | 2 +-
+ drivers/media/usb/as102/as102_usb_drv.c | 2 +-
+ drivers/media/usb/au0828/au0828-core.c | 433 +++--
+ drivers/media/usb/au0828/au0828-dvb.c | 12 +-
+ drivers/media/usb/au0828/au0828-video.c | 190 +-
+ drivers/media/usb/au0828/au0828.h | 27 +-
+ drivers/media/usb/b2c2/flexcop-usb.c | 2 +-
+ drivers/media/usb/cpia2/cpia2_core.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 2 +
+ drivers/media/usb/cx231xx/cx231xx-audio.c | 5 +
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 68 +-
+ drivers/media/usb/cx231xx/cx231xx-dvb.c | 10 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 47 +-
+ drivers/media/usb/cx231xx/cx231xx.h | 4 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c | 6 +-
+ drivers/media/usb/dvb-usb-v2/af9035.h | 3 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_common.h | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 15 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvbsky.c | 7 +
+ drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c | 6 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 8 +-
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 32 +-
+ drivers/media/usb/dvb-usb-v2/usb_urb.c | 2 +-
+ drivers/media/usb/dvb-usb/a800.c | 4 +-
+ drivers/media/usb/dvb-usb/af9005-fe.c | 4 +-
+ drivers/media/usb/dvb-usb/cxusb.c | 4 +-
+ drivers/media/usb/dvb-usb/dib0700_core.c | 2 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 77 +-
+ drivers/media/usb/dvb-usb/dibusb-common.c | 2 +-
+ drivers/media/usb/dvb-usb/dibusb-mb.c | 6 +-
+ drivers/media/usb/dvb-usb/dibusb-mc.c | 6 +-
+ drivers/media/usb/dvb-usb/dibusb.h | 2 +-
+ drivers/media/usb/dvb-usb/digitv.c | 4 +-
+ drivers/media/usb/dvb-usb/dtt200u-fe.c | 7 +-
+ drivers/media/usb/dvb-usb/dtt200u.c | 4 +-
+ drivers/media/usb/dvb-usb/dtt200u.h | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-common.h | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 13 +-
+ drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-i2c.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-init.c | 4 +-
+ drivers/media/usb/dvb-usb/dvb-usb-remote.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb-urb.c | 2 +-
+ drivers/media/usb/dvb-usb/dvb-usb.h | 2 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 105 +-
+ drivers/media/usb/dvb-usb/friio-fe.c | 27 +-
+ drivers/media/usb/dvb-usb/nova-t-usb2.c | 4 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 43 +-
+ drivers/media/usb/dvb-usb/ttusb2.c | 2 +-
+ drivers/media/usb/dvb-usb/umt-010.c | 4 +-
+ drivers/media/usb/dvb-usb/usb-urb.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/vp702x.c | 4 +-
+ drivers/media/usb/dvb-usb/vp7045-fe.c | 2 +-
+ drivers/media/usb/dvb-usb/vp7045.c | 4 +-
+ drivers/media/usb/dvb-usb/vp7045.h | 2 +-
+ drivers/media/usb/em28xx/em28xx-camera.c | 4 +
+ drivers/media/usb/em28xx/em28xx-cards.c | 208 ++-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 21 +
+ drivers/media/usb/em28xx/em28xx-video.c | 213 ++-
+ drivers/media/usb/em28xx/em28xx.h | 21 +-
+ drivers/media/usb/go7007/go7007-priv.h | 2 +-
+ drivers/media/usb/go7007/go7007-usb.c | 4 +-
+ drivers/media/usb/gspca/ov519.c | 43 +-
+ drivers/media/usb/gspca/w996Xcf.c | 8 +
+ drivers/media/usb/hdpvr/hdpvr-core.c | 2 +
+ drivers/media/usb/hdpvr/hdpvr-video.c | 6 +-
+ drivers/media/usb/msi2500/msi2500.c | 2 -
+ drivers/media/usb/pvrusb2/pvrusb2-context.c | 2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 3 +
+ drivers/media/usb/pvrusb2/pvrusb2-io.c | 2 +-
+ drivers/media/usb/pwc/pwc-if.c | 6 +
+ drivers/media/usb/siano/smsusb.c | 30 +-
+ drivers/media/usb/stk1160/stk1160-video.c | 1 -
+ drivers/media/usb/usbtv/usbtv-video.c | 37 +-
+ drivers/media/usb/usbtv/usbtv.h | 1 +
+ drivers/media/usb/usbvision/usbvision-video.c | 29 +-
+ drivers/media/usb/uvc/uvc_driver.c | 20 +
+ drivers/media/usb/uvc/uvcvideo.h | 12 +
+ drivers/media/v4l2-core/Kconfig | 1 -
+ drivers/media/v4l2-core/Makefile | 1 +
+ drivers/media/v4l2-core/tuner-core.c | 26 +-
+ drivers/media/v4l2-core/v4l2-async.c | 7 +
+ drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 21 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 34 +-
+ drivers/media/v4l2-core/v4l2-dv-timings.c | 3 +-
+ drivers/media/v4l2-core/v4l2-fh.c | 2 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 34 +
+ drivers/media/v4l2-core/v4l2-mc.c | 419 +++++
+ drivers/media/v4l2-core/v4l2-of.c | 2 +-
+ drivers/media/v4l2-core/videobuf-core.c | 10 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 5 +
+ drivers/media/v4l2-core/videobuf2-dvb.c | 13 +-
+ drivers/staging/media/Kconfig | 8 +-
+ drivers/staging/media/Makefile | 5 +-
+ .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 2 +-
+ drivers/staging/media/lirc/lirc_parallel.c | 24 +-
+ drivers/staging/media/lirc/lirc_zilog.c | 4 +-
+ drivers/staging/media/mn88473/Kconfig | 7 -
+ drivers/staging/media/mn88473/Makefile | 5 -
+ drivers/staging/media/mn88473/TODO | 21 -
+ drivers/staging/media/mx2/Kconfig | 15 +
+ drivers/staging/media/mx2/Makefile | 3 +
+ drivers/staging/media/mx2/TODO | 10 +
+ .../soc_camera => staging/media/mx2}/mx2_camera.c | 0
+ drivers/staging/media/mx3/Kconfig | 15 +
+ drivers/staging/media/mx3/Makefile | 3 +
+ drivers/staging/media/mx3/TODO | 10 +
+ .../soc_camera => staging/media/mx3}/mx3_camera.c | 12 +-
+ drivers/staging/media/omap1/Kconfig | 13 +
+ drivers/staging/media/omap1/Makefile | 3 +
+ drivers/staging/media/omap1/TODO | 8 +
+ .../media/omap1}/omap1_camera.c | 0
+ drivers/staging/media/omap4iss/iss.c | 211 +--
+ drivers/staging/media/omap4iss/iss.h | 6 +-
+ drivers/staging/media/omap4iss/iss_video.c | 15 +-
+ drivers/staging/media/omap4iss/iss_video.h | 1 -
+ drivers/staging/media/timb/Kconfig | 11 +
+ drivers/staging/media/timb/Makefile | 1 +
+ .../platform => staging/media/timb}/timblogiw.c | 0
+ drivers/usb/musb/sunxi.c | 1 +
+ include/{media/i2c => dt-bindings/media}/tvp5150.h | 8 +-
+ include/media/media-device.h | 149 ++
+ include/media/media-entity.h | 20 +
+ include/media/rc-core.h | 2 +
+ include/media/tuner.h | 9 +-
+ include/media/v4l2-ctrls.h | 12 -
+ include/media/v4l2-dev.h | 1 +
+ include/media/v4l2-mc.h | 243 +++
+ include/media/v4l2-subdev.h | 3 +
+ include/media/videobuf2-dvb.h | 5 +
+ include/media/vsp1.h | 33 +
+ include/uapi/linux/media.h | 45 +-
+ include/uapi/linux/v4l2-common.h | 46 +-
+ include/uapi/linux/v4l2-controls.h | 11 +
+ include/uapi/linux/videodev2.h | 7 +
+ sound/usb/Kconfig | 4 +
+ sound/usb/Makefile | 2 +
+ sound/usb/card.c | 14 +
+ sound/usb/card.h | 3 +
+ sound/usb/media.c | 318 ++++
+ sound/usb/media.h | 72 +
+ sound/usb/mixer.h | 3 +
+ sound/usb/pcm.c | 28 +-
+ sound/usb/quirks-table.h | 1 +
+ sound/usb/stream.c | 2 +
+ sound/usb/usbaudio.h | 6 +
+ 394 files changed, 12222 insertions(+), 4894 deletions(-)
+ create mode 100644 Documentation/DocBook/media/v4l/pixfmt-y12i.xml
+ create mode 100644 Documentation/DocBook/media/v4l/pixfmt-y8i.xml
+ rename Documentation/DocBook/media/v4l/{pixfmt-yvu420m.xml => pixfmt-yuv422m.xml} (58%)
+ create mode 100644 Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml
+ create mode 100644 Documentation/DocBook/media/v4l/pixfmt-z16.xml
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/tvp5150.txt
+ create mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt
+ rename drivers/{staging/media/mn88473 => media/dvb-frontends}/mn88473.c (61%)
+ rename drivers/{staging/media/mn88473 => media/dvb-frontends}/mn88473_priv.h (89%)
+ create mode 100644 drivers/media/platform/ti-vpe/cal.c
+ create mode 100644 drivers/media/platform/ti-vpe/cal_regs.h
+ create mode 100644 drivers/media/platform/vsp1/vsp1_dl.c
+ create mode 100644 drivers/media/platform/vsp1/vsp1_dl.h
+ create mode 100644 drivers/media/platform/vsp1/vsp1_drm.c
+ create mode 100644 drivers/media/platform/vsp1/vsp1_drm.h
+ create mode 100644 drivers/media/platform/vsp1/vsp1_pipe.c
+ create mode 100644 drivers/media/platform/vsp1/vsp1_pipe.h
+ create mode 100644 drivers/media/v4l2-core/v4l2-mc.c
+ delete mode 100644 drivers/staging/media/mn88473/Kconfig
+ delete mode 100644 drivers/staging/media/mn88473/Makefile
+ delete mode 100644 drivers/staging/media/mn88473/TODO
+ create mode 100644 drivers/staging/media/mx2/Kconfig
+ create mode 100644 drivers/staging/media/mx2/Makefile
+ create mode 100644 drivers/staging/media/mx2/TODO
+ rename drivers/{media/platform/soc_camera => staging/media/mx2}/mx2_camera.c (100%)
+ create mode 100644 drivers/staging/media/mx3/Kconfig
+ create mode 100644 drivers/staging/media/mx3/Makefile
+ create mode 100644 drivers/staging/media/mx3/TODO
+ rename drivers/{media/platform/soc_camera => staging/media/mx3}/mx3_camera.c (98%)
+ create mode 100644 drivers/staging/media/omap1/Kconfig
+ create mode 100644 drivers/staging/media/omap1/Makefile
+ create mode 100644 drivers/staging/media/omap1/TODO
+ rename drivers/{media/platform/soc_camera => staging/media/omap1}/omap1_camera.c (100%)
+ create mode 100644 drivers/staging/media/timb/Kconfig
+ create mode 100644 drivers/staging/media/timb/Makefile
+ rename drivers/{media/platform => staging/media/timb}/timblogiw.c (100%)
+ rename include/{media/i2c => dt-bindings/media}/tvp5150.h (87%)
+ create mode 100644 include/media/v4l2-mc.h
+ create mode 100644 include/media/vsp1.h
+ create mode 100644 sound/usb/media.c
+ create mode 100644 sound/usb/media.h
+Merging kbuild/for-next (a4f54c25dec6 Merge branch 'kbuild/misc' into kbuild/for-next)
+$ git merge kbuild/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/compiler-clang.h | 5 +
+ scripts/Kbuild.include | 6 +-
+ scripts/Makefile.dtbinst | 2 -
+ scripts/basic/fixdep.c | 6 +-
+ scripts/coccinelle/api/pm_runtime.cocci | 2 +-
+ scripts/coccinelle/api/setup_timer.cocci | 199 ++++++++++++++++++++++
+ scripts/coccinelle/iterators/use_after_iter.cocci | 2 +-
+ scripts/coccinelle/misc/array_size.cocci | 2 +-
+ scripts/coccinelle/misc/badty.cocci | 2 +-
+ scripts/coccinelle/misc/bugon.cocci | 2 +-
+ scripts/kconfig/Makefile | 4 +-
+ scripts/kconfig/confdata.c | 12 +-
+ scripts/link-vmlinux.sh | 7 +-
+ scripts/package/mkspec | 13 +-
+ scripts/tags.sh | 2 +
+ 15 files changed, 242 insertions(+), 24 deletions(-)
+ create mode 100644 scripts/coccinelle/api/setup_timer.cocci
+Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (015e34fc5519 Merge branch 'for-4.6' into for-next)
+$ git merge libata/for-next
+Auto-merging include/linux/blkdev.h
+Auto-merging block/blk-core.c
+Auto-merging arch/mips/include/asm/octeon/cvmx.h
+Auto-merging Documentation/devicetree/bindings/ata/ahci-platform.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ata/ahci-platform.txt | 1 +
+ .../devicetree/bindings/mips/cavium/sata-uctl.txt | 42 +++++++
+ arch/mips/include/asm/octeon/cvmx.h | 9 ++
+ block/blk-core.c | 24 ++++
+ drivers/ata/Kconfig | 11 +-
+ drivers/ata/Makefile | 1 +
+ drivers/ata/ahci.c | 104 +++++++++++-----
+ drivers/ata/ahci.h | 1 +
+ drivers/ata/ahci_mvebu.c | 14 ++-
+ drivers/ata/ahci_octeon.c | 105 ++++++++++++++++
+ drivers/ata/ahci_platform.c | 1 +
+ drivers/ata/libahci.c | 55 ++++++++-
+ drivers/ata/libata-scsi.c | 4 +-
+ drivers/ata/sata_via.c | 133 +++++++++++++++++++--
+ drivers/scsi/hosts.c | 7 ++
+ drivers/scsi/scsi_pm.c | 10 ++
+ include/linux/blkdev.h | 2 +
+ 17 files changed, 473 insertions(+), 51 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mips/cavium/sata-uctl.txt
+ create mode 100644 drivers/ata/ahci_octeon.c
+Merging pm/linux-next (4400e08334c7 Merge branch 'pm-cpufreq-governor' into linux-next)
+$ git merge pm/linux-next
+Merge made by the 'recursive' strategy.
+ Documentation/cpu-freq/intel-pstate.txt | 2 +-
+ Documentation/kernel-parameters.txt | 6 +
+ arch/arm/mach-imx/gpc.c | 9 +-
+ drivers/acpi/Makefile | 1 +
+ drivers/acpi/acpi_amba.c | 122 ++++
+ drivers/acpi/acpi_platform.c | 19 +-
+ drivers/acpi/acpi_processor.c | 17 +
+ drivers/acpi/acpica/acglobal.h | 2 +-
+ drivers/acpi/acpica/aclocal.h | 6 +-
+ drivers/acpi/acpica/acnamesp.h | 2 +-
+ drivers/acpi/acpica/acpredef.h | 2 +-
+ drivers/acpi/acpica/dbcmds.c | 2 +-
+ drivers/acpi/acpica/dbconvert.c | 5 +-
+ drivers/acpi/acpica/dsmethod.c | 3 +-
+ drivers/acpi/acpica/dsobject.c | 3 +-
+ drivers/acpi/acpica/evgpeblk.c | 3 +-
+ drivers/acpi/acpica/evgpeinit.c | 2 +-
+ drivers/acpi/acpica/evregion.c | 2 +-
+ drivers/acpi/acpica/exconfig.c | 4 +-
+ drivers/acpi/acpica/exoparg3.c | 4 +-
+ drivers/acpi/acpica/nseval.c | 3 +-
+ drivers/acpi/acpica/nsinit.c | 135 ++--
+ drivers/acpi/acpica/psargs.c | 9 +-
+ drivers/acpi/acpica/tbinstal.c | 5 +-
+ drivers/acpi/acpica/tbprint.c | 7 +-
+ drivers/acpi/acpica/tbutils.c | 4 +-
+ drivers/acpi/acpica/tbxfload.c | 28 +-
+ drivers/acpi/acpica/utcache.c | 2 +-
+ drivers/acpi/acpica/utnonansi.c | 246 +++++--
+ drivers/acpi/acpica/uttrack.c | 2 +-
+ drivers/acpi/acpica/utxferror.c | 3 +-
+ drivers/acpi/acpica/utxfinit.c | 42 +-
+ drivers/acpi/apei/ghes.c | 23 +-
+ drivers/acpi/bgrt.c | 10 +-
+ drivers/acpi/bus.c | 26 +-
+ drivers/acpi/internal.h | 6 +
+ drivers/acpi/pmic/intel_pmic_crc.c | 7 +-
+ drivers/acpi/processor_driver.c | 2 -
+ drivers/acpi/processor_idle.c | 62 +-
+ drivers/acpi/scan.c | 1 +
+ drivers/acpi/sleep.c | 35 +
+ drivers/acpi/tables.c | 10 +
+ drivers/base/power/domain.c | 33 +-
+ drivers/base/power/domain_governor.c | 64 +-
+ drivers/base/power/opp/core.c | 1079 ++++++++++++++++++++++---------
+ drivers/base/power/opp/cpu.c | 22 +-
+ drivers/base/power/opp/debugfs.c | 85 ++-
+ drivers/base/power/opp/opp.h | 74 ++-
+ drivers/base/power/trace.c | 4 +-
+ drivers/cpufreq/Kconfig | 1 +
+ drivers/cpufreq/acpi-cpufreq.c | 212 +++---
+ drivers/cpufreq/amd_freq_sensitivity.c | 8 +-
+ drivers/cpufreq/cpufreq-dt.c | 300 +++------
+ drivers/cpufreq/cpufreq.c | 365 +++++------
+ drivers/cpufreq/cpufreq_conservative.c | 282 ++++----
+ drivers/cpufreq/cpufreq_governor.c | 765 +++++++++++-----------
+ drivers/cpufreq/cpufreq_governor.h | 261 +++-----
+ drivers/cpufreq/cpufreq_ondemand.c | 445 +++++--------
+ drivers/cpufreq/cpufreq_ondemand.h | 30 +
+ drivers/cpufreq/cpufreq_performance.c | 18 +-
+ drivers/cpufreq/cpufreq_powersave.c | 10 +-
+ drivers/cpufreq/cpufreq_userspace.c | 10 +-
+ drivers/cpufreq/intel_pstate.c | 161 +++--
+ drivers/cpufreq/powernv-cpufreq.c | 152 +++--
+ drivers/cpuidle/governors/menu.c | 47 +-
+ include/acpi/acoutput.h | 2 +-
+ include/acpi/acpixf.h | 6 +-
+ include/acpi/processor.h | 9 +-
+ include/linux/cpufreq.h | 81 +--
+ include/linux/pm_domain.h | 13 +-
+ include/linux/pm_opp.h | 27 +
+ include/trace/events/power.h | 22 +
+ kernel/power/process.c | 12 +-
+ kernel/power/suspend.c | 6 +-
+ kernel/sched/deadline.c | 4 +
+ kernel/sched/fair.c | 26 +-
+ kernel/sched/rt.c | 4 +
+ kernel/sched/sched.h | 1 +
+ kernel/trace/power-traces.c | 1 +
+ 79 files changed, 3073 insertions(+), 2453 deletions(-)
+ create mode 100644 drivers/acpi/acpi_amba.c
+ create mode 100644 drivers/cpufreq/cpufreq_ondemand.h
+Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
+$ git merge idle/next
+Already up-to-date.
+Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
+$ git merge apm/for-next
+Already up-to-date.
+Merging thermal/next (192cb9ee6547 thermal: intel_pch_thermal: Enable Skylake PCH thermal)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ drivers/thermal/intel_pch_thermal.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging thermal-soc/next (6427895d808e Merge branch 'work-fixes' into work-next)
+$ git merge thermal-soc/next
+Merge made by the 'recursive' strategy.
+ .../bindings/thermal/mediatek-thermal.txt | 43 ++
+ drivers/thermal/Kconfig | 8 +
+ drivers/thermal/Makefile | 1 +
+ drivers/thermal/mtk_thermal.c | 625 +++++++++++++++++++++
+ drivers/thermal/rockchip_thermal.c | 239 ++++----
+ 5 files changed, 813 insertions(+), 103 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt
+ create mode 100644 drivers/thermal/mtk_thermal.c
+Merging ieee1394/for-next (575913946989 firewire: ABI documentation: jujuutils were renamed to linux-firewire-utils)
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/firewire-cdev | 2 +-
+ drivers/firewire/nosy.c | 10 ++++++----
+ drivers/firewire/ohci.c | 5 +++--
+ 3 files changed, 10 insertions(+), 7 deletions(-)
+Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/lowcomms.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 62 insertions(+), 12 deletions(-)
+Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (df7c2e001f52 Merge branch 'topic/xilinx' into next)
+$ git merge slave-dma/next
+Auto-merging drivers/dma/idma64.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/arm-pl330.txt | 1 +
+ drivers/dma/Kconfig | 5 +-
+ drivers/dma/acpi-dma.c | 2 +-
+ drivers/dma/dmaengine.c | 1 +
+ drivers/dma/dw/regs.h | 2 +-
+ drivers/dma/edma.c | 63 +++---
+ drivers/dma/ep93xx_dma.c | 28 +--
+ drivers/dma/idma64.c | 3 +
+ drivers/dma/idma64.h | 2 +-
+ drivers/dma/ioat/dma.c | 218 ++++++---------------
+ drivers/dma/ioat/dma.h | 18 +-
+ drivers/dma/ioat/hw.h | 2 +
+ drivers/dma/ioat/init.c | 49 ++---
+ drivers/dma/ioat/prep.c | 2 +-
+ drivers/dma/mic_x100_dma.c | 2 +-
+ drivers/dma/omap-dma.c | 8 +
+ drivers/dma/pl330.c | 101 +++++++---
+ drivers/dma/qcom_bam_dma.c | 19 +-
+ drivers/dma/sh/Kconfig | 6 +-
+ drivers/dma/sh/rcar-dmac.c | 2 +-
+ drivers/dma/sh/shdmac.c | 2 +-
+ drivers/dma/sirf-dma.c | 10 +-
+ drivers/dma/sun4i-dma.c | 1 +
+ drivers/dma/tegra20-apb-dma.c | 47 +++--
+ drivers/dma/xilinx/xilinx_vdma.c | 204 ++++++++++---------
+ drivers/spi/spi-rockchip.c | 12 +-
+ include/linux/dmaengine.h | 8 +-
+ 27 files changed, 402 insertions(+), 416 deletions(-)
+Merging net-next/master (d66ab5144221 hv_netvsc: Move subchannel waiting to rndis_filter_device_remove())
+$ git merge net-next/master
+Recorded preimage for 'net/tipc/subscr.c'
+Resolved 'drivers/net/ethernet/mellanox/mlx5/core/en.h' using previous resolution.
+Resolved 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c' using previous resolution.
+Resolved 'drivers/net/ethernet/mellanox/mlx5/core/en_tx.c' using previous resolution.
+Resolved 'drivers/net/vxlan.c' using previous resolution.
+Resolved 'drivers/net/wireless/intel/iwlwifi/mvm/fw.c' using previous resolution.
+Resolved 'include/uapi/linux/bpf.h' using previous resolution.
+Auto-merging net/wireless/sme.c
+Auto-merging net/wireless/nl80211.c
+Auto-merging net/wireless/core.c
+Auto-merging net/tipc/subscr.c
+CONFLICT (content): Merge conflict in net/tipc/subscr.c
+Auto-merging net/tipc/socket.c
+Auto-merging net/sctp/proc.c
+Auto-merging net/sched/act_ipt.c
+Removing net/rds/iw_sysctl.c
+Removing net/rds/iw_stats.c
+Removing net/rds/iw_send.c
+Removing net/rds/iw_ring.c
+Removing net/rds/iw_recv.c
+Removing net/rds/iw_rdma.c
+Removing net/rds/iw_cm.c
+Removing net/rds/iw.h
+Removing net/rds/iw.c
+Auto-merging net/mac80211/rx.c
+Auto-merging net/mac80211/ieee80211_i.h
+Auto-merging net/mac80211/agg-rx.c
+Auto-merging net/ipv6/ip6_tunnel.c
+Auto-merging net/ipv6/ip6_gre.c
+Auto-merging net/ipv4/tcp_metrics.c
+Auto-merging net/ipv4/ip_tunnel.c
+Auto-merging net/ipv4/ip_output.c
+Removing net/ipv4/inet_lro.c
+Auto-merging net/ipv4/igmp.c
+Auto-merging net/core/skbuff.c
+Auto-merging net/core/rtnetlink.c
+Auto-merging net/core/filter.c
+Auto-merging include/uapi/linux/bpf.h
+CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h
+Auto-merging include/linux/stmmac.h
+Auto-merging include/linux/skbuff.h
+Removing include/linux/rfkill-gpio.h
+Auto-merging include/linux/perf_event.h
+Auto-merging include/linux/mlx5/mlx5_ifc.h
+Removing include/linux/inet_lro.h
+Auto-merging drivers/of/of_mdio.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+Auto-merging drivers/net/vxlan.c
+CONFLICT (content): Merge conflict in drivers/net/vxlan.c
+Auto-merging drivers/net/vrf.c
+Auto-merging drivers/net/ppp/ppp_generic.c
+Auto-merging drivers/net/phy/micrel.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+Removing drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h
+Removing drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c
+Removing drivers/net/ethernet/rocker/rocker.c
+Auto-merging drivers/net/ethernet/renesas/sh_eth.c
+Auto-merging drivers/net/ethernet/renesas/ravb_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h
+CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en.h
+Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+Auto-merging drivers/net/ethernet/freescale/gianfar.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.h
+Auto-merging drivers/net/ethernet/cavium/thunder/nic.h
+Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+Auto-merging drivers/net/ethernet/3com/3c59x.c
+Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
+Auto-merging arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+Auto-merging arch/arm/boot/dts/ls1021a.dtsi
+Auto-merging MAINTAINERS
+Removing Documentation/networking/netlink_mmap.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Removing Documentation/ABI/obsolete/sysfs-class-rfkill
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'net/tipc/subscr.c'.
+[master 26d149b0ee77] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/obsolete/sysfs-class-rfkill | 29 -
+ Documentation/ABI/removed/sysfs-class-rfkill | 13 +
+ Documentation/ABI/stable/sysfs-class-rfkill | 27 +-
+ .../ABI/testing/sysfs-class-net-batman-adv | 17 +-
+ .../devicetree/bindings/net/can/ifi_canfd.txt | 15 +
+ .../devicetree/bindings/net/can/rcar_can.txt | 11 +-
+ .../devicetree/bindings/net/can/sja1000.txt | 3 +-
+ Documentation/devicetree/bindings/net/fsl-fec.txt | 3 +
+ Documentation/devicetree/bindings/net/macb.txt | 2 +
+ .../devicetree/bindings/net/micrel-ks8995.txt | 20 +
+ Documentation/devicetree/bindings/net/stmmac.txt | 54 +-
+ .../bindings/net/wireless/ti,wlcore,spi.txt | 36 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/networking/00-INDEX | 2 +
+ Documentation/networking/batman-adv.txt | 2 +-
+ Documentation/networking/checksum-offloads.txt | 119 +
+ Documentation/networking/dsa/dsa.txt | 18 +-
+ Documentation/networking/ip-sysctl.txt | 35 +
+ Documentation/networking/mac80211-injection.txt | 17 +
+ Documentation/networking/netlink_mmap.txt | 332 --
+ Documentation/networking/rds.txt | 4 +-
+ Documentation/rfkill.txt | 2 +
+ MAINTAINERS | 35 +-
+ arch/alpha/include/uapi/asm/socket.h | 2 +
+ arch/arm/boot/dts/ls1021a.dtsi | 12 +
+ arch/arm/mach-tegra/board-paz00.c | 17 +-
+ arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 8 +-
+ arch/arm64/boot/dts/apm/apm-storm.dtsi | 8 +-
+ arch/avr32/include/uapi/asm/socket.h | 2 +
+ arch/frv/include/uapi/asm/socket.h | 2 +
+ arch/ia64/include/uapi/asm/socket.h | 2 +
+ arch/m32r/include/uapi/asm/socket.h | 2 +
+ arch/mips/include/uapi/asm/socket.h | 2 +
+ arch/mips/txx9/generic/setup_tx4939.c | 7 +-
+ arch/mn10300/include/uapi/asm/socket.h | 2 +
+ arch/parisc/include/uapi/asm/socket.h | 2 +
+ arch/powerpc/include/uapi/asm/socket.h | 2 +
+ arch/s390/include/uapi/asm/socket.h | 2 +
+ arch/sparc/include/uapi/asm/socket.h | 2 +
+ arch/x86/include/asm/stacktrace.h | 2 +-
+ arch/x86/kernel/cpu/perf_event.c | 4 +-
+ arch/x86/kernel/dumpstack.c | 6 +-
+ arch/x86/kernel/stacktrace.c | 18 +-
+ arch/x86/oprofile/backtrace.c | 3 +-
+ arch/xtensa/include/uapi/asm/socket.h | 2 +
+ drivers/bcma/bcma_private.h | 1 -
+ drivers/bcma/driver_chipcommon.c | 16 +-
+ drivers/bcma/driver_chipcommon_pmu.c | 94 +-
+ drivers/bcma/driver_chipcommon_sflash.c | 1 +
+ drivers/bcma/driver_gpio.c | 1 +
+ drivers/bcma/driver_mips.c | 3 -
+ drivers/bcma/host_pci.c | 2 +-
+ drivers/bcma/scan.c | 5 +
+ drivers/bluetooth/Kconfig | 11 +
+ drivers/bluetooth/Makefile | 1 +
+ drivers/bluetooth/ath3k.c | 7 +
+ drivers/bluetooth/btbcm.c | 3 +-
+ drivers/bluetooth/btusb.c | 3 +
+ drivers/bluetooth/hci_ag6xx.c | 337 ++
+ drivers/bluetooth/hci_bcm.c | 2 +
+ drivers/bluetooth/hci_intel.c | 4 +-
+ drivers/bluetooth/hci_ldisc.c | 6 +
+ drivers/bluetooth/hci_uart.h | 8 +-
+ .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 20 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 54 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 81 +-
+ drivers/infiniband/hw/mlx4/Kconfig | 1 +
+ drivers/infiniband/hw/mlx4/main.c | 7 +
+ drivers/infiniband/hw/mlx5/main.c | 1 +
+ drivers/infiniband/hw/nes/Kconfig | 1 -
+ drivers/infiniband/hw/nes/nes_hw.c | 44 +-
+ drivers/infiniband/hw/nes/nes_hw.h | 7 -
+ drivers/infiniband/hw/nes/nes_nic.c | 7 -
+ drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 10 +-
+ drivers/isdn/hardware/eicon/debug.c | 4 -
+ drivers/isdn/hardware/eicon/divamnt.c | 30 +-
+ drivers/net/bonding/bond_3ad.c | 44 +-
+ drivers/net/bonding/bond_alb.c | 2 +-
+ drivers/net/bonding/bond_main.c | 38 +-
+ drivers/net/bonding/bond_options.c | 7 +-
+ drivers/net/can/Kconfig | 64 +-
+ drivers/net/can/Makefile | 17 +-
+ drivers/net/can/ifi_canfd/Kconfig | 8 +
+ drivers/net/can/ifi_canfd/Makefile | 5 +
+ drivers/net/can/ifi_canfd/ifi_canfd.c | 917 ++++
+ drivers/net/can/rcar_can.c | 2 +
+ drivers/net/can/sja1000/sja1000_platform.c | 87 +-
+ drivers/net/can/usb/ems_usb.c | 8 +-
+ drivers/net/dsa/bcm_sf2.c | 12 +-
+ drivers/net/dsa/bcm_sf2.h | 2 +
+ drivers/net/dsa/mv88e6171.c | 4 +-
+ drivers/net/dsa/mv88e6352.c | 4 +-
+ drivers/net/dsa/mv88e6xxx.c | 622 ++-
+ drivers/net/dsa/mv88e6xxx.h | 25 +-
+ drivers/net/ethernet/3com/3c59x.c | 12 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-common.h | 10 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-dcb.c | 39 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 388 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 42 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 16 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-main.c | 6 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 53 +-
+ drivers/net/ethernet/amd/xgbe/xgbe.h | 11 +-
+ drivers/net/ethernet/apm/xgene/Makefile | 3 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_cle.c | 734 +++
+ drivers/net/ethernet/apm/xgene/xgene_enet_cle.h | 295 ++
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 12 +
+ drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 6 +
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 482 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 35 +-
+ drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 12 +
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 4 -
+ drivers/net/ethernet/broadcom/Kconfig | 10 +
+ drivers/net/ethernet/broadcom/bgmac.c | 36 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 19 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 9 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 13 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 57 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 5 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 9 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 181 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 175 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 35 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 126 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h | 14 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 63 +-
+ drivers/net/ethernet/cadence/macb.c | 67 +-
+ drivers/net/ethernet/cadence/macb.h | 4 +
+ drivers/net/ethernet/cavium/thunder/nic.h | 4 +
+ .../net/ethernet/cavium/thunder/nicvf_ethtool.c | 2 +
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 40 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 5 +-
+ drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 38 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 27 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 138 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 14 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 92 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 2 +
+ drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 8 +
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 164 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 55 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 21 +
+ drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 143 +-
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 14 +-
+ drivers/net/ethernet/emulex/benet/be.h | 35 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 133 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 48 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 23 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 196 +-
+ drivers/net/ethernet/ezchip/nps_enet.c | 222 +-
+ drivers/net/ethernet/ezchip/nps_enet.h | 348 +-
+ drivers/net/ethernet/freescale/fec.h | 38 +-
+ drivers/net/ethernet/freescale/fec_main.c | 404 +-
+ drivers/net/ethernet/freescale/gianfar.c | 104 +-
+ drivers/net/ethernet/freescale/gianfar_ptp.c | 33 +-
+ drivers/net/ethernet/intel/e1000e/hw.h | 4 +
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 30 +-
+ drivers/net/ethernet/intel/e1000e/ich8lan.h | 7 +
+ drivers/net/ethernet/intel/e1000e/netdev.c | 4 +
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 10 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 11 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 45 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 20 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 87 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 776 ++-
+ drivers/net/ethernet/intel/i40e/i40e_dcb.c | 27 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 328 +-
+ drivers/net/ethernet/intel/i40e/i40e_devids.h | 6 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 296 +-
+ drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 30 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 422 +-
+ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 5 +-
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 39 +-
+ drivers/net/ethernet/intel/i40e/i40e_register.h | 48 +
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 873 ++--
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 85 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 20 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 36 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 +-
+ drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 5 +-
+ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 87 +-
+ drivers/net/ethernet/intel/i40evf/i40e_common.c | 125 +
+ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 15 +
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 821 +--
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 76 +-
+ drivers/net/ethernet/intel/i40evf/i40evf.h | 7 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 124 +-
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 121 +-
+ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 6 +
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 41 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.h | 4 +-
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 3 +-
+ drivers/net/ethernet/intel/igb/e1000_hw.h | 4 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.c | 213 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.h | 5 +-
+ drivers/net/ethernet/intel/igb/e1000_mbx.c | 18 +-
+ drivers/net/ethernet/intel/igb/igb.h | 4 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 957 ++--
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 3 +-
+ drivers/net/ethernet/intel/igbvf/mbx.c | 20 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 143 +-
+ drivers/net/ethernet/intel/igbvf/vf.h | 1 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 7 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 275 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_model.h | 112 +
+ drivers/net/ethernet/mellanox/mlx4/Kconfig | 1 +
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 357 +-
+ drivers/net/ethernet/mellanox/mlx4/en_main.c | 1 +
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 21 +-
+ drivers/net/ethernet/mellanox/mlx4/intf.c | 9 +
+ drivers/net/ethernet/mellanox/mlx4/main.c | 128 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 12 +
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 67 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 302 ++
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 152 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 271 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 42 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 5 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 28 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 221 +
+ drivers/net/ethernet/mellanox/mlx5/core/uar.c | 29 +-
+ drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 170 +
+ drivers/net/ethernet/mellanox/mlx5/core/vxlan.h | 54 +
+ drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 55 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/port.h | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 272 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 10 +-
+ drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 20 +
+ drivers/net/ethernet/nvidia/forcedeth.c | 8 +-
+ drivers/net/ethernet/pasemi/Kconfig | 5 +-
+ drivers/net/ethernet/pasemi/pasemi_mac.c | 50 +-
+ drivers/net/ethernet/pasemi/pasemi_mac.h | 4 -
+ drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c | 1 -
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 10 +-
+ drivers/net/ethernet/qlogic/qed/qed.h | 48 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 5 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 519 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 11 +-
+ drivers/net/ethernet/qlogic/qed/qed_hsi.h | 2704 +++++-----
+ drivers/net/ethernet/qlogic/qed/qed_hw.c | 2 +-
+ .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 22 +-
+ drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 155 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.c | 2221 +++++++-
+ drivers/net/ethernet/qlogic/qed/qed_int.h | 6 +-
+ drivers/net/ethernet/qlogic/qed/qed_l2.c | 586 ++-
+ drivers/net/ethernet/qlogic/qed/qed_main.c | 46 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 43 +-
+ drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 60 +
+ drivers/net/ethernet/qlogic/qed/qed_sp.h | 13 +-
+ drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 81 +-
+ drivers/net/ethernet/qlogic/qed/qed_spq.c | 15 +-
+ drivers/net/ethernet/qlogic/qede/qede.h | 40 +-
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 6 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 987 +++-
+ drivers/net/ethernet/renesas/Kconfig | 4 +-
+ drivers/net/ethernet/renesas/ravb.h | 4 +-
+ drivers/net/ethernet/renesas/ravb_main.c | 70 +-
+ drivers/net/ethernet/renesas/ravb_ptp.c | 25 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 65 +-
+ drivers/net/ethernet/rocker/Makefile | 1 +
+ drivers/net/ethernet/rocker/rocker.c | 5495 --------------------
+ drivers/net/ethernet/rocker/rocker.h | 583 +--
+ drivers/net/ethernet/rocker/rocker_hw.h | 467 ++
+ drivers/net/ethernet/rocker/rocker_main.c | 2909 +++++++++++
+ drivers/net/ethernet/rocker/rocker_ofdpa.c | 2952 +++++++++++
+ drivers/net/ethernet/rocker/rocker_tlv.c | 53 +
+ drivers/net/ethernet/rocker/rocker_tlv.h | 201 +
+ drivers/net/ethernet/samsung/sxgbe/Makefile | 2 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c | 91 -
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h | 38 -
+ drivers/net/ethernet/sfc/efx.h | 3 +-
+ drivers/net/ethernet/sfc/ethtool.c | 184 +
+ drivers/net/ethernet/sfc/tx.c | 10 +-
+ drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 37 +-
+ drivers/net/ethernet/stmicro/stmmac/common.h | 39 +-
+ drivers/net/ethernet/stmicro/stmmac/descs.h | 330 +-
+ drivers/net/ethernet/stmicro/stmmac/descs_com.h | 77 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac100.h | 1 -
+ drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 3 +-
+ .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 111 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 22 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 39 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 21 +
+ drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 226 +-
+ drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 150 +-
+ drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 32 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 9 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 41 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 473 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 42 +-
+ drivers/net/ethernet/sun/sunvnet.c | 24 +-
+ drivers/net/ethernet/ti/netcp_core.c | 14 +-
+ drivers/net/geneve.c | 153 +-
+ drivers/net/hamradio/baycom_ser_fdx.c | 12 +-
+ drivers/net/hamradio/dmascc.c | 13 +-
+ drivers/net/hyperv/hyperv_net.h | 4 +
+ drivers/net/hyperv/netvsc_drv.c | 70 +-
+ drivers/net/hyperv/rndis_filter.c | 19 +-
+ drivers/net/ieee802154/at86rf230.c | 25 +-
+ drivers/net/ieee802154/mrf24j40.c | 1 +
+ drivers/net/ipvlan/ipvlan.h | 10 +-
+ drivers/net/ipvlan/ipvlan_core.c | 46 +-
+ drivers/net/ipvlan/ipvlan_main.c | 20 +-
+ drivers/net/macvlan.c | 10 +-
+ drivers/net/phy/bcm7xxx.c | 60 +-
+ drivers/net/phy/dp83848.c | 88 +-
+ drivers/net/phy/marvell.c | 52 +-
+ drivers/net/phy/micrel.c | 9 +-
+ drivers/net/phy/spi_ks8995.c | 304 +-
+ drivers/net/ppp/ppp_generic.c | 12 +-
+ drivers/net/team/team.c | 18 +-
+ drivers/net/tun.c | 17 +-
+ drivers/net/usb/lan78xx.c | 107 +-
+ drivers/net/usb/lan78xx.h | 1 +
+ drivers/net/veth.c | 26 +
+ drivers/net/virtio_net.c | 62 +
+ drivers/net/vrf.c | 22 +-
+ drivers/net/vxlan.c | 659 ++-
+ drivers/net/wan/lmc/lmc_main.c | 27 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 7 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 7 +-
+ drivers/net/wireless/ath/ath9k/main.c | 8 +-
+ drivers/net/wireless/ath/carl9170/main.c | 8 +-
+ drivers/net/wireless/ath/wcn36xx/main.c | 8 +-
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 10 +
+ drivers/net/wireless/broadcom/b43/main.c | 8 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 23 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 45 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/chip.h | 3 +
+ .../broadcom/brcm80211/brcmfmac/firmware.c | 2 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 13 +-
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +-
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 8 +-
+ drivers/net/wireless/intel/iwlegacy/4965.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/Kconfig | 12 +
+ drivers/net/wireless/intel/iwlwifi/dvm/led.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 20 +-
+ drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 13 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 77 +
+ .../net/wireless/intel/iwlwifi/iwl-fw-error-dump.h | 3 +
+ drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 21 +
+ drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 7 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 20 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 88 +-
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 75 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 58 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h | 1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 42 +-
+ .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 69 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 31 +
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 29 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 43 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 15 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 36 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 8 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 28 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/power.c | 131 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/quota.c | 16 +
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 3 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 13 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 9 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 50 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 17 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 35 +
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 134 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 42 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 536 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 155 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 87 +-
+ drivers/net/wireless/intersil/hostap/hostap_hw.c | 15 +-
+ drivers/net/wireless/mac80211_hwsim.c | 16 +-
+ drivers/net/wireless/marvell/libertas/cfg.c | 38 +
+ drivers/net/wireless/marvell/libertas/cmd.c | 40 +-
+ drivers/net/wireless/marvell/libertas/cmdresp.c | 9 +-
+ drivers/net/wireless/marvell/libertas/dev.h | 1 +
+ drivers/net/wireless/marvell/libertas/if_sdio.c | 2 +-
+ drivers/net/wireless/marvell/libertas/if_usb.c | 1 +
+ drivers/net/wireless/marvell/libertas/main.c | 7 +-
+ drivers/net/wireless/marvell/mwifiex/README | 10 +
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 248 +-
+ drivers/net/wireless/marvell/mwifiex/cmdevt.c | 13 +
+ drivers/net/wireless/marvell/mwifiex/debugfs.c | 51 +-
+ drivers/net/wireless/marvell/mwifiex/decl.h | 24 +
+ drivers/net/wireless/marvell/mwifiex/fw.h | 90 +-
+ drivers/net/wireless/marvell/mwifiex/init.c | 16 +-
+ drivers/net/wireless/marvell/mwifiex/ioctl.h | 5 +
+ drivers/net/wireless/marvell/mwifiex/join.c | 15 +
+ drivers/net/wireless/marvell/mwifiex/main.c | 14 +
+ drivers/net/wireless/marvell/mwifiex/main.h | 44 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 321 +-
+ drivers/net/wireless/marvell/mwifiex/pcie.h | 50 +-
+ drivers/net/wireless/marvell/mwifiex/scan.c | 310 ++
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 35 +-
+ drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 23 +
+ drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 6 +
+ drivers/net/wireless/marvell/mwifiex/sta_event.c | 20 +-
+ drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 33 +-
+ drivers/net/wireless/marvell/mwifiex/wmm.c | 7 +-
+ drivers/net/wireless/marvell/mwl8k.c | 10 +-
+ drivers/net/wireless/mediatek/mt7601u/main.c | 8 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 4 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00.h | 18 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 4 +-
+ drivers/net/wireless/ralink/rt2x00/rt61pci.h | 20 +-
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 6 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c | 8 +-
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 19 +-
+ drivers/net/wireless/st/cw1200/sta.c | 4 +-
+ drivers/net/wireless/st/cw1200/sta.h | 4 +-
+ drivers/net/wireless/ti/wlcore/Kconfig | 2 +-
+ drivers/net/wireless/ti/wlcore/event.c | 2 +-
+ drivers/net/wireless/ti/wlcore/main.c | 8 +-
+ drivers/net/wireless/ti/wlcore/spi.c | 86 +-
+ drivers/net/xen-netback/common.h | 1 +
+ drivers/net/xen-netback/xenbus.c | 89 +-
+ drivers/of/of_mdio.c | 4 +-
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 +-
+ drivers/scsi/fcoe/fcoe_transport.c | 36 +-
+ drivers/staging/vt6655/rxtx.c | 12 +-
+ drivers/staging/vt6656/rxtx.c | 12 +-
+ include/linux/bcma/bcma.h | 3 +
+ include/linux/bcma/bcma_driver_chipcommon.h | 31 +-
+ include/linux/bitmap.h | 10 +
+ include/linux/bpf.h | 26 +
+ include/linux/ethtool.h | 102 +-
+ include/linux/ieee80211.h | 26 +
+ include/linux/if_team.h | 1 +
+ include/linux/igmp.h | 5 -
+ include/linux/inet_lro.h | 142 -
+ include/linux/ipv6.h | 3 +
+ include/linux/kernel.h | 2 +-
+ include/linux/mlx4/driver.h | 3 +
+ include/linux/mlx5/device.h | 17 +
+ include/linux/mlx5/driver.h | 40 +-
+ include/linux/mlx5/mlx5_ifc.h | 109 +-
+ include/linux/mlx5/port.h | 87 +
+ include/linux/netdev_features.h | 3 +
+ include/linux/netdevice.h | 69 +-
+ include/linux/netfilter/nfnetlink.h | 2 -
+ include/linux/netlink.h | 10 -
+ include/linux/perf_event.h | 13 +-
+ include/linux/qed/common_hsi.h | 36 +-
+ include/linux/qed/eth_common.h | 171 +-
+ include/linux/qed/qed_chain.h | 4 +
+ include/linux/qed/qed_eth_if.h | 14 +-
+ include/linux/qed/qed_if.h | 14 +-
+ include/linux/rfkill-gpio.h | 37 -
+ include/linux/rfkill.h | 18 +-
+ include/linux/skbuff.h | 69 +-
+ include/linux/stmmac.h | 17 +-
+ include/linux/tcp.h | 8 +-
+ include/net/6lowpan.h | 32 +
+ include/net/act_api.h | 63 +-
+ include/net/addrconf.h | 2 +
+ include/net/bluetooth/hci_core.h | 3 +
+ include/net/bond_3ad.h | 1 +
+ include/net/cfg80211.h | 8 +
+ include/net/codel.h | 4 +
+ include/net/devlink.h | 140 +
+ include/net/dsa.h | 13 +-
+ include/net/dst_cache.h | 97 +
+ include/net/dst_metadata.h | 1 +
+ include/net/genetlink.h | 4 -
+ include/net/inet6_hashtables.h | 13 +-
+ include/net/inet_frag.h | 1 +
+ include/net/inet_hashtables.h | 25 +-
+ include/net/ip.h | 8 +-
+ include/net/ip6_tunnel.h | 14 +-
+ include/net/ip_tunnels.h | 18 +-
+ include/net/ipv6.h | 8 +-
+ include/net/l3mdev.h | 4 +-
+ include/net/lwtunnel.h | 4 +-
+ include/net/mac80211.h | 198 +-
+ include/net/mac802154.h | 5 +-
+ include/net/netns/ipv4.h | 19 +
+ include/net/phonet/phonet.h | 2 +-
+ include/net/ping.h | 2 +-
+ include/net/pkt_cls.h | 51 +
+ include/net/raw.h | 2 +-
+ include/net/route.h | 5 +-
+ include/net/sch_generic.h | 26 +-
+ include/net/sctp/structs.h | 1 -
+ include/net/sock.h | 6 +-
+ include/net/tc_act/tc_gact.h | 16 +
+ include/net/tc_act/tc_ife.h | 61 +
+ include/net/tcp.h | 19 +-
+ include/net/udp.h | 3 +-
+ include/net/udp_tunnel.h | 2 +-
+ include/net/vxlan.h | 186 +-
+ include/rdma/ib_addr.h | 14 +-
+ include/rxrpc/packet.h | 15 +-
+ include/trace/events/sunvnet.h | 139 +
+ include/uapi/asm-generic/socket.h | 2 +
+ include/uapi/linux/bpf.h | 35 +
+ include/uapi/linux/devlink.h | 72 +
+ include/uapi/linux/ethtool.h | 437 +-
+ include/uapi/linux/genetlink.h | 1 +
+ include/uapi/linux/if_bridge.h | 37 +-
+ include/uapi/linux/if_link.h | 12 +
+ include/uapi/linux/ip.h | 2 +
+ include/uapi/linux/ipv6.h | 3 +
+ include/uapi/linux/kernel.h | 1 +
+ include/uapi/linux/mroute6.h | 9 +-
+ include/uapi/linux/netlink.h | 4 +
+ include/uapi/linux/netlink_diag.h | 2 +
+ include/uapi/linux/nl80211.h | 14 +
+ include/uapi/linux/pkt_cls.h | 1 +
+ include/uapi/linux/rfkill.h | 2 +
+ include/uapi/linux/tc_act/tc_ife.h | 38 +
+ include/uapi/linux/tcp.h | 3 +
+ kernel/bpf/Makefile | 3 +
+ kernel/bpf/arraymap.c | 166 +-
+ kernel/bpf/hashtab.c | 346 +-
+ kernel/bpf/stackmap.c | 237 +
+ kernel/bpf/syscall.c | 57 +-
+ kernel/bpf/verifier.c | 48 +-
+ kernel/events/callchain.c | 32 +-
+ kernel/events/internal.h | 2 -
+ kernel/trace/bpf_trace.c | 2 +
+ lib/Kconfig.debug | 8 +
+ lib/Makefile | 1 +
+ lib/bitmap.c | 89 +
+ lib/test_bitmap.c | 358 ++
+ net/6lowpan/core.c | 39 +-
+ net/6lowpan/debugfs.c | 247 +
+ net/6lowpan/iphc.c | 413 +-
+ net/8021q/vlan.c | 1 -
+ net/8021q/vlan_dev.c | 9 +-
+ net/8021q/vlanproc.c | 3 +-
+ net/8021q/vlanproc.h | 4 +-
+ net/Kconfig | 20 +
+ net/batman-adv/Kconfig | 16 +-
+ net/batman-adv/Makefile | 5 +-
+ net/batman-adv/bat_algo.h | 30 +-
+ net/batman-adv/bat_iv_ogm.c | 115 +-
+ net/batman-adv/bat_v.c | 347 ++
+ net/batman-adv/bat_v_elp.c | 515 ++
+ net/batman-adv/bat_v_elp.h | 33 +
+ net/batman-adv/bat_v_ogm.c | 833 +++
+ net/batman-adv/bat_v_ogm.h | 36 +
+ net/batman-adv/bitarray.c | 14 +-
+ net/batman-adv/bitarray.h | 14 +-
+ net/batman-adv/bridge_loop_avoidance.c | 329 +-
+ net/batman-adv/bridge_loop_avoidance.h | 2 +-
+ net/batman-adv/debugfs.c | 8 +-
+ net/batman-adv/debugfs.h | 2 +-
+ net/batman-adv/distributed-arp-table.c | 100 +-
+ net/batman-adv/distributed-arp-table.h | 2 +-
+ net/batman-adv/fragmentation.c | 34 +-
+ net/batman-adv/fragmentation.h | 4 +-
+ net/batman-adv/gateway_client.c | 127 +-
+ net/batman-adv/gateway_client.h | 2 +-
+ net/batman-adv/gateway_common.c | 8 +-
+ net/batman-adv/gateway_common.h | 4 +-
+ net/batman-adv/hard-interface.c | 54 +-
+ net/batman-adv/hard-interface.h | 18 +-
+ net/batman-adv/hash.c | 2 +-
+ net/batman-adv/hash.h | 24 +-
+ net/batman-adv/icmp_socket.c | 10 +-
+ net/batman-adv/icmp_socket.h | 2 +-
+ net/batman-adv/main.c | 112 +-
+ net/batman-adv/main.h | 39 +-
+ net/batman-adv/multicast.c | 44 +-
+ net/batman-adv/multicast.h | 4 +-
+ net/batman-adv/network-coding.c | 164 +-
+ net/batman-adv/network-coding.h | 2 +-
+ net/batman-adv/originator.c | 246 +-
+ net/batman-adv/originator.h | 18 +-
+ net/batman-adv/packet.h | 68 +-
+ net/batman-adv/routing.c | 112 +-
+ net/batman-adv/routing.h | 5 +-
+ net/batman-adv/send.c | 98 +-
+ net/batman-adv/send.h | 16 +-
+ net/batman-adv/soft-interface.c | 73 +-
+ net/batman-adv/soft-interface.h | 4 +-
+ net/batman-adv/sysfs.c | 162 +-
+ net/batman-adv/sysfs.h | 2 +-
+ net/batman-adv/translation-table.c | 331 +-
+ net/batman-adv/translation-table.h | 2 +-
+ net/batman-adv/types.h | 160 +-
+ net/bluetooth/Kconfig | 9 +
+ net/bluetooth/Makefile | 1 +
+ net/bluetooth/hci_core.c | 7 +
+ net/bluetooth/leds.c | 74 +
+ net/bluetooth/leds.h | 16 +
+ net/bridge/br_forward.c | 1 -
+ net/bridge/br_if.c | 43 +-
+ net/bridge/br_mdb.c | 124 +-
+ net/bridge/br_multicast.c | 101 +-
+ net/bridge/br_netlink.c | 1 -
+ net/bridge/br_private.h | 12 +-
+ net/bridge/br_stp.c | 14 +-
+ net/bridge/br_stp_if.c | 2 -
+ net/bridge/br_stp_timer.c | 1 -
+ net/bridge/br_vlan.c | 11 +
+ net/bridge/netfilter/nft_reject_bridge.c | 8 +-
+ net/core/Makefile | 2 +
+ net/core/dev.c | 34 +-
+ net/core/devlink.c | 738 +++
+ net/core/dst.c | 10 +-
+ net/core/dst_cache.c | 168 +
+ net/core/ethtool.c | 638 ++-
+ net/core/filter.c | 107 +-
+ net/core/flow_dissector.c | 45 +-
+ net/core/lwtunnel.c | 37 +
+ net/core/net-sysfs.c | 18 +-
+ net/core/netclassid_cgroup.c | 1 -
+ net/core/netprio_cgroup.c | 1 -
+ net/core/pktgen.c | 4 +-
+ net/core/rtnetlink.c | 79 +-
+ net/core/skbuff.c | 126 +-
+ net/core/sock.c | 5 +
+ net/dccp/ipv4.c | 2 +-
+ net/dccp/ipv6.c | 4 +-
+ net/dsa/slave.c | 138 +-
+ net/ethernet/eth.c | 3 +-
+ net/ieee802154/6lowpan/core.c | 7 +-
+ net/ieee802154/socket.c | 17 +-
+ net/ipv4/Kconfig | 9 +-
+ net/ipv4/Makefile | 1 -
+ net/ipv4/af_inet.c | 45 +-
+ net/ipv4/arp.c | 41 +-
+ net/ipv4/devinet.c | 26 +
+ net/ipv4/fou.c | 14 +-
+ net/ipv4/gre_offload.c | 100 +-
+ net/ipv4/icmp.c | 5 +-
+ net/ipv4/igmp.c | 78 +-
+ net/ipv4/inet_connection_sock.c | 254 +-
+ net/ipv4/inet_diag.c | 6 +-
+ net/ipv4/inet_hashtables.c | 237 +-
+ net/ipv4/inet_lro.c | 374 --
+ net/ipv4/ip_forward.c | 1 -
+ net/ipv4/ip_fragment.c | 29 +-
+ net/ipv4/ip_gre.c | 32 +-
+ net/ipv4/ip_input.c | 30 +-
+ net/ipv4/ip_options.c | 14 +-
+ net/ipv4/ip_output.c | 3 -
+ net/ipv4/ip_sockglue.c | 10 +-
+ net/ipv4/ip_tunnel.c | 78 +-
+ net/ipv4/ip_tunnel_core.c | 30 +-
+ net/ipv4/ipip.c | 4 +-
+ net/ipv4/netfilter/ipt_SYNPROXY.c | 3 +-
+ net/ipv4/ping.c | 11 +-
+ net/ipv4/proc.c | 2 +-
+ net/ipv4/raw.c | 4 +-
+ net/ipv4/syncookies.c | 4 +-
+ net/ipv4/sysctl_net_ipv4.c | 236 +-
+ net/ipv4/tcp.c | 26 +-
+ net/ipv4/tcp_fastopen.c | 70 +-
+ net/ipv4/tcp_input.c | 176 +-
+ net/ipv4/tcp_ipv4.c | 21 +-
+ net/ipv4/tcp_metrics.c | 3 +-
+ net/ipv4/tcp_minisocks.c | 3 -
+ net/ipv4/tcp_offload.c | 8 +-
+ net/ipv4/tcp_output.c | 6 +-
+ net/ipv4/tcp_probe.c | 8 +-
+ net/ipv4/tcp_timer.c | 23 +-
+ net/ipv4/udp.c | 32 +-
+ net/ipv4/udp_offload.c | 102 +-
+ net/ipv6/Kconfig | 1 +
+ net/ipv6/addrconf.c | 170 +-
+ net/ipv6/af_inet6.c | 6 +-
+ net/ipv6/ila/ila_common.c | 1 +
+ net/ipv6/inet6_connection_sock.c | 2 +
+ net/ipv6/inet6_hashtables.c | 78 +-
+ net/ipv6/ip6_checksum.c | 23 +-
+ net/ipv6/ip6_gre.c | 12 +-
+ net/ipv6/ip6_input.c | 12 +-
+ net/ipv6/ip6_output.c | 1 -
+ net/ipv6/ip6_tunnel.c | 103 +-
+ net/ipv6/ip6_vti.c | 2 +-
+ net/ipv6/ndisc.c | 9 +
+ net/ipv6/reassembly.c | 6 +-
+ net/ipv6/sit.c | 23 +-
+ net/ipv6/syncookies.c | 2 +-
+ net/ipv6/tcp_ipv6.c | 10 +-
+ net/ipv6/udp.c | 64 +-
+ net/ipv6/udp_offload.c | 8 +-
+ net/l2tp/l2tp_ip6.c | 3 +-
+ net/l3mdev/l3mdev.c | 11 +-
+ net/llc/af_llc.c | 4 +-
+ net/mac80211/agg-rx.c | 50 +-
+ net/mac80211/agg-tx.c | 53 +-
+ net/mac80211/cfg.c | 34 +-
+ net/mac80211/chan.c | 2 +-
+ net/mac80211/debugfs.c | 1 +
+ net/mac80211/debugfs_key.c | 5 +-
+ net/mac80211/driver-ops.c | 10 +-
+ net/mac80211/driver-ops.h | 4 +-
+ net/mac80211/ht.c | 5 +
+ net/mac80211/ibss.c | 32 +-
+ net/mac80211/ieee80211_i.h | 37 +-
+ net/mac80211/iface.c | 14 +
+ net/mac80211/key.c | 86 -
+ net/mac80211/key.h | 10 +-
+ net/mac80211/mesh.c | 9 +-
+ net/mac80211/mesh.h | 3 -
+ net/mac80211/mesh_hwmp.c | 6 +-
+ net/mac80211/mesh_pathtbl.c | 111 +-
+ net/mac80211/mesh_plink.c | 10 +-
+ net/mac80211/mlme.c | 79 +-
+ net/mac80211/rx.c | 141 +-
+ net/mac80211/sta_info.c | 35 +-
+ net/mac80211/sta_info.h | 24 +-
+ net/mac80211/status.c | 2 +-
+ net/mac80211/tkip.c | 36 +-
+ net/mac80211/tkip.h | 2 -
+ net/mac80211/trace.h | 43 +-
+ net/mac80211/tx.c | 100 +-
+ net/mac80211/util.c | 116 +-
+ net/mac80211/vht.c | 57 +
+ net/mac80211/wpa.c | 11 +-
+ net/mac802154/main.c | 2 +-
+ net/mpls/mpls_iptunnel.c | 1 +
+ net/netfilter/ipvs/ip_vs_xmit.c | 12 +-
+ net/netfilter/nf_dup_netdev.c | 1 -
+ net/netfilter/nfnetlink.c | 7 -
+ net/netfilter/nfnetlink_log.c | 5 +-
+ net/netfilter/nfnetlink_queue.c | 6 +-
+ net/netfilter/xt_TPROXY.c | 31 +-
+ net/netfilter/xt_socket.c | 28 +-
+ net/netlabel/netlabel_domainhash.c | 4 +-
+ net/netlabel/netlabel_unlabeled.c | 6 +-
+ net/netlink/Kconfig | 9 -
+ net/netlink/af_netlink.c | 774 +--
+ net/netlink/af_netlink.h | 15 -
+ net/netlink/diag.c | 39 -
+ net/netlink/genetlink.c | 25 +-
+ net/openvswitch/Kconfig | 1 +
+ net/openvswitch/actions.c | 8 +-
+ net/openvswitch/datapath.c | 80 +-
+ net/openvswitch/datapath.h | 4 +
+ net/openvswitch/flow_netlink.c | 6 +
+ net/openvswitch/vport-internal_dev.c | 10 +-
+ net/openvswitch/vport-netdev.c | 2 +-
+ net/openvswitch/vport.h | 7 -
+ net/packet/af_packet.c | 451 +-
+ net/phonet/socket.c | 6 +-
+ net/rds/Kconfig | 7 +-
+ net/rds/Makefile | 4 +-
+ net/rds/af_rds.c | 26 +
+ net/rds/ib.c | 47 +-
+ net/rds/ib.h | 37 +-
+ net/rds/ib_cm.c | 59 +-
+ net/rds/ib_fmr.c | 248 +
+ net/rds/ib_frmr.c | 376 ++
+ net/rds/ib_mr.h | 148 +
+ net/rds/ib_rdma.c | 495 +-
+ net/rds/ib_send.c | 6 +-
+ net/rds/ib_stats.c | 2 +
+ net/rds/iw.c | 312 --
+ net/rds/iw.h | 398 --
+ net/rds/iw_cm.c | 769 ---
+ net/rds/iw_rdma.c | 837 ---
+ net/rds/iw_recv.c | 904 ----
+ net/rds/iw_ring.c | 169 -
+ net/rds/iw_send.c | 981 ----
+ net/rds/iw_stats.c | 95 -
+ net/rds/iw_sysctl.c | 123 -
+ net/rds/rdma_transport.c | 21 +-
+ net/rds/rdma_transport.h | 5 -
+ net/rds/rds.h | 1 +
+ net/rds/recv.c | 20 +-
+ net/rds/tcp.c | 1 -
+ net/rfkill/Kconfig | 3 +-
+ net/rfkill/core.c | 172 +-
+ net/rfkill/rfkill-gpio.c | 24 +-
+ net/rxrpc/af_rxrpc.c | 39 +-
+ net/rxrpc/ar-accept.c | 56 +-
+ net/rxrpc/ar-ack.c | 213 +-
+ net/rxrpc/ar-call.c | 84 +-
+ net/rxrpc/ar-connection.c | 83 +-
+ net/rxrpc/ar-connevent.c | 79 +-
+ net/rxrpc/ar-error.c | 13 +-
+ net/rxrpc/ar-input.c | 118 +-
+ net/rxrpc/ar-internal.h | 196 +-
+ net/rxrpc/ar-local.c | 29 +-
+ net/rxrpc/ar-output.c | 73 +-
+ net/rxrpc/ar-peer.c | 2 +-
+ net/rxrpc/ar-proc.c | 10 +-
+ net/rxrpc/ar-recvmsg.c | 20 +-
+ net/rxrpc/ar-security.c | 6 +-
+ net/rxrpc/ar-skbuff.c | 7 +-
+ net/rxrpc/ar-transport.c | 1 +
+ net/rxrpc/rxkad.c | 165 +-
+ net/rxrpc/sysctl.c | 2 +-
+ net/sched/Kconfig | 22 +
+ net/sched/Makefile | 3 +
+ net/sched/act_api.c | 137 +-
+ net/sched/act_bpf.c | 52 +-
+ net/sched/act_connmark.c | 54 +-
+ net/sched/act_csum.c | 67 +-
+ net/sched/act_gact.c | 55 +-
+ net/sched/act_ife.c | 870 ++++
+ net/sched/act_ipt.c | 127 +-
+ net/sched/act_meta_mark.c | 79 +
+ net/sched/act_meta_skbprio.c | 76 +
+ net/sched/act_mirred.c | 55 +-
+ net/sched/act_nat.c | 72 +-
+ net/sched/act_pedit.c | 54 +-
+ net/sched/act_police.c | 52 +-
+ net/sched/act_simple.c | 55 +-
+ net/sched/act_skbedit.c | 54 +-
+ net/sched/act_vlan.c | 54 +-
+ net/sched/cls_u32.c | 118 +-
+ net/sched/sch_api.c | 10 +-
+ net/sched/sch_cbq.c | 12 +-
+ net/sched/sch_choke.c | 6 +-
+ net/sched/sch_codel.c | 10 +-
+ net/sched/sch_drr.c | 9 +-
+ net/sched/sch_dsmark.c | 11 +-
+ net/sched/sch_fq.c | 4 +-
+ net/sched/sch_fq_codel.c | 17 +-
+ net/sched/sch_generic.c | 1 +
+ net/sched/sch_hfsc.c | 9 +-
+ net/sched/sch_hhf.c | 10 +-
+ net/sched/sch_htb.c | 24 +-
+ net/sched/sch_mq.c | 2 +-
+ net/sched/sch_mqprio.c | 11 +-
+ net/sched/sch_multiq.c | 16 +-
+ net/sched/sch_netem.c | 13 +-
+ net/sched/sch_pie.c | 5 +-
+ net/sched/sch_prio.c | 15 +-
+ net/sched/sch_qfq.c | 9 +-
+ net/sched/sch_red.c | 10 +-
+ net/sched/sch_sfb.c | 10 +-
+ net/sched/sch_sfq.c | 16 +-
+ net/sched/sch_tbf.c | 15 +-
+ net/sctp/chunk.c | 13 -
+ net/sctp/input.c | 4 +-
+ net/sctp/probe.c | 10 +-
+ net/sctp/proc.c | 2 -
+ net/sctp/socket.c | 3 +-
+ net/tipc/bcast.c | 5 -
+ net/tipc/bcast.h | 1 -
+ net/tipc/bearer.c | 18 +-
+ net/tipc/link.c | 167 +-
+ net/tipc/link.h | 7 +-
+ net/tipc/name_table.c | 20 +-
+ net/tipc/net.c | 7 +-
+ net/tipc/netlink.c | 69 +
+ net/tipc/netlink.h | 11 +
+ net/tipc/netlink_compat.c | 2 +-
+ net/tipc/node.c | 130 +-
+ net/tipc/server.c | 4 +-
+ net/tipc/socket.c | 9 +-
+ net/tipc/subscr.c | 131 +-
+ net/tipc/subscr.h | 11 +-
+ net/tipc/udp_media.c | 40 +-
+ net/unix/af_unix.c | 5 +-
+ net/wireless/Kconfig | 25 +-
+ net/wireless/core.c | 10 +
+ net/wireless/mlme.c | 3 +-
+ net/wireless/nl80211.c | 29 +-
+ net/wireless/radiotap.c | 1 +
+ net/wireless/reg.c | 122 +-
+ net/wireless/sme.c | 9 +-
+ net/wireless/util.c | 277 +-
+ samples/bpf/Makefile | 4 +
+ samples/bpf/bpf_helpers.h | 2 +
+ samples/bpf/offwaketime_kern.c | 131 +
+ samples/bpf/offwaketime_user.c | 185 +
+ samples/bpf/test_maps.c | 188 +
+ samples/bpf/tracex2_kern.c | 2 +-
+ samples/bpf/tracex2_user.c | 7 +-
+ samples/bpf/tracex3_kern.c | 8 +-
+ samples/bpf/tracex3_user.c | 21 +-
+ tools/net/bpf_dbg.c | 10 +-
+ tools/net/bpf_exp.l | 84 +-
+ tools/net/bpf_exp.y | 146 +-
+ tools/testing/selftests/lib/Makefile | 2 +-
+ tools/testing/selftests/lib/bitmap.sh | 10 +
+ tools/testing/selftests/net/.gitignore | 1 +
+ tools/testing/selftests/net/Makefile | 2 +-
+ tools/testing/selftests/net/reuseport_bpf.c | 117 +-
+ tools/testing/selftests/net/reuseport_bpf_cpu.c | 258 +
+ 899 files changed, 47944 insertions(+), 27461 deletions(-)
+ delete mode 100644 Documentation/ABI/obsolete/sysfs-class-rfkill
+ create mode 100644 Documentation/ABI/removed/sysfs-class-rfkill
+ create mode 100644 Documentation/devicetree/bindings/net/can/ifi_canfd.txt
+ create mode 100644 Documentation/devicetree/bindings/net/micrel-ks8995.txt
+ create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt
+ create mode 100644 Documentation/networking/checksum-offloads.txt
+ delete mode 100644 Documentation/networking/netlink_mmap.txt
+ create mode 100644 drivers/bluetooth/hci_ag6xx.c
+ create mode 100644 drivers/net/can/ifi_canfd/Kconfig
+ create mode 100644 drivers/net/can/ifi_canfd/Makefile
+ create mode 100644 drivers/net/can/ifi_canfd/ifi_canfd.c
+ create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_cle.c
+ create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_cle.h
+ create mode 100644 drivers/net/ethernet/intel/ixgbe/ixgbe_model.h
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/vxlan.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/vxlan.h
+ delete mode 100644 drivers/net/ethernet/rocker/rocker.c
+ create mode 100644 drivers/net/ethernet/rocker/rocker_hw.h
+ create mode 100644 drivers/net/ethernet/rocker/rocker_main.c
+ create mode 100644 drivers/net/ethernet/rocker/rocker_ofdpa.c
+ create mode 100644 drivers/net/ethernet/rocker/rocker_tlv.c
+ create mode 100644 drivers/net/ethernet/rocker/rocker_tlv.h
+ delete mode 100644 drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c
+ delete mode 100644 drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h
+ delete mode 100644 include/linux/inet_lro.h
+ create mode 100644 include/linux/mlx5/port.h
+ delete mode 100644 include/linux/rfkill-gpio.h
+ create mode 100644 include/net/devlink.h
+ create mode 100644 include/net/dst_cache.h
+ create mode 100644 include/net/tc_act/tc_ife.h
+ create mode 100644 include/trace/events/sunvnet.h
+ create mode 100644 include/uapi/linux/devlink.h
+ create mode 100644 include/uapi/linux/tc_act/tc_ife.h
+ create mode 100644 kernel/bpf/stackmap.c
+ create mode 100644 lib/test_bitmap.c
+ create mode 100644 net/batman-adv/bat_v.c
+ create mode 100644 net/batman-adv/bat_v_elp.c
+ create mode 100644 net/batman-adv/bat_v_elp.h
+ create mode 100644 net/batman-adv/bat_v_ogm.c
+ create mode 100644 net/batman-adv/bat_v_ogm.h
+ create mode 100644 net/bluetooth/leds.c
+ create mode 100644 net/bluetooth/leds.h
+ create mode 100644 net/core/devlink.c
+ create mode 100644 net/core/dst_cache.c
+ delete mode 100644 net/ipv4/inet_lro.c
+ create mode 100644 net/rds/ib_fmr.c
+ create mode 100644 net/rds/ib_frmr.c
+ create mode 100644 net/rds/ib_mr.h
+ delete mode 100644 net/rds/iw.c
+ delete mode 100644 net/rds/iw.h
+ delete mode 100644 net/rds/iw_cm.c
+ delete mode 100644 net/rds/iw_rdma.c
+ delete mode 100644 net/rds/iw_recv.c
+ delete mode 100644 net/rds/iw_ring.c
+ delete mode 100644 net/rds/iw_send.c
+ delete mode 100644 net/rds/iw_stats.c
+ delete mode 100644 net/rds/iw_sysctl.c
+ create mode 100644 net/sched/act_ife.c
+ create mode 100644 net/sched/act_meta_mark.c
+ create mode 100644 net/sched/act_meta_skbprio.c
+ create mode 100644 samples/bpf/offwaketime_kern.c
+ create mode 100644 samples/bpf/offwaketime_user.c
+ create mode 100755 tools/testing/selftests/lib/bitmap.sh
+ create mode 100644 tools/testing/selftests/net/reuseport_bpf_cpu.c
+Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
+$ git merge ipvs-next/master
+Merge made by the 'recursive' strategy.
+ net/netfilter/ipvs/ip_vs_app.c | 8 ++------
+ net/netfilter/ipvs/ip_vs_ctl.c | 17 ++++++-----------
+ 2 files changed, 8 insertions(+), 17 deletions(-)
+Merging wireless-drivers-next/master (739596b09b01 Merge tag 'iwlwifi-next-for-kalle-2016-03-02' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
+$ git merge wireless-drivers-next/master
+Removing include/linux/platform_data/brcmfmac-sdio.h
+Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+Merge made by the 'recursive' strategy.
+ .../bindings/net/wireless/qcom,ath10k.txt | 89 +-
+ drivers/bcma/Kconfig | 5 +
+ drivers/bcma/Makefile | 1 +
+ drivers/bcma/bcma_private.h | 18 +-
+ drivers/bcma/driver_chipcommon.c | 30 +
+ drivers/bcma/driver_chipcommon_pflash.c | 49 ++
+ drivers/bcma/driver_mips.c | 63 +-
+ drivers/bcma/main.c | 2 +-
+ drivers/net/wireless/ath/ath10k/Kconfig | 6 +
+ drivers/net/wireless/ath/ath10k/Makefile | 2 +
+ drivers/net/wireless/ath/ath10k/ahb.c | 933 +++++++++++++++++++++
+ drivers/net/wireless/ath/ath10k/ahb.h | 87 ++
+ drivers/net/wireless/ath/ath10k/core.c | 48 +-
+ drivers/net/wireless/ath/ath10k/core.h | 20 +
+ drivers/net/wireless/ath/ath10k/debug.c | 46 +-
+ drivers/net/wireless/ath/ath10k/debug.h | 7 +
+ drivers/net/wireless/ath/ath10k/debugfs_sta.c | 41 +
+ drivers/net/wireless/ath/ath10k/htt.c | 8 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 169 +++-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 54 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 146 +++-
+ drivers/net/wireless/ath/ath10k/hw.c | 39 +
+ drivers/net/wireless/ath/ath10k/hw.h | 24 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 57 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 171 ++--
+ drivers/net/wireless/ath/ath10k/pci.h | 49 ++
+ drivers/net/wireless/ath/ath10k/targaddrs.h | 3 +
+ drivers/net/wireless/ath/ath10k/trace.h | 15 +-
+ drivers/net/wireless/ath/ath10k/wmi-ops.h | 11 +
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 1 +
+ drivers/net/wireless/ath/ath10k/wmi.c | 162 +++-
+ drivers/net/wireless/ath/ath10k/wmi.h | 92 +-
+ drivers/net/wireless/ath/ath9k/ani.c | 36 +-
+ drivers/net/wireless/ath/ath9k/ar9003_aic.c | 79 +-
+ drivers/net/wireless/ath/ath9k/ar9003_aic.h | 1 -
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 6 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 3 +
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 12 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 3 +
+ drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 65 ++
+ drivers/net/wireless/ath/ath9k/calib.c | 38 +-
+ drivers/net/wireless/ath/ath9k/channel.c | 4 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +
+ drivers/net/wireless/ath/ath9k/hw.c | 10 +
+ drivers/net/wireless/ath/ath9k/init.c | 25 +-
+ drivers/net/wireless/ath/ath9k/main.c | 5 +-
+ drivers/net/wireless/ath/ath9k/reg.h | 4 +-
+ drivers/net/wireless/ath/carl9170/fwcmd.h | 8 +
+ drivers/net/wireless/ath/carl9170/fwdesc.h | 6 +
+ drivers/net/wireless/ath/carl9170/hw.h | 73 +-
+ drivers/net/wireless/ath/carl9170/version.h | 6 +-
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 162 +++-
+ drivers/net/wireless/ath/wil6210/debugfs.c | 6 +-
+ drivers/net/wireless/ath/wil6210/main.c | 112 ++-
+ drivers/net/wireless/ath/wil6210/netdev.c | 5 +-
+ drivers/net/wireless/ath/wil6210/txrx.c | 46 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h | 11 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 174 ++--
+ drivers/net/wireless/atmel/at76c50x-usb.c | 2 -
+ drivers/net/wireless/broadcom/b43/main.c | 6 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 105 +--
+ .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 4 +-
+ .../broadcom/brcm80211/brcmfmac/cfg80211.c | 617 +++++++++-----
+ .../broadcom/brcm80211/brcmfmac/cfg80211.h | 20 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/common.c | 152 +++-
+ .../wireless/broadcom/brcm80211/brcmfmac/common.h | 43 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/core.c | 180 ++--
+ .../wireless/broadcom/brcm80211/brcmfmac/core.h | 9 +
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 14 +
+ .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 10 +-
+ .../broadcom/brcm80211/brcmfmac/flowring.c | 38 +-
+ .../broadcom/brcm80211/brcmfmac/flowring.h | 20 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 57 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/fweh.h | 68 +-
+ .../broadcom/brcm80211/brcmfmac/fwil_types.h | 29 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 11 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 2 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 22 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/of.h | 4 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 26 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 206 ++---
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 103 ++-
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 2 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 16 +-
+ .../broadcom/brcm80211/include/brcmu_wifi.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 49 ++
+ .../wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 7 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 24 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 10 +
+ drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 1 +
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 24 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 52 ++
+ drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 126 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 28 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 84 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 106 ++-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 92 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 25 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 63 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 146 +++-
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 36 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 34 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 23 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 461 +++++++++-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 186 +++-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 41 +
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 100 ++-
+ drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 206 ++++-
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 277 ++++--
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 10 +-
+ drivers/net/wireless/marvell/mwifiex/11h.c | 6 +-
+ drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/ioctl.h | 6 +
+ drivers/net/wireless/marvell/mwifiex/main.h | 5 +
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/sdio.c | 16 +
+ drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 1 +
+ drivers/net/wireless/marvell/mwifiex/tdls.c | 7 +
+ drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 2 +-
+ drivers/net/wireless/marvell/mwifiex/usb.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/util.c | 20 +
+ drivers/net/wireless/mediatek/mt7601u/mcu.c | 4 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 1 +
+ drivers/net/wireless/ralink/rt2x00/rt2x00debug.c | 5 +-
+ drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 2 +-
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 183 ++--
+ drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 +-
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 55 +-
+ drivers/net/wireless/realtek/rtlwifi/core.c | 60 +-
+ drivers/net/wireless/realtek/rtlwifi/pci.c | 3 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 23 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 12 -
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 6 +-
+ .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.h | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.h | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723be/trx.h | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 18 -
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 27 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 4 +-
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 2 +-
+ drivers/net/wireless/realtek/rtlwifi/wifi.h | 13 +-
+ include/linux/bcma/bcma_driver_chipcommon.h | 11 +-
+ include/linux/platform_data/brcmfmac-sdio.h | 135 ---
+ include/linux/platform_data/brcmfmac.h | 185 ++++
+ 159 files changed, 6406 insertions(+), 1802 deletions(-)
+ create mode 100644 drivers/bcma/driver_chipcommon_pflash.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/ahb.c
+ create mode 100644 drivers/net/wireless/ath/ath10k/ahb.h
+ delete mode 100644 include/linux/platform_data/brcmfmac-sdio.h
+ create mode 100644 include/linux/platform_data/brcmfmac.h
+Merging bluetooth/master (4cf2f03e8f8a 6lowpan: iphc: fix SAM/DAM bit comment)
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/ath3k.c | 2 ++
+ drivers/bluetooth/btusb.c | 1 +
+ drivers/bluetooth/hci_bcm.c | 1 +
+ include/net/mac802154.h | 10 +++++-----
+ net/6lowpan/debugfs.c | 4 ++--
+ net/6lowpan/iphc.c | 4 ++--
+ 6 files changed, 13 insertions(+), 9 deletions(-)
+Merging mac80211-next/master (0a87cadbb54e nl80211: add feature for BSS selection support)
+$ git merge mac80211-next/master
+Auto-merging net/wireless/sme.c
+Auto-merging net/wireless/nl80211.c
+Auto-merging net/wireless/core.c
+Auto-merging net/sctp/proc.c
+Auto-merging net/mac80211/tx.c
+Auto-merging net/mac80211/ieee80211_i.h
+Auto-merging fs/gfs2/glock.c
+Auto-merging drivers/net/wireless/mac80211_hwsim.c
+Auto-merging drivers/net/wireless/ath/ath10k/htt_rx.c
+Merge made by the 'recursive' strategy.
+ Documentation/networking/mac80211-injection.txt | 17 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +-
+ drivers/net/wireless/ath/wcn36xx/txrx.c | 2 +-
+ drivers/net/wireless/mac80211_hwsim.c | 5 +
+ fs/gfs2/glock.c | 4 +-
+ include/linux/rhashtable.h | 3 +-
+ include/net/cfg80211.h | 36 +
+ include/net/mac80211.h | 13 +-
+ include/uapi/linux/nl80211.h | 56 +-
+ lib/rhashtable.c | 6 +-
+ lib/test_rhashtable.c | 2 +-
+ net/ipv6/ila/ila_xlat.c | 3 +-
+ net/mac80211/cfg.c | 4 +-
+ net/mac80211/chan.c | 4 +-
+ net/mac80211/driver-ops.h | 15 +
+ net/mac80211/ieee80211_i.h | 9 +
+ net/mac80211/mesh.c | 12 +-
+ net/mac80211/mesh.h | 38 +-
+ net/mac80211/mesh_pathtbl.c | 950 ++++++++----------------
+ net/mac80211/scan.c | 8 +-
+ net/mac80211/sta_info.c | 9 +-
+ net/mac80211/tdls.c | 40 +-
+ net/mac80211/trace.h | 12 +
+ net/mac80211/tx.c | 44 +-
+ net/mac80211/util.c | 5 +-
+ net/mac80211/vht.c | 30 +-
+ net/mac80211/wpa.c | 26 +-
+ net/netfilter/nft_hash.c | 4 +-
+ net/netlink/af_netlink.c | 3 +-
+ net/rfkill/core.c | 36 +-
+ net/sctp/proc.c | 3 +-
+ net/wireless/core.c | 7 +
+ net/wireless/nl80211.c | 117 +++
+ net/wireless/scan.c | 2 +
+ net/wireless/sme.c | 2 +
+ 35 files changed, 792 insertions(+), 737 deletions(-)
+Merging rdma/for-next (18558cae0272 Linux 4.5-rc4)
+$ git merge rdma/for-next
+Already up-to-date.
+Merging mtd/master (c57753d4541d mtd: nand: tests: fix regression introduced in mtd_nandectest)
+$ git merge mtd/master
+Merge made by the 'recursive' strategy.
+ drivers/mtd/tests/mtd_nandecctest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging l2-mtd/master (9ebfdf5b1849 mtd: nand: check status before reporting timeout)
+$ git merge l2-mtd/master
+Auto-merging fs/jffs2/gc.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/atmel-nand.txt | 31 ++-
+ .../devicetree/bindings/mtd/fsl-quadspi.txt | 5 +-
+ arch/arm/plat-samsung/devs.c | 9 -
+ arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 -
+ drivers/memory/fsl_ifc.c | 2 +-
+ drivers/mtd/Kconfig | 2 +-
+ drivers/mtd/bcm47xxpart.c | 42 +--
+ drivers/mtd/bcm63xxpart.c | 182 ++++++++++---
+ drivers/mtd/devices/mtdram.c | 5 +-
+ drivers/mtd/nand/Kconfig | 3 +
+ drivers/mtd/nand/atmel_nand.c | 89 +++++--
+ drivers/mtd/nand/atmel_nand_ecc.h | 9 +-
+ drivers/mtd/nand/atmel_nand_nfc.h | 3 +-
+ drivers/mtd/nand/brcmnand/brcmnand.c | 34 ++-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 73 +++++-
+ drivers/mtd/nand/jz4740_nand.c | 3 -
+ drivers/mtd/nand/lpc32xx_mlc.c | 2 +-
+ drivers/mtd/nand/mpc5121_nfc.c | 7 +-
+ drivers/mtd/nand/nand_base.c | 4 +-
+ drivers/mtd/nand/nand_bbt.c | 2 -
+ drivers/mtd/nand/nand_ids.c | 4 +-
+ drivers/mtd/nand/nuc900_nand.c | 2 +-
+ drivers/mtd/nand/plat_nand.c | 1 -
+ drivers/mtd/nand/pxa3xx_nand.c | 191 ++++++++------
+ drivers/mtd/nand/s3c2410.c | 3 -
+ drivers/mtd/nand/sunxi_nand.c | 287 +++++++++++++++++++--
+ drivers/mtd/nand/vf610_nfc.c | 2 -
+ drivers/mtd/onenand/onenand_base.c | 3 +-
+ drivers/mtd/onenand/onenand_bbt.c | 5 +-
+ drivers/mtd/spi-nor/Kconfig | 3 +-
+ drivers/mtd/spi-nor/fsl-quadspi.c | 167 +++++++-----
+ drivers/mtd/spi-nor/mtk-quadspi.c | 4 +-
+ drivers/mtd/spi-nor/spi-nor.c | 51 +---
+ drivers/staging/mt29f_spinand/mt29f_spinand.h | 1 -
+ fs/jffs2/gc.c | 64 +++--
+ fs/jffs2/jffs2_fs_sb.h | 2 +-
+ fs/jffs2/nodemgmt.c | 4 +-
+ include/linux/mtd/bbm.h | 1 -
+ include/linux/mtd/inftl.h | 1 -
+ include/linux/mtd/map.h | 7 +-
+ include/linux/mtd/nand.h | 8 +-
+ include/linux/mtd/nftl.h | 1 -
+ include/linux/platform_data/mtd-nand-s3c2410.h | 1 -
+ 43 files changed, 931 insertions(+), 391 deletions(-)
+Merging crypto/master (ce0ae266feaf crypto: ccp - memset request context to zero during import)
+$ git merge crypto/master
+Resolved 'fs/crypto/fname.c' using previous resolution.
+Resolved 'net/ipv4/tcp.c' using previous resolution.
+Resolved 'net/rxrpc/rxkad.c' using previous resolution.
+Auto-merging net/sctp/socket.c
+Auto-merging net/rxrpc/rxkad.c
+CONFLICT (content): Merge conflict in net/rxrpc/rxkad.c
+Auto-merging net/rxrpc/ar-internal.h
+Auto-merging net/ipv6/tcp_ipv6.c
+Auto-merging net/ipv4/tcp_ipv4.c
+Auto-merging net/ipv4/tcp_fastopen.c
+Auto-merging net/ipv4/tcp.c
+CONFLICT (content): Merge conflict in net/ipv4/tcp.c
+Auto-merging net/bluetooth/smp.c
+Auto-merging include/net/tcp.h
+Auto-merging include/net/sctp/structs.h
+Removing include/crypto/internal/compress.h
+Removing include/crypto/compress.h
+CONFLICT (modify/delete): fs/f2fs/f2fs_crypto.h deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/f2fs_crypto.h left in tree.
+CONFLICT (modify/delete): fs/f2fs/crypto_key.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto_key.c left in tree.
+CONFLICT (modify/delete): fs/f2fs/crypto.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto.c left in tree.
+Auto-merging fs/ext4/crypto.c
+Auto-merging fs/ecryptfs/main.c
+Auto-merging fs/crypto/fname.c
+CONFLICT (content): Merge conflict in fs/crypto/fname.c
+Auto-merging fs/cifs/cifsencrypt.c
+Auto-merging drivers/crypto/atmel-sha.c
+Auto-merging drivers/crypto/atmel-aes.c
+Auto-merging drivers/char/hw_random/Kconfig
+Removing crypto/zlib.c
+Auto-merging crypto/shash.c
+Removing crypto/pcompress.c
+Auto-merging crypto/crc32_generic.c
+Auto-merging crypto/Kconfig
+Auto-merging arch/powerpc/crypto/aes-spe-glue.c
+Auto-merging arch/arm64/crypto/aes-glue.c
+Auto-merging arch/arm/crypto/aes-ce-glue.c
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f fs/f2fs/f2fs_crypto.h fs/f2fs/crypto_key.c fs/f2fs/crypto.c
+fs/f2fs/crypto.c: needs merge
+fs/f2fs/crypto_key.c: needs merge
+fs/f2fs/f2fs_crypto.h: needs merge
+rm 'fs/f2fs/crypto.c'
+rm 'fs/f2fs/crypto_key.c'
+rm 'fs/f2fs/f2fs_crypto.h'
+$ git commit -v -a
+[master 180f55dbeecf] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/crypto-API.tmpl | 242 +++++-------
+ Documentation/crypto/api-intro.txt | 23 +-
+ .../devicetree/bindings/rng/brcm,bcm6368.txt | 17 +
+ .../bindings/rng/microchip,pic32-rng.txt | 17 +
+ .../devicetree/bindings/sparc_sun_oracle_rng.txt | 30 ++
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ arch/arm/crypto/aes-ce-glue.c | 5 +
+ arch/arm/crypto/aesbs-glue.c | 6 +
+ arch/arm64/crypto/aes-glue.c | 5 +
+ arch/powerpc/crypto/aes-spe-glue.c | 6 +
+ arch/s390/crypto/aes_s390.c | 6 +
+ arch/x86/crypto/aesni-intel_glue.c | 11 +-
+ arch/x86/crypto/camellia_glue.c | 10 +-
+ arch/x86/crypto/cast6_avx_glue.c | 10 +-
+ arch/x86/crypto/serpent_avx_glue.c | 11 +-
+ arch/x86/crypto/serpent_sse2_glue.c | 11 +-
+ arch/x86/crypto/sha-mb/sha1_mb.c | 35 ++
+ arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S | 2 +-
+ arch/x86/crypto/twofish_glue_3way.c | 10 +-
+ crypto/Kconfig | 23 +-
+ crypto/Makefile | 5 +-
+ crypto/ahash.c | 24 +-
+ crypto/algapi.c | 15 +
+ crypto/{crc32.c => crc32_generic.c} | 3 +-
+ crypto/crypto_engine.c | 355 ++++++++++++++++++
+ crypto/drbg.c | 64 ----
+ crypto/internal.h | 3 +
+ crypto/keywrap.c | 4 +-
+ crypto/mcryptd.c | 1 +
+ crypto/pcompress.c | 115 ------
+ crypto/shash.c | 147 --------
+ crypto/skcipher.c | 4 +-
+ crypto/tcrypt.c | 239 +-----------
+ crypto/testmgr.c | 401 +++++++++-----------
+ crypto/testmgr.h | 144 --------
+ crypto/xts.c | 11 +-
+ crypto/zlib.c | 381 -------------------
+ drivers/block/cryptoloop.c | 48 +--
+ drivers/block/drbd/drbd_int.h | 16 +-
+ drivers/block/drbd/drbd_main.c | 16 +-
+ drivers/block/drbd/drbd_nl.c | 59 +--
+ drivers/block/drbd/drbd_receiver.c | 56 ++-
+ drivers/block/drbd/drbd_worker.c | 43 ++-
+ drivers/char/hw_random/Kconfig | 15 +-
+ drivers/char/hw_random/Makefile | 1 +
+ drivers/char/hw_random/bcm63xx-rng.c | 11 +-
+ drivers/char/hw_random/n2-drv.c | 10 +
+ drivers/char/hw_random/pic32-rng.c | 155 ++++++++
+ drivers/crypto/Kconfig | 7 +-
+ drivers/crypto/atmel-aes.c | 6 -
+ drivers/crypto/atmel-sha-regs.h | 4 +
+ drivers/crypto/atmel-sha.c | 196 +++++++---
+ drivers/crypto/caam/ctrl.c | 2 +-
+ drivers/crypto/caam/jr.c | 2 +-
+ drivers/crypto/caam/regs.h | 3 +-
+ drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 36 ++
+ drivers/crypto/ccp/ccp-crypto-sha.c | 40 ++
+ drivers/crypto/ccp/ccp-crypto.h | 22 ++
+ drivers/crypto/ixp4xx_crypto.c | 26 +-
+ drivers/crypto/omap-aes.c | 97 +++--
+ drivers/crypto/qat/qat_common/adf_accel_devices.h | 4 +-
+ drivers/crypto/qat/qat_common/adf_aer.c | 1 -
+ drivers/crypto/qat/qat_common/adf_cfg_user.h | 6 +-
+ drivers/crypto/qat/qat_common/qat_algs.c | 6 +-
+ drivers/crypto/qat/qat_common/qat_asym_algs.c | 70 ++--
+ drivers/crypto/qat/qat_common/qat_uclo.c | 2 +-
+ drivers/crypto/rockchip/Makefile | 1 +
+ drivers/crypto/rockchip/rk3288_crypto.c | 28 +-
+ drivers/crypto/rockchip/rk3288_crypto.h | 56 ++-
+ drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 20 +-
+ drivers/crypto/rockchip/rk3288_crypto_ahash.c | 404 +++++++++++++++++++++
+ drivers/crypto/s5p-sss.c | 12 +-
+ drivers/crypto/sahara.c | 19 +-
+ drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 5 +-
+ drivers/md/dm-crypt.c | 93 ++---
+ drivers/net/ppp/ppp_mppe.c | 99 ++---
+ drivers/net/wireless/intersil/orinoco/mic.c | 29 +-
+ drivers/net/wireless/intersil/orinoco/mic.h | 4 +-
+ drivers/net/wireless/intersil/orinoco/orinoco.h | 4 +-
+ drivers/nfc/s3fwrn5/firmware.c | 36 +-
+ drivers/scsi/iscsi_tcp.c | 54 +--
+ drivers/scsi/iscsi_tcp.h | 4 +-
+ drivers/scsi/libiscsi_tcp.c | 29 +-
+ .../lustre/lustre/libcfs/linux/linux-crypto.c | 92 +++--
+ drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 99 ++---
+ drivers/staging/rtl8192e/rtllib_crypt_wep.c | 48 ++-
+ .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 92 ++---
+ .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 46 ++-
+ drivers/target/iscsi/iscsi_target.c | 86 +++--
+ drivers/target/iscsi/iscsi_target_auth.c | 98 ++---
+ drivers/target/iscsi/iscsi_target_login.c | 45 ++-
+ drivers/usb/wusbcore/crypto.c | 30 +-
+ fs/cifs/cifsencrypt.c | 32 +-
+ fs/cifs/smbencrypt.c | 26 +-
+ fs/ecryptfs/crypto.c | 107 +++---
+ fs/ecryptfs/ecryptfs_kernel.h | 12 +-
+ fs/ecryptfs/inode.c | 1 -
+ fs/ecryptfs/keystore.c | 218 ++++++-----
+ fs/ecryptfs/main.c | 1 -
+ fs/ecryptfs/mmap.c | 1 -
+ fs/ecryptfs/super.c | 1 -
+ fs/ext4/crypto.c | 24 +-
+ fs/ext4/crypto_fname.c | 32 +-
+ fs/ext4/crypto_key.c | 42 +--
+ fs/ext4/ext4_crypto.h | 2 +-
+ fs/nfsd/nfs4recover.c | 28 +-
+ include/crypto/aead.h | 6 +-
+ include/crypto/akcipher.h | 28 +-
+ include/crypto/algapi.h | 92 ++++-
+ include/crypto/compress.h | 145 --------
+ include/crypto/drbg.h | 4 -
+ include/crypto/hash.h | 45 +++
+ include/crypto/internal/aead.h | 6 +
+ include/crypto/internal/compress.h | 28 --
+ include/crypto/internal/hash.h | 3 -
+ include/crypto/skcipher.h | 24 +-
+ include/crypto/xts.h | 27 ++
+ include/linux/crypto.h | 252 -------------
+ include/linux/sunrpc/gss_krb5.h | 32 +-
+ include/net/sctp/auth.h | 4 +-
+ include/net/sctp/structs.h | 6 +-
+ include/net/tcp.h | 6 +-
+ include/scsi/libiscsi_tcp.h | 13 +-
+ include/target/iscsi/iscsi_target_core.h | 4 +-
+ lib/mpi/longlong.h | 2 +-
+ lib/mpi/mpi-inline.h | 2 +-
+ lib/mpi/mpi-internal.h | 8 +-
+ lib/mpi/mpicoder.c | 39 +-
+ net/bluetooth/smp.c | 135 ++++---
+ net/ceph/crypto.c | 101 +++---
+ net/ipv4/tcp.c | 41 ++-
+ net/ipv4/tcp_fastopen.c | 1 +
+ net/ipv4/tcp_ipv4.c | 23 +-
+ net/ipv6/tcp_ipv6.c | 23 +-
+ net/mac802154/llsec.c | 41 ++-
+ net/mac802154/llsec.h | 3 +-
+ net/rxrpc/ar-internal.h | 2 +-
+ net/rxrpc/ar-key.c | 12 +-
+ net/rxrpc/rxkad.c | 172 +++++----
+ net/sctp/auth.c | 36 +-
+ net/sctp/endpointola.c | 1 -
+ net/sctp/sm_make_chunk.c | 51 +--
+ net/sctp/socket.c | 8 +-
+ net/sunrpc/auth_gss/gss_krb5_crypto.c | 350 +++++++++++-------
+ net/sunrpc/auth_gss/gss_krb5_keys.c | 12 +-
+ net/sunrpc/auth_gss/gss_krb5_mech.c | 89 ++---
+ net/sunrpc/auth_gss/gss_krb5_seqnum.c | 22 +-
+ net/sunrpc/auth_gss/gss_krb5_wrap.c | 24 +-
+ net/wireless/lib80211_crypt_tkip.c | 99 ++---
+ net/wireless/lib80211_crypt_wep.c | 46 ++-
+ net/xfrm/xfrm_algo.c | 7 +-
+ security/keys/encrypted-keys/encrypted.c | 82 +++--
+ 152 files changed, 3887 insertions(+), 3688 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm6368.txt
+ create mode 100644 Documentation/devicetree/bindings/rng/microchip,pic32-rng.txt
+ create mode 100644 Documentation/devicetree/bindings/sparc_sun_oracle_rng.txt
+ rename crypto/{crc32.c => crc32_generic.c} (98%)
+ create mode 100644 crypto/crypto_engine.c
+ delete mode 100644 crypto/pcompress.c
+ delete mode 100644 crypto/zlib.c
+ create mode 100644 drivers/char/hw_random/pic32-rng.c
+ create mode 100644 drivers/crypto/rockchip/rk3288_crypto_ahash.c
+ delete mode 100644 include/crypto/compress.h
+ delete mode 100644 include/crypto/internal/compress.h
+Merging drm/drm-next (550e3b23a53c Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-next)
+$ git merge drm/drm-next
+Recorded preimage for 'drivers/gpu/drm/i915/intel_ddi.c'
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu.h' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c' using previous resolution.
+Resolved 'drivers/gpu/drm/exynos/exynos_drm_fbdev.c' using previous resolution.
+Resolved 'drivers/gpu/drm/exynos/exynos_drm_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_csr.c' using previous resolution.
+Removing include/drm/exynos_drm.h
+Auto-merging include/drm/drm_crtc.h
+Auto-merging drivers/gpu/drm/vc4/vc4_drv.h
+Auto-merging drivers/gpu/drm/tegra/drm.h
+Auto-merging drivers/gpu/drm/radeon/radeon_display.c
+Removing drivers/gpu/drm/omapdrm/dss/overlay.c
+Removing drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c
+Removing drivers/gpu/drm/omapdrm/dss/manager.c
+Removing drivers/gpu/drm/omapdrm/dss/manager-sysfs.c
+Removing drivers/gpu/drm/omapdrm/dss/display-sysfs.c
+Removing drivers/gpu/drm/omapdrm/dss/dispc-compat.h
+Removing drivers/gpu/drm/omapdrm/dss/dispc-compat.c
+Removing drivers/gpu/drm/omapdrm/dss/apply.c
+Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_lvds.c
+Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
+Auto-merging drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+Auto-merging drivers/gpu/drm/i915/intel_dsi.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/intel_csr.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
+Auto-merging drivers/gpu/drm/i915/intel_crt.c
+Auto-merging drivers/gpu/drm/i915/i915_suspend.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_vidi.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_rotator.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_ipp.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_drm_gem.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_g2d.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_fimc.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_dsi.c
+Auto-merging drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+Auto-merging drivers/gpu/drm/drm_irq.c
+Auto-merging drivers/gpu/drm/drm_crtc.c
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Auto-merging drivers/gpu/drm/drm_atomic.c
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
+Auto-merging drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+Auto-merging drivers/gpu/drm/amd/include/amd_shared.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/vi.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/cik.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Removing drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c
+Removing drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/intel_ddi.c'.
+[master e1efecfe594c] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/gpu.tmpl | 59 +-
+ .../bindings/display/exynos/exynos_dsim.txt | 1 +
+ .../bindings/display/exynos/samsung-fimd.txt | 3 +-
+ .../devicetree/bindings/display/msm/dsi.txt | 32 +-
+ .../devicetree/bindings/display/msm/hdmi.txt | 46 +-
+ .../devicetree/bindings/display/renesas,du.txt | 16 +-
+ .../display/rockchip/inno_hdmi-rockchip.txt | 50 +
+ Documentation/dma-buf-sharing.txt | 40 +-
+ MAINTAINERS | 8 +-
+ drivers/char/agp/intel-gtt.c | 32 +-
+ drivers/dma-buf/dma-buf.c | 58 +-
+ drivers/gpu/drm/Kconfig | 12 +
+ drivers/gpu/drm/Makefile | 6 +-
+ drivers/gpu/drm/amd/acp/Kconfig | 10 +
+ drivers/gpu/drm/amd/acp/Makefile | 8 +
+ drivers/gpu/drm/amd/acp/acp_hw.c | 50 +
+ drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 34 +
+ drivers/gpu/drm/amd/amdgpu/Makefile | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 248 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 500 +++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 42 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 57 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 13 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 66 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 385 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 87 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 52 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 53 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 22 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 173 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 135 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 63 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 166 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 34 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 40 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 355 +++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 174 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 108 --
+ drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c | 102 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 154 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 237 ---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 66 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 81 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 96 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 139 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 679 +++----
+ drivers/gpu/drm/amd/amdgpu/cik.c | 308 +--
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 69 +-
+ drivers/gpu/drm/amd/amdgpu/cikd.h | 3 -
+ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 1989 ++++++++------------
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 234 +--
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 15 +-
+ drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 72 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 73 +-
+ drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 50 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 49 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 49 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vi.c | 397 +---
+ drivers/gpu/drm/amd/amdgpu/vid.h | 2 -
+ drivers/gpu/drm/amd/amdkfd/kfd_module.c | 15 +-
+ drivers/gpu/drm/amd/include/amd_acpi.h | 2 +
+ drivers/gpu/drm/amd/include/amd_shared.h | 1 +
+ .../gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h | 1 +
+ .../drm/amd/include/asic_reg/dce/dce_8_0_enum.h | 1117 +++++++++++
+ .../drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h | 12 +
+ .../drm/amd/include/ivsrcid/ivsrcid_vislands30.h | 102 +
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 +-
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 206 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 206 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 123 ++
+ .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 93 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 123 ++
+ drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 78 +-
+ .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 44 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 12 +-
+ drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 10 +-
+ drivers/gpu/drm/arm/Kconfig | 27 +
+ drivers/gpu/drm/arm/Makefile | 2 +
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 327 ++++
+ drivers/gpu/drm/arm/hdlcd_drv.c | 550 ++++++
+ drivers/gpu/drm/arm/hdlcd_drv.h | 42 +
+ drivers/gpu/drm/arm/hdlcd_regs.h | 87 +
+ drivers/gpu/drm/armada/armada_drv.c | 3 -
+ drivers/gpu/drm/ast/ast_mode.c | 8 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 10 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 3 -
+ drivers/gpu/drm/bochs/bochs_kms.c | 8 -
+ drivers/gpu/drm/bridge/dw-hdmi.c | 8 -
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 9 -
+ drivers/gpu/drm/drm_atomic.c | 44 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 62 +-
+ drivers/gpu/drm/drm_crtc.c | 101 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 35 +-
+ drivers/gpu/drm/drm_dp_aux_dev.c | 368 ++++
+ drivers/gpu/drm/drm_dp_helper.c | 16 +-
+ drivers/gpu/drm/drm_edid.c | 26 +
+ drivers/gpu/drm/drm_encoder_slave.c | 3 +
+ drivers/gpu/drm/drm_fb_cma_helper.c | 3 +-
+ drivers/gpu/drm/drm_fb_helper.c | 56 +-
+ drivers/gpu/drm/drm_fops.c | 305 ++-
+ drivers/gpu/drm/drm_irq.c | 18 +-
+ drivers/gpu/drm/drm_kms_helper_common.c | 60 +
+ drivers/gpu/drm/drm_modes.c | 3 +-
+ drivers/gpu/drm/drm_of.c | 34 +
+ drivers/gpu/drm/drm_prime.c | 10 +-
+ drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 219 ++-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 -
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 54 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.h | 17 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 36 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 54 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 +-
+ drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 2 +-
+ drivers/gpu/drm/etnaviv/state_3d.xml.h | 9 +
+ drivers/gpu/drm/exynos/Makefile | 1 -
+ drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 +-
+ drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 -
+ drivers/gpu/drm/exynos/exynos_dp_core.c | 15 +-
+ drivers/gpu/drm/exynos/exynos_dp_core.h | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_dpi.c | 8 -
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 279 +--
+ drivers/gpu/drm/exynos/exynos_drm_drv.h | 10 +-
+ drivers/gpu/drm/exynos/exynos_drm_dsi.c | 242 +--
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimc.c | 28 -
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 34 +-
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 44 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 14 +-
+ drivers/gpu/drm/exynos/exynos_drm_iommu.c | 39 +-
+ drivers/gpu/drm/exynos/exynos_drm_iommu.h | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 29 +-
+ drivers/gpu/drm/exynos/exynos_drm_rotator.c | 1 -
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 -
+ drivers/gpu/drm/exynos/exynos_hdmi.c | 2 -
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 140 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 70 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 4 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_kms.c | 24 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 140 +-
+ drivers/gpu/drm/gma500/cdv_intel_crt.c | 1 -
+ drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 1 -
+ drivers/gpu/drm/gma500/framebuffer.c | 20 +-
+ drivers/gpu/drm/gma500/gma_display.c | 7 -
+ drivers/gpu/drm/gma500/gma_display.h | 3 -
+ drivers/gpu/drm/gma500/intel_gmbus.c | 2 +-
+ drivers/gpu/drm/gma500/mdfld_dsi_output.c | 12 +-
+ drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 -
+ drivers/gpu/drm/gma500/psb_drv.c | 9 -
+ drivers/gpu/drm/i2c/ch7006_drv.c | 2 +
+ drivers/gpu/drm/i2c/sil164_drv.c | 9 -
+ drivers/gpu/drm/i2c/tda998x_drv.c | 9 -
+ drivers/gpu/drm/i915/Kconfig | 13 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 115 +-
+ drivers/gpu/drm/i915/i915_dma.c | 260 +--
+ drivers/gpu/drm/i915/i915_drv.c | 35 +-
+ drivers/gpu/drm/i915/i915_drv.h | 192 +-
+ drivers/gpu/drm/i915/i915_gem.c | 184 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 71 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 42 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 6 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 169 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 80 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 16 +-
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 78 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 10 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 183 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 14 +-
+ drivers/gpu/drm/i915/i915_guc_reg.h | 1 +
+ drivers/gpu/drm/i915/i915_guc_submission.c | 199 +-
+ drivers/gpu/drm/i915/i915_irq.c | 291 +--
+ drivers/gpu/drm/i915/i915_params.c | 19 +-
+ drivers/gpu/drm/i915/i915_params.h | 67 +
+ drivers/gpu/drm/i915/i915_reg.h | 52 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 2 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 8 +-
+ drivers/gpu/drm/i915/i915_trace.h | 27 +-
+ drivers/gpu/drm/i915/intel_atomic.c | 3 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 14 +-
+ drivers/gpu/drm/i915/intel_bios.c | 412 ++--
+ drivers/gpu/drm/i915/intel_bios.h | 60 +-
+ drivers/gpu/drm/i915/intel_crt.c | 14 +-
+ drivers/gpu/drm/i915/intel_csr.c | 25 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 297 ++-
+ drivers/gpu/drm/i915/intel_display.c | 1715 +++++++++--------
+ drivers/gpu/drm/i915/intel_dp.c | 79 +-
+ drivers/gpu/drm/i915/intel_dp_mst.c | 9 +-
+ drivers/gpu/drm/i915/intel_drv.h | 88 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 27 +-
+ drivers/gpu/drm/i915/intel_dsi.h | 5 +-
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 163 +-
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 95 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 952 ++++++----
+ drivers/gpu/drm/i915/intel_fbdev.c | 21 +-
+ drivers/gpu/drm/i915/intel_guc.h | 10 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 122 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 19 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 14 +
+ drivers/gpu/drm/i915/intel_lrc.c | 635 ++++---
+ drivers/gpu/drm/i915/intel_lrc.h | 26 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 8 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 24 +-
+ drivers/gpu/drm/i915/intel_pm.c | 287 ++-
+ drivers/gpu/drm/i915/intel_psr.c | 63 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 106 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 20 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 74 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 4 +
+ drivers/gpu/drm/i915/intel_sdvo_regs.h | 76 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 23 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 189 +-
+ drivers/gpu/drm/i915/intel_tv.c | 16 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 141 +-
+ drivers/gpu/drm/imx/dw_hdmi-imx.c | 10 +-
+ drivers/gpu/drm/imx/imx-drm-core.c | 44 -
+ drivers/gpu/drm/imx/imx-drm.h | 2 -
+ drivers/gpu/drm/imx/imx-ldb.c | 13 +-
+ drivers/gpu/drm/imx/imx-tve.c | 8 -
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 133 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 2 +-
+ drivers/gpu/drm/imx/parallel-display.c | 8 -
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 8 -
+ drivers/gpu/drm/msm/Makefile | 3 +
+ drivers/gpu/drm/msm/adreno/a2xx.xml.h | 11 +-
+ drivers/gpu/drm/msm/adreno/a3xx.xml.h | 493 ++++-
+ drivers/gpu/drm/msm/adreno/a4xx.xml.h | 1267 ++++++++++++-
+ drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 108 +-
+ drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 30 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 8 +
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 44 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 6 +
+ drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 48 +-
+ drivers/gpu/drm/msm/dsi/dsi.xml.h | 5 +-
+ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 3 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 118 +-
+ drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 5 +-
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 +-
+ drivers/gpu/drm/msm/dsi/sfpb.xml.h | 5 +-
+ drivers/gpu/drm/msm/edp/edp.xml.h | 5 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 174 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.h | 110 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 647 ++++++-
+ drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 10 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 56 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 172 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 166 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 20 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 230 +++
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 503 +----
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 766 ++++++++
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 196 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 94 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 461 +++++
+ drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 5 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 5 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 16 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c | 8 -
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 8 -
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 2 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 8 -
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 5 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 9 -
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 15 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 8 -
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 13 +-
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 1 -
+ drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 5 +-
+ drivers/gpu/drm/msm/msm_drv.c | 11 +-
+ drivers/gpu/drm/msm/msm_drv.h | 7 +-
+ drivers/gpu/drm/msm/msm_fbdev.c | 4 -
+ drivers/gpu/drm/msm/msm_gem_submit.c | 20 +-
+ drivers/gpu/drm/msm/msm_iommu.c | 6 +-
+ drivers/gpu/drm/msm/msm_mmu.h | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 21 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 11 +
+ drivers/gpu/drm/omapdrm/Kconfig | 1 -
+ drivers/gpu/drm/omapdrm/Makefile | 2 +-
+ drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 55 +-
+ drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 39 +-
+ drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 41 +-
+ .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 118 +-
+ drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 49 +-
+ .../omapdrm/displays/panel-lgphilips-lb035q02.c | 53 +-
+ .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 44 +-
+ .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 83 +-
+ .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 41 +-
+ .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 43 +-
+ drivers/gpu/drm/omapdrm/dss/Makefile | 3 -
+ drivers/gpu/drm/omapdrm/dss/apply.c | 1702 -----------------
+ drivers/gpu/drm/omapdrm/dss/core.c | 36 +-
+ drivers/gpu/drm/omapdrm/dss/dispc-compat.c | 667 -------
+ drivers/gpu/drm/omapdrm/dss/dispc-compat.h | 30 -
+ drivers/gpu/drm/omapdrm/dss/dispc.c | 71 +-
+ drivers/gpu/drm/omapdrm/dss/display-sysfs.c | 356 ----
+ drivers/gpu/drm/omapdrm/dss/display.c | 49 -
+ drivers/gpu/drm/omapdrm/dss/dpi.c | 46 +-
+ drivers/gpu/drm/omapdrm/dss/dsi.c | 61 +-
+ drivers/gpu/drm/omapdrm/dss/dss.h | 43 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4.c | 50 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5.c | 54 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 42 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 32 +-
+ drivers/gpu/drm/omapdrm/dss/manager-sysfs.c | 531 ------
+ drivers/gpu/drm/omapdrm/dss/manager.c | 263 ---
+ drivers/gpu/drm/omapdrm/dss/omapdss.h | 96 +
+ drivers/gpu/drm/omapdrm/dss/output.c | 54 +-
+ drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c | 456 -----
+ drivers/gpu/drm/omapdrm/dss/overlay.c | 202 --
+ drivers/gpu/drm/omapdrm/dss/rfbi.c | 2 +-
+ drivers/gpu/drm/omapdrm/dss/sdi.c | 36 +-
+ drivers/gpu/drm/omapdrm/dss/venc.c | 27 +-
+ drivers/gpu/drm/omapdrm/omap_connector.c | 4 +
+ drivers/gpu/drm/omapdrm/omap_crtc.c | 132 +-
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 54 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 94 +-
+ drivers/gpu/drm/omapdrm/omap_drv.h | 6 +-
+ drivers/gpu/drm/omapdrm/omap_encoder.c | 7 +-
+ drivers/gpu/drm/omapdrm/omap_fb.c | 16 +
+ drivers/gpu/drm/omapdrm/omap_gem.c | 344 ++--
+ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 57 +-
+ drivers/gpu/drm/omapdrm/omap_plane.c | 6 +
+ drivers/gpu/drm/panel/panel-simple.c | 1 +
+ drivers/gpu/drm/qxl/qxl_display.c | 9 -
+ drivers/gpu/drm/radeon/atombios_encoders.c | 8 -
+ drivers/gpu/drm/radeon/cik.c | 11 +-
+ drivers/gpu/drm/radeon/cik_sdma.c | 9 +-
+ drivers/gpu/drm/radeon/r100.c | 10 +-
+ drivers/gpu/drm/radeon/r600.c | 10 +-
+ drivers/gpu/drm/radeon/r600_dma.c | 9 +-
+ drivers/gpu/drm/radeon/radeon.h | 2 +
+ drivers/gpu/drm/radeon/radeon_acpi.h | 2 +
+ drivers/gpu/drm/radeon/radeon_atpx_handler.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 6 +
+ drivers/gpu/drm/radeon/radeon_display.c | 5 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 21 +-
+ drivers/gpu/drm/radeon/radeon_fence.c | 40 +-
+ drivers/gpu/drm/radeon/radeon_kfd.c | 25 +-
+ drivers/gpu/drm/radeon/radeon_kfd.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_vce.c | 11 +-
+ drivers/gpu/drm/radeon/uvd_v1_0.c | 10 +-
+ drivers/gpu/drm/rcar-du/Kconfig | 15 +-
+ drivers/gpu/drm/rcar-du/Makefile | 2 +
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 95 +-
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 6 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 228 ++-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.h | 12 +-
+ drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 6 +-
+ drivers/gpu/drm/rcar-du/rcar_du_group.c | 74 +-
+ drivers/gpu/drm/rcar-du/rcar_du_group.h | 4 +
+ drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 11 +-
+ drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 16 +-
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 313 +--
+ drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 11 +-
+ drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 142 +-
+ drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 6 +
+ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 465 ++++-
+ drivers/gpu/drm/rcar-du/rcar_du_plane.h | 21 +-
+ drivers/gpu/drm/rcar-du/rcar_du_regs.h | 21 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 11 +-
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 384 ++++
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 76 +
+ drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 26 +-
+ drivers/gpu/drm/rockchip/Kconfig | 8 +
+ drivers/gpu/drm/rockchip/Makefile | 1 +
+ drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 10 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 938 +++++++++
+ drivers/gpu/drm/rockchip/inno_hdmi.h | 362 ++++
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 30 -
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 -
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 20 -
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 2 -
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 8 -
+ drivers/gpu/drm/sti/sti_tvout.c | 10 -
+ drivers/gpu/drm/tegra/dc.c | 17 -
+ drivers/gpu/drm/tegra/drm.c | 4 -
+ drivers/gpu/drm/tegra/drm.h | 1 -
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 331 ++--
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 138 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.h | 6 +-
+ drivers/gpu/drm/tilcdc/tilcdc_panel.c | 29 +-
+ drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 33 +-
+ drivers/gpu/drm/udl/udl_drv.c | 14 +-
+ drivers/gpu/drm/udl/udl_encoder.c | 8 -
+ drivers/gpu/drm/udl/udl_fb.c | 2 -
+ drivers/gpu/drm/vc4/vc4_crtc.c | 191 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 10 -
+ drivers/gpu/drm/vc4/vc4_drv.h | 13 +-
+ drivers/gpu/drm/vc4/vc4_hvs.c | 97 +
+ drivers/gpu/drm/vc4/vc4_kms.c | 9 +
+ drivers/gpu/drm/vc4/vc4_plane.c | 603 +++++-
+ drivers/gpu/drm/vc4/vc4_regs.h | 102 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 8 -
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 16 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 11 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 87 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 2 -
+ drivers/gpu/ipu-v3/ipu-dc.c | 53 +-
+ drivers/gpu/vga/vga_switcheroo.c | 119 +-
+ drivers/platform/x86/apple-gmux.c | 111 +-
+ drivers/staging/android/ion/ion.c | 6 +-
+ drivers/staging/android/ion/ion_test.c | 4 +-
+ drivers/video/fbdev/omap2/omapfb/dss/dispc.h | 1 +
+ drivers/video/fbdev/omap2/omapfb/dss/dss.h | 78 +
+ include/drm/drmP.h | 30 +-
+ include/drm/drm_crtc.h | 18 +
+ include/drm/drm_dp_aux_dev.h | 62 +
+ include/drm/drm_fb_helper.h | 6 +
+ include/drm/drm_modeset_helper_vtables.h | 2 +-
+ include/drm/drm_of.h | 33 +
+ include/drm/exynos_drm.h | 101 -
+ include/drm/i915_pciids.h | 6 +-
+ include/linux/apple-gmux.h | 50 +
+ include/linux/dma-buf.h | 12 +-
+ include/linux/vga_switcheroo.h | 36 +-
+ include/uapi/drm/drm.h | 1 +
+ include/uapi/drm/exynos_drm.h | 26 +-
+ include/uapi/drm/i915_drm.h | 43 +-
+ include/uapi/drm/msm_drm.h | 2 +
+ include/uapi/linux/dma-buf.h | 40 +
+ include/video/omap-panel-data.h | 15 -
+ include/video/omapdss.h | 89 +-
+ mm/swapfile.c | 6 +
+ 447 files changed, 23461 insertions(+), 17382 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt
+ create mode 100644 drivers/gpu/drm/amd/acp/Kconfig
+ create mode 100644 drivers/gpu/drm/amd/acp/Makefile
+ create mode 100644 drivers/gpu/drm/amd/acp/acp_hw.c
+ create mode 100644 drivers/gpu/drm/amd/acp/include/acp_gfx_if.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+ delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c
+ delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c
+ create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_8_0_enum.h
+ create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/ivsrcid_vislands30.h
+ create mode 100644 drivers/gpu/drm/arm/Kconfig
+ create mode 100644 drivers/gpu/drm/arm/Makefile
+ create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c
+ create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c
+ create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h
+ create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h
+ create mode 100644 drivers/gpu/drm/drm_dp_aux_dev.c
+ create mode 100644 drivers/gpu/drm/drm_kms_helper_common.c
+ create mode 100644 drivers/gpu/drm/etnaviv/state_3d.xml.h
+ create mode 100644 drivers/gpu/drm/i915/i915_params.h
+ create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy.c
+ create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c
+ create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/apply.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/dispc-compat.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/dispc-compat.h
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/display-sysfs.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/manager-sysfs.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/manager.c
+ create mode 100644 drivers/gpu/drm/omapdrm/dss/omapdss.h
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c
+ delete mode 100644 drivers/gpu/drm/omapdrm/dss/overlay.c
+ create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.c
+ create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.h
+ create mode 100644 drivers/gpu/drm/rockchip/inno_hdmi.c
+ create mode 100644 drivers/gpu/drm/rockchip/inno_hdmi.h
+ create mode 100644 include/drm/drm_dp_aux_dev.h
+ delete mode 100644 include/drm/exynos_drm.h
+ create mode 100644 include/linux/apple-gmux.h
+ create mode 100644 include/uapi/linux/dma-buf.h
+$ git am -3 ../patches/0001-drm-fix-bad-merge-of-drivers-gpu-drm-amd-amdgpu-amdg.patch
+Applying: drm: fix bad merge of drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 075f82f5db32] Merge remote-tracking branch 'drm/drm-next'
+ Date: Tue Mar 8 12:05:25 2016 +1100
+Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
+$ git merge drm-panel/drm/panel/for-next
+Auto-merging include/drm/drm_crtc.h
+Auto-merging drivers/gpu/drm/panel/panel-simple.c
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../bindings/display/panel/lg,lp120up1.txt | 7 ++
+ .../bindings/display/panel/urt,umsh-8596md.txt | 16 +++
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ drivers/gpu/drm/drm_bridge.c | 12 +-
+ drivers/gpu/drm/drm_mipi_dsi.c | 127 +++++++++++++++++++--
+ drivers/gpu/drm/panel/panel-simple.c | 81 +++++++++++++
+ include/drm/drm_crtc.h | 8 ++
+ include/drm/drm_mipi_dsi.h | 26 +++++
+ 8 files changed, 262 insertions(+), 16 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/panel/lg,lp120up1.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/urt,umsh-8596md.txt
+Merging drm-intel/for-linux-next (9dfbffcf4ac0 drm/i915: Fix bogus dig_port_map[] assignment for pre-HSW)
+$ git merge drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/Kconfig | 6 +
+ drivers/gpu/drm/i915/Kconfig.debug | 12 +
+ drivers/gpu/drm/i915/i915_debugfs.c | 2 -
+ drivers/gpu/drm/i915/i915_dma.c | 5 +
+ drivers/gpu/drm/i915/i915_drv.h | 22 +-
+ drivers/gpu/drm/i915/i915_gem.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 45 ++-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 11 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 7 +
+ drivers/gpu/drm/i915/i915_gpu_error.c | 31 +-
+ drivers/gpu/drm/i915/i915_irq.c | 17 +-
+ drivers/gpu/drm/i915/i915_reg.h | 105 ++++---
+ drivers/gpu/drm/i915/i915_sysfs.c | 10 +
+ drivers/gpu/drm/i915/intel_atomic.c | 1 +
+ drivers/gpu/drm/i915/intel_crt.c | 32 +-
+ drivers/gpu/drm/i915/intel_csr.c | 40 ++-
+ drivers/gpu/drm/i915/intel_display.c | 535 ++++++++++++++++++++++----------
+ drivers/gpu/drm/i915/intel_dp.c | 74 ++---
+ drivers/gpu/drm/i915/intel_drv.h | 112 +++++--
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 56 +++-
+ drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 3 -
+ drivers/gpu/drm/i915/intel_lrc.c | 216 +++++++------
+ drivers/gpu/drm/i915/intel_lvds.c | 8 +-
+ drivers/gpu/drm/i915/intel_panel.c | 50 ++-
+ drivers/gpu/drm/i915/intel_pm.c | 248 +++++++++------
+ drivers/gpu/drm/i915/intel_psr.c | 3 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 5 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 142 ++++-----
+ drivers/gpu/drm/i915/intel_sdvo.c | 4 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 27 +-
+ drivers/gpu/drm/i915/intel_tv.c | 12 -
+ drivers/gpu/drm/i915/intel_uncore.c | 56 ++--
+ 33 files changed, 1168 insertions(+), 733 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/Kconfig.debug
+Merging drm-tegra/drm/tegra/for-next (5dff6a2179a0 gpu: host1x: Use a signed return type for do_relocs())
+$ git merge drm-tegra/drm/tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/host1x/bus.c | 4 +++-
+ drivers/gpu/host1x/job.c | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+Merging drm-misc/topic/drm-misc (9459545b9c96 drm/atomic: Pass connector and state to update_connector_routing.)
+$ git merge drm-misc/topic/drm-misc
+Auto-merging drivers/gpu/drm/drm_crtc.c
+Auto-merging drivers/gpu/drm/drm_atomic_helper.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_atomic_helper.c | 56 +++++++++++++++----------------------
+ drivers/gpu/drm/drm_crtc.c | 4 +--
+ 2 files changed, 23 insertions(+), 37 deletions(-)
+Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
+$ git merge drm-exynos/exynos-drm/for-next
+Already up-to-date.
+Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
+$ git merge drm-msm/msm-next
+Already up-to-date.
+Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
+$ git merge hdlcd/for-upstream/hdlcd
+Merge made by the 'recursive' strategy.
+Merging drm-vc4/drm-vc4-next (fc04023fafec drm/vc4: Add support for YUV planes.)
+$ git merge drm-vc4/drm-vc4-next
+Already up-to-date.
+Merging regmap/for-next (d25263d917ca Merge remote-tracking branch 'regmap/topic/update-bits' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regmap/regmap.txt | 11 +-
+ arch/mips/boot/dts/brcm/bcm6328.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm6368.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7125.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7346.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7358.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7360.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7362.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7420.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7425.dtsi | 2 +-
+ arch/mips/boot/dts/brcm/bcm7435.dtsi | 2 +-
+ drivers/base/regmap/internal.h | 16 ++
+ drivers/base/regmap/regcache-flat.c | 20 +-
+ drivers/base/regmap/regcache.c | 45 ++--
+ drivers/base/regmap/regmap-irq.c | 104 +++++++++
+ drivers/base/regmap/regmap-mmio.c | 259 +++++++++++----------
+ drivers/base/regmap/regmap.c | 241 +++++--------------
+ include/linux/regmap.h | 107 +++++----
+ 18 files changed, 438 insertions(+), 385 deletions(-)
+Merging sound/for-next (bb63f726f98b ALSA: hda - Use snd_hdac namespace prefix for chmap exported APIs)
+$ git merge sound/for-next
+Auto-merging sound/usb/card.c
+Removing sound/mips/au1x00.c
+Merge made by the 'recursive' strategy.
+ Documentation/sound/alsa/ALSA-Configuration.txt | 9 +
+ Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt | 74 +
+ include/sound/hda_chmap.h | 76 ++
+ include/sound/jack.h | 23 +-
+ include/uapi/sound/asequencer.h | 6 -
+ include/uapi/sound/asound.h | 4 +
+ sound/core/Kconfig | 9 +-
+ sound/core/compress_offload.c | 12 +-
+ sound/core/jack.c | 23 +-
+ sound/core/timer.c | 268 ++--
+ sound/drivers/mts64.c | 96 +-
+ sound/drivers/portman2x4.c | 94 +-
+ sound/firewire/bebob/bebob.c | 21 +-
+ sound/firewire/bebob/bebob.h | 5 +-
+ sound/firewire/bebob/bebob_midi.c | 16 +-
+ sound/firewire/bebob/bebob_pcm.c | 28 +-
+ sound/firewire/bebob/bebob_stream.c | 58 +-
+ sound/firewire/dice/dice-midi.c | 23 +-
+ sound/firewire/dice/dice-pcm.c | 199 +--
+ sound/firewire/dice/dice-stream.c | 120 +-
+ sound/firewire/dice/dice-transaction.c | 56 +-
+ sound/firewire/dice/dice.c | 67 +-
+ sound/firewire/dice/dice.h | 8 -
+ sound/firewire/fireworks/fireworks.c | 3 +
+ sound/firewire/fireworks/fireworks_stream.c | 6 +-
+ sound/firewire/oxfw/oxfw-scs1x.c | 35 +-
+ sound/hda/Makefile | 2 +-
+ sound/hda/hdmi_chmap.c | 791 +++++++++++
+ sound/mips/Kconfig | 12 -
+ sound/mips/Makefile | 2 -
+ sound/mips/au1x00.c | 734 ----------
+ sound/pci/Kconfig | 2 +-
+ sound/pci/hda/Kconfig | 2 +-
+ sound/pci/hda/hda_eld.c | 31 +-
+ sound/pci/hda/hda_intel.c | 2 +-
+ sound/pci/hda/patch_hdmi.c | 1428 +++++++++-----------
+ sound/pci/hda/thinkpad_helper.c | 17 +-
+ sound/soc/Kconfig | 2 +-
+ sound/usb/card.c | 56 +-
+ sound/usb/midi.c | 15 +-
+ sound/usb/midi.h | 14 +-
+ sound/usb/quirks.c | 36 +-
+ sound/usb/quirks.h | 3 +-
+ 43 files changed, 2142 insertions(+), 2346 deletions(-)
+ create mode 100644 Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt
+ create mode 100644 include/sound/hda_chmap.h
+ create mode 100644 sound/hda/hdmi_chmap.c
+ delete mode 100644 sound/mips/au1x00.c
+Merging sound-asoc/for-next (c0c2e009f485 Merge remote-tracking branches 'asoc/topic/topology' and 'asoc/topic/wm8974' into asoc-next)
+$ git merge sound-asoc/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/adi,adau17x1.txt | 24 +
+ .../devicetree/bindings/sound/fsl-asoc-card.txt | 9 +
+ .../devicetree/bindings/sound/max9867.txt | 17 +
+ .../devicetree/bindings/sound/max98926.txt | 32 +
+ .../bindings/sound/mt8173-rt5650-rt5514.txt | 15 +
+ .../devicetree/bindings/sound/mt8173-rt5650.txt | 15 +
+ .../devicetree/bindings/sound/pcm179x.txt | 11 +-
+ .../bindings/sound/renesas,rsrc-card.txt | 1 +
+ .../devicetree/bindings/sound/rockchip-i2s.txt | 1 +
+ .../devicetree/bindings/sound/rockchip-spdif.txt | 8 +-
+ Documentation/devicetree/bindings/sound/rt5514.txt | 25 +
+ Documentation/devicetree/bindings/sound/rt5616.txt | 6 +
+ Documentation/devicetree/bindings/sound/rt5640.txt | 3 +
+ .../bindings/sound/sunxi,sun4i-spdif.txt | 39 +
+ .../devicetree/bindings/sound/ti,ads117x.txt | 11 +
+ drivers/misc/atmel-ssc.c | 1 +
+ include/drm/drm_edid.h | 12 +
+ include/linux/platform_data/adau17x1.h | 2 +-
+ include/sound/pcm.h | 2 +
+ include/sound/soc-topology.h | 21 +-
+ include/sound/soc.h | 2 +-
+ sound/core/pcm_misc.c | 30 +
+ sound/soc/atmel/atmel_ssc_dai.c | 27 +-
+ sound/soc/bcm/bcm2835-i2s.c | 284 +----
+ sound/soc/codecs/Kconfig | 38 +-
+ sound/soc/codecs/Makefile | 10 +
+ sound/soc/codecs/ab8500-codec.c | 1 -
+ sound/soc/codecs/adau1761-i2c.c | 14 +-
+ sound/soc/codecs/adau1761-spi.c | 14 +-
+ sound/soc/codecs/adau1761.c | 10 +-
+ sound/soc/codecs/adau1781-i2c.c | 10 +
+ sound/soc/codecs/adau1781-spi.c | 10 +
+ sound/soc/codecs/adau1781.c | 2 +-
+ sound/soc/codecs/ads117x.c | 12 +
+ sound/soc/codecs/arizona.c | 71 +-
+ sound/soc/codecs/arizona.h | 4 +-
+ sound/soc/codecs/cs42xx8.c | 10 +-
+ sound/soc/codecs/cs47l24.c | 123 +-
+ sound/soc/codecs/hdac_hdmi.c | 1219 ++++++++++++++++++--
+ sound/soc/codecs/hdac_hdmi.h | 6 +
+ sound/soc/codecs/max9867.c | 546 +++++++++
+ sound/soc/codecs/max9867.h | 83 ++
+ sound/soc/codecs/max98926.c | 606 ++++++++++
+ sound/soc/codecs/max98926.h | 848 ++++++++++++++
+ sound/soc/codecs/pcm179x-i2c.c | 73 ++
+ sound/soc/codecs/pcm179x-spi.c | 72 ++
+ sound/soc/codecs/pcm179x.c | 56 +-
+ sound/soc/codecs/pcm179x.h | 9 +-
+ sound/soc/codecs/pcm3168a.c | 8 +-
+ sound/soc/codecs/rt298.c | 7 +-
+ sound/soc/codecs/rt298.h | 8 +
+ sound/soc/codecs/rt5514.c | 982 ++++++++++++++++
+ sound/soc/codecs/rt5514.h | 252 ++++
+ sound/soc/codecs/rt5616.c | 414 ++++---
+ sound/soc/codecs/rt5640.c | 89 +-
+ sound/soc/codecs/rt5640.h | 2 +
+ sound/soc/codecs/rt5645.c | 15 +-
+ sound/soc/codecs/rt5659.c | 2 +-
+ sound/soc/codecs/ssm4567.c | 5 +
+ sound/soc/codecs/wm5102.c | 93 +-
+ sound/soc/codecs/wm5110.c | 75 +-
+ sound/soc/codecs/wm8974.c | 93 ++
+ sound/soc/codecs/wm8997.c | 2 +-
+ sound/soc/codecs/wm8998.c | 2 +-
+ sound/soc/codecs/wm_adsp.c | 129 ++-
+ sound/soc/codecs/wm_adsp.h | 8 +-
+ sound/soc/davinci/davinci-mcasp.c | 2 +
+ sound/soc/fsl/Kconfig | 4 +-
+ sound/soc/fsl/fsl-asoc-card.c | 26 +-
+ sound/soc/fsl/fsl_sai.c | 3 +-
+ sound/soc/fsl/fsl_ssi.c | 42 +-
+ sound/soc/fsl/mpc5200_psc_ac97.c | 3 +-
+ sound/soc/intel/Kconfig | 4 +
+ sound/soc/intel/atom/sst/sst_acpi.c | 4 +
+ sound/soc/intel/atom/sst/sst_ipc.c | 2 -
+ sound/soc/intel/boards/bytcr_rt5640.c | 50 +-
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 17 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 28 +-
+ sound/soc/intel/boards/skl_nau88l25_max98357a.c | 122 +-
+ sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 130 ++-
+ sound/soc/intel/boards/skl_rt286.c | 113 +-
+ sound/soc/intel/common/sst-acpi.h | 3 +
+ sound/soc/intel/common/sst-match-acpi.c | 45 +-
+ sound/soc/intel/skylake/skl-messages.c | 62 +-
+ sound/soc/intel/skylake/skl-nhlt.c | 34 +
+ sound/soc/intel/skylake/skl-pcm.c | 106 +-
+ sound/soc/intel/skylake/skl-topology.c | 208 +++-
+ sound/soc/intel/skylake/skl-topology.h | 27 +
+ sound/soc/intel/skylake/skl-tplg-interface.h | 3 +-
+ sound/soc/intel/skylake/skl.c | 81 ++
+ sound/soc/intel/skylake/skl.h | 3 +
+ sound/soc/mediatek/Kconfig | 22 +-
+ sound/soc/mediatek/Makefile | 2 +
+ sound/soc/mediatek/mt8173-rt5650-rt5514.c | 258 +++++
+ sound/soc/mediatek/mt8173-rt5650-rt5676.c | 18 +-
+ sound/soc/mediatek/mt8173-rt5650.c | 236 ++++
+ sound/soc/mediatek/mtk-afe-common.h | 1 +
+ sound/soc/mediatek/mtk-afe-pcm.c | 47 +-
+ sound/soc/mxs/mxs-saif.c | 2 +-
+ sound/soc/pxa/brownstone.c | 2 -
+ sound/soc/qcom/apq8016_sbc.c | 10 +-
+ sound/soc/qcom/lpass-apq8016.c | 31 +-
+ sound/soc/qcom/lpass-cpu.c | 146 ++-
+ sound/soc/qcom/lpass-ipq806x.c | 11 +-
+ sound/soc/qcom/lpass-lpaif-reg.h | 116 +-
+ sound/soc/qcom/lpass-platform.c | 244 ++--
+ sound/soc/qcom/lpass.h | 10 +-
+ sound/soc/rockchip/rockchip_i2s.c | 13 +
+ sound/soc/rockchip/rockchip_spdif.c | 17 +-
+ sound/soc/samsung/s3c-i2s-v2.c | 2 +-
+ sound/soc/samsung/s3c-i2s-v2.h | 2 +-
+ sound/soc/sh/rcar/adg.c | 218 ++--
+ sound/soc/sh/rcar/cmd.c | 18 +-
+ sound/soc/sh/rcar/core.c | 160 ++-
+ sound/soc/sh/rcar/ctu.c | 281 ++++-
+ sound/soc/sh/rcar/dma.c | 56 +-
+ sound/soc/sh/rcar/dvc.c | 10 +-
+ sound/soc/sh/rcar/gen.c | 56 +-
+ sound/soc/sh/rcar/mix.c | 4 +-
+ sound/soc/sh/rcar/rsnd.h | 115 +-
+ sound/soc/sh/rcar/rsrc-card.c | 27 +-
+ sound/soc/sh/rcar/src.c | 171 ++-
+ sound/soc/sh/rcar/ssi.c | 334 +++---
+ sound/soc/sh/rcar/ssiu.c | 20 +-
+ sound/soc/soc-core.c | 8 +-
+ sound/soc/soc-dapm.c | 4 +-
+ sound/soc/soc-pcm.c | 24 +-
+ sound/soc/soc-topology.c | 240 ++--
+ sound/soc/sunxi/Kconfig | 8 +
+ sound/soc/sunxi/Makefile | 1 +
+ sound/soc/sunxi/sun4i-spdif.c | 550 +++++++++
+ 131 files changed, 9496 insertions(+), 1752 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/adi,adau17x1.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/max9867.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/max98926.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/rt5514.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/ti,ads117x.txt
+ create mode 100644 sound/soc/codecs/hdac_hdmi.h
+ create mode 100755 sound/soc/codecs/max9867.c
+ create mode 100755 sound/soc/codecs/max9867.h
+ create mode 100644 sound/soc/codecs/max98926.c
+ create mode 100644 sound/soc/codecs/max98926.h
+ create mode 100644 sound/soc/codecs/pcm179x-i2c.c
+ create mode 100644 sound/soc/codecs/pcm179x-spi.c
+ create mode 100644 sound/soc/codecs/rt5514.c
+ create mode 100644 sound/soc/codecs/rt5514.h
+ create mode 100644 sound/soc/mediatek/mt8173-rt5650-rt5514.c
+ create mode 100644 sound/soc/mediatek/mt8173-rt5650.c
+ create mode 100644 sound/soc/sunxi/sun4i-spdif.c
+Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
+$ git merge modules/modules-next
+Already up-to-date.
+Merging input/next (cd1480ae4dd0 Input: ts4800 - add hardware dependency)
+$ git merge input/next
+Removing include/linux/rotary_encoder.h
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging arch/arm/mach-pxa/raumfeld.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/goldfish/events.txt | 17 +
+ .../devicetree/bindings/input/rotary-encoder.txt | 2 +-
+ .../bindings/input/touchscreen/cyttsp.txt | 95 ++
+ arch/arm/mach-pxa/raumfeld.c | 50 +-
+ drivers/input/keyboard/Kconfig | 2 +-
+ drivers/input/keyboard/goldfish_events.c | 17 +
+ drivers/input/keyboard/snvs_pwrkey.c | 4 +-
+ drivers/input/keyboard/spear-keyboard.c | 6 +-
+ drivers/input/misc/rotary_encoder.c | 403 ++----
+ drivers/input/mouse/Kconfig | 10 +
+ drivers/input/mouse/Makefile | 1 +
+ drivers/input/mouse/byd.c | 337 +++++
+ drivers/input/mouse/byd.h | 18 +
+ drivers/input/mouse/cyapa.c | 22 +-
+ drivers/input/mouse/cyapa.h | 14 +-
+ drivers/input/mouse/cyapa_gen3.c | 108 +-
+ drivers/input/mouse/cyapa_gen5.c | 99 +-
+ drivers/input/mouse/cyapa_gen6.c | 4 +-
+ drivers/input/mouse/psmouse-base.c | 14 +
+ drivers/input/mouse/psmouse.h | 1 +
+ drivers/input/touchscreen/Kconfig | 17 +-
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/cyttsp_core.c | 194 ++-
+ drivers/input/touchscreen/cyttsp_core.h | 10 +-
+ drivers/input/touchscreen/cyttsp_i2c.c | 10 -
+ drivers/input/touchscreen/cyttsp_spi.c | 10 -
+ drivers/input/touchscreen/melfas_mip4.c | 1517 ++++++++++++++++++++
+ drivers/input/touchscreen/stmpe-ts.c | 31 +
+ include/linux/input/cyttsp.h | 15 -
+ include/linux/rotary_encoder.h | 17 -
+ 30 files changed, 2594 insertions(+), 452 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/goldfish/events.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/cyttsp.txt
+ create mode 100644 drivers/input/mouse/byd.c
+ create mode 100644 drivers/input/mouse/byd.h
+ create mode 100644 drivers/input/touchscreen/melfas_mip4.c
+ delete mode 100644 include/linux/rotary_encoder.h
+Merging block/for-next (c7ce4cbd029e Merge branch 'for-4.6/drivers' into for-next)
+$ git merge block/for-next
+Resolved 'drivers/nvme/host/core.c' using previous resolution.
+Resolved 'drivers/nvme/host/pci.c' using previous resolution.
+Auto-merging include/linux/lightnvm.h
+Auto-merging fs/block_dev.c
+Auto-merging drivers/nvme/host/pci.c
+CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
+Auto-merging drivers/nvme/host/nvme.h
+Auto-merging drivers/nvme/host/lightnvm.c
+Auto-merging drivers/nvme/host/core.c
+CONFLICT (content): Merge conflict in drivers/nvme/host/core.c
+Auto-merging drivers/nvme/host/Kconfig
+Auto-merging drivers/lightnvm/rrpc.h
+Auto-merging drivers/lightnvm/rrpc.c
+Auto-merging drivers/lightnvm/core.c
+Auto-merging drivers/block/xen-blkfront.c
+Auto-merging block/blk-mq.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 616cbc8b6eef] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ block/blk-mq-sysfs.c | 9 +-
+ block/blk-mq.c | 179 ++++++++++++--------
+ block/blk-mq.h | 1 +
+ block/cfq-iosched.c | 43 +++--
+ drivers/block/mtip32xx/mtip32xx.c | 266 ++++++++++++++++++++++-------
+ drivers/block/mtip32xx/mtip32xx.h | 11 +-
+ drivers/block/nbd.c | 334 +++++++++++++++++++------------------
+ drivers/block/xen-blkback/xenbus.c | 20 ++-
+ drivers/block/xen-blkfront.c | 6 +-
+ drivers/lightnvm/core.c | 19 +--
+ drivers/lightnvm/gennvm.c | 7 +-
+ drivers/lightnvm/rrpc.c | 98 ++++++-----
+ drivers/lightnvm/rrpc.h | 15 +-
+ drivers/nvme/host/Kconfig | 6 +-
+ drivers/nvme/host/Makefile | 10 +-
+ drivers/nvme/host/core.c | 131 +++++++++++----
+ drivers/nvme/host/lightnvm.c | 46 ++++-
+ drivers/nvme/host/nvme.h | 7 +-
+ drivers/nvme/host/pci.c | 228 +++++++++----------------
+ fs/block_dev.c | 6 +-
+ include/linux/blk-mq.h | 2 +
+ include/linux/lightnvm.h | 8 +-
+ 22 files changed, 869 insertions(+), 583 deletions(-)
+$ git am -3 ../patches/0001-nvme-fix-up-for-split-pci-module-out-of-core-module.patch
+Applying: nvme: fix up for "split pci module out of core module"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/nvme/host/core.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 8d17f61d0030] Merge remote-tracking branch 'block/for-next'
+ Date: Tue Mar 8 12:23:29 2016 +1100
+Merging device-mapper/for-next (5b699155e7bd dm: add missing newline between DM_DEBUG_BLOCK_STACK_TRACING and DM_BUFIO)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm-crypt.c
+Removing drivers/md/dm-cache-policy-mq.c
+Auto-merging block/blk-core.c
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/cache-policies.txt | 39 +-
+ block/blk-core.c | 2 +-
+ drivers/md/Kconfig | 11 +-
+ drivers/md/Makefile | 2 -
+ drivers/md/dm-cache-policy-mq.c | 1473 ------------------------
+ drivers/md/dm-cache-policy-smq.c | 92 +-
+ drivers/md/dm-cache-target.c | 2 +-
+ drivers/md/dm-crypt.c | 2 +-
+ drivers/md/dm-delay.c | 2 +-
+ drivers/md/dm-flakey.c | 2 +-
+ drivers/md/dm-ioctl.c | 5 +-
+ drivers/md/dm-log-writes.c | 2 +-
+ drivers/md/dm-mpath.c | 784 ++++++++-----
+ drivers/md/dm-path-selector.h | 5 -
+ drivers/md/dm-queue-length.c | 37 +-
+ drivers/md/dm-raid1.c | 2 +-
+ drivers/md/dm-round-robin.c | 85 +-
+ drivers/md/dm-service-time.c | 35 +-
+ drivers/md/dm-snap.c | 11 +-
+ drivers/md/dm-table.c | 66 +-
+ drivers/md/dm-target.c | 3 +-
+ drivers/md/dm-thin-metadata.c | 7 +-
+ drivers/md/dm-thin.c | 2 +-
+ drivers/md/dm-verity-fec.c | 2 +-
+ drivers/md/dm-verity-target.c | 12 +-
+ drivers/md/dm.c | 598 +++++-----
+ drivers/md/dm.h | 4 +-
+ include/linux/device-mapper.h | 15 +-
+ 28 files changed, 1130 insertions(+), 2172 deletions(-)
+ delete mode 100644 drivers/md/dm-cache-policy-mq.c
+Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
+$ git merge mmc/mmc-next
+Already up-to-date.
+Merging mmc-uh/next (67b3fcff2da9 mmc: mediatek: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch)
+$ git merge mmc-uh/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 5 +-
+ .../bindings/mmc/microchip,sdhci-pic32.txt | 29 ++
+ Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 1 +
+ MAINTAINERS | 8 +-
+ drivers/mmc/card/block.c | 10 +-
+ drivers/mmc/card/mmc_test.c | 1 +
+ drivers/mmc/core/core.c | 29 +-
+ drivers/mmc/core/debugfs.c | 2 +-
+ drivers/mmc/core/host.c | 1 +
+ drivers/mmc/core/mmc.c | 4 +-
+ drivers/mmc/core/mmc_ops.c | 19 +-
+ drivers/mmc/core/pwrseq_simple.c | 1 -
+ drivers/mmc/core/sd_ops.c | 7 +-
+ drivers/mmc/core/sdio_ops.c | 3 +-
+ drivers/mmc/host/Kconfig | 25 +-
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/atmel-mci.c | 9 +-
+ drivers/mmc/host/bfin_sdh.c | 3 -
+ drivers/mmc/host/davinci_mmc.c | 15 +-
+ drivers/mmc/host/dw_mmc-exynos.c | 31 +-
+ drivers/mmc/host/dw_mmc-pltfm.c | 19 +-
+ drivers/mmc/host/dw_mmc-rockchip.c | 7 -
+ drivers/mmc/host/dw_mmc.c | 101 ++---
+ drivers/mmc/host/dw_mmc.h | 6 +-
+ drivers/mmc/host/jz4740_mmc.c | 2 -
+ drivers/mmc/host/mmc_spi.c | 6 +
+ drivers/mmc/host/mtk-sd.c | 19 +-
+ drivers/mmc/host/mxcmmc.c | 3 -
+ drivers/mmc/host/omap_hsmmc.c | 9 +-
+ drivers/mmc/host/pxamci.c | 6 -
+ drivers/mmc/host/s3cmci.c | 3 +-
+ drivers/mmc/host/sdhci-acpi.c | 2 +
+ drivers/mmc/host/sdhci-bcm2835.c | 14 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 38 +-
+ drivers/mmc/host/sdhci-iproc.c | 40 +-
+ drivers/mmc/host/sdhci-msm.c | 25 +-
+ drivers/mmc/host/sdhci-of-arasan.c | 38 +-
+ drivers/mmc/host/sdhci-of-at91.c | 33 +-
+ drivers/mmc/host/sdhci-of-esdhc.c | 19 +-
+ drivers/mmc/host/sdhci-pic32.c | 257 ++++++++++++
+ drivers/mmc/host/sdhci-pltfm.h | 1 -
+ drivers/mmc/host/sdhci-pxav2.c | 1 -
+ drivers/mmc/host/sdhci-pxav3.c | 26 +-
+ drivers/mmc/host/sdhci-st.c | 40 +-
+ drivers/mmc/host/sdhci-tegra.c | 35 +-
+ drivers/mmc/host/sdhci.c | 446 +++++++++------------
+ drivers/mmc/host/sdhci.h | 4 +-
+ drivers/mmc/host/sdricoh_cs.c | 26 +-
+ drivers/mmc/host/sh_mmcif.c | 2 +-
+ drivers/mmc/host/sh_mobile_sdhi.c | 54 ++-
+ drivers/mmc/host/sunxi-mmc.c | 95 ++++-
+ drivers/mmc/host/tmio_mmc_dma.c | 11 -
+ drivers/mmc/host/tmio_mmc_pio.c | 27 +-
+ drivers/mmc/host/usdhi6rol0.c | 2 +-
+ include/linux/mfd/tmio.h | 4 +
+ include/linux/mmc/core.h | 1 -
+ include/linux/mmc/dw_mmc.h | 12 +-
+ include/linux/mmc/tmio.h | 5 +
+ 58 files changed, 950 insertions(+), 693 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/microchip,sdhci-pic32.txt
+ create mode 100644 drivers/mmc/host/sdhci-pic32.c
+Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+ kernel/debug/kdb/kdb_io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging md/for-next (0f9ce866e093 Update MD git tree URL)
+$ git merge md/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ drivers/md/bitmap.c | 3 +--
+ drivers/md/md.c | 2 +-
+ drivers/md/raid5.c | 49 ++++++++++++++++++++++++++++---------------------
+ drivers/md/raid5.h | 4 +++-
+ 5 files changed, 34 insertions(+), 26 deletions(-)
+Merging mfd/for-mfd-next (103d8a7bb8a2 mfd: tps65090: Set regmap config reg counts properly)
+$ git merge mfd/for-mfd-next
+Removing drivers/mfd/tps65912-irq.c
+Auto-merging drivers/mfd/db8500-prcmu.c
+Auto-merging drivers/input/touchscreen/Makefile
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/iio/adc/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/iio/adc/fsl,imx25-gcq.txt | 58 ++
+ .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 35 ++
+ Documentation/devicetree/bindings/mfd/act8945a.txt | 76 +++
+ Documentation/devicetree/bindings/mfd/axp20x.txt | 7 +-
+ .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 47 ++
+ Documentation/devicetree/bindings/mfd/mt6397.txt | 10 +-
+ Documentation/devicetree/bindings/mfd/tps65086.txt | 55 ++
+ Documentation/devicetree/bindings/mfd/tps65912.txt | 50 ++
+ drivers/gpio/Kconfig | 8 +-
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-tps65086.c | 139 +++++
+ drivers/gpio/gpio-tps65912.c | 171 +++---
+ drivers/iio/adc/Kconfig | 7 +
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/fsl-imx25-gcq.c | 417 ++++++++++++++
+ drivers/input/touchscreen/Kconfig | 9 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/fsl-imx25-tcq.c | 596 ++++++++++++++++++++
+ drivers/mfd/Kconfig | 96 +++-
+ drivers/mfd/Makefile | 9 +-
+ drivers/mfd/ab8500-core.c | 106 ++--
+ drivers/mfd/act8945a.c | 102 ++++
+ drivers/mfd/as3711.c | 4 +-
+ drivers/mfd/axp20x-i2c.c | 104 ++++
+ drivers/mfd/axp20x-rsb.c | 80 +++
+ drivers/mfd/axp20x.c | 105 +---
+ drivers/mfd/cs47l24-tables.c | 10 +-
+ drivers/mfd/da9062-core.c | 23 +-
+ drivers/mfd/da9063-i2c.c | 36 +-
+ drivers/mfd/db8500-prcmu.c | 7 +-
+ drivers/mfd/fsl-imx25-tsadc.c | 203 +++++++
+ drivers/mfd/intel-lpss-pci.c | 19 +-
+ drivers/mfd/intel-lpss.c | 1 +
+ drivers/mfd/intel_quark_i2c_gpio.c | 26 +-
+ drivers/mfd/mt6397-core.c | 105 +++-
+ drivers/mfd/rc5t583.c | 4 +-
+ drivers/mfd/syscon.c | 19 +-
+ drivers/mfd/tps65010.c | 21 +-
+ drivers/mfd/tps65086.c | 149 +++++
+ drivers/mfd/tps65090.c | 5 +-
+ drivers/mfd/tps65912-core.c | 240 +++-----
+ drivers/mfd/tps65912-i2c.c | 162 ++----
+ drivers/mfd/tps65912-irq.c | 217 --------
+ drivers/mfd/tps65912-spi.c | 160 ++----
+ drivers/mfd/wm5102-tables.c | 16 +-
+ drivers/mfd/wm5110-tables.c | 82 ++-
+ drivers/mfd/wm8998-tables.c | 12 +-
+ drivers/regulator/Kconfig | 2 +-
+ drivers/regulator/axp20x-regulator.c | 3 +
+ drivers/regulator/tps65912-regulator.c | 613 ++++-----------------
+ include/dt-bindings/iio/adc/fsl-imx25-gcq.h | 18 +
+ include/linux/mfd/as3711.h | 3 +-
+ include/linux/mfd/axp20x.h | 34 +-
+ include/linux/mfd/core.h | 26 +
+ include/linux/mfd/cros_ec.h | 2 +-
+ include/linux/mfd/imx25-tsadc.h | 140 +++++
+ include/linux/mfd/mt6323/core.h | 36 ++
+ include/linux/mfd/mt6323/registers.h | 408 ++++++++++++++
+ include/linux/mfd/mt6397/core.h | 2 +
+ include/linux/mfd/rc5t583.h | 5 +-
+ include/linux/mfd/syscon.h | 8 +-
+ include/linux/mfd/tps65086.h | 117 ++++
+ include/linux/mfd/tps65090.h | 5 +
+ include/linux/mfd/tps65912.h | 209 +++----
+ 64 files changed, 3817 insertions(+), 1625 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/fsl,imx25-gcq.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/act8945a.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/tps65912.txt
+ create mode 100644 drivers/gpio/gpio-tps65086.c
+ create mode 100644 drivers/iio/adc/fsl-imx25-gcq.c
+ create mode 100644 drivers/input/touchscreen/fsl-imx25-tcq.c
+ create mode 100644 drivers/mfd/act8945a.c
+ create mode 100644 drivers/mfd/axp20x-i2c.c
+ create mode 100644 drivers/mfd/axp20x-rsb.c
+ create mode 100644 drivers/mfd/fsl-imx25-tsadc.c
+ create mode 100644 drivers/mfd/tps65086.c
+ delete mode 100644 drivers/mfd/tps65912-irq.c
+ create mode 100644 include/dt-bindings/iio/adc/fsl-imx25-gcq.h
+ create mode 100644 include/linux/mfd/imx25-tsadc.h
+ create mode 100644 include/linux/mfd/mt6323/core.h
+ create mode 100644 include/linux/mfd/mt6323/registers.h
+ create mode 100644 include/linux/mfd/tps65086.h
+Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
+$ git merge backlight/for-backlight-next
+Already up-to-date.
+Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions)
+$ git merge battery/master
+Auto-merging drivers/power/bq27xxx_battery_i2c.c
+Auto-merging arch/arm/boot/dts/omap3-n900.dts
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/goldfish/battery.txt | 17 +
+ .../devicetree/bindings/power/act8945a-charger.txt | 35 ++
+ .../bindings/power_supply/ti,bq24735.txt | 3 +
+ arch/arm/boot/dts/omap3-n900.dts | 6 +-
+ drivers/power/88pm860x_charger.c | 2 +-
+ drivers/power/Kconfig | 7 +
+ drivers/power/Makefile | 1 +
+ drivers/power/act8945a_charger.c | 359 +++++++++++++++++++++
+ drivers/power/bq2415x_charger.c | 22 ++
+ drivers/power/bq24735-charger.c | 146 +++++++--
+ drivers/power/bq27xxx_battery.c | 12 +
+ drivers/power/bq27xxx_battery_i2c.c | 24 ++
+ drivers/power/collie_battery.c | 3 +-
+ drivers/power/goldfish_battery.c | 17 +-
+ drivers/power/ipaq_micro_battery.c | 4 +-
+ drivers/power/isp1704_charger.c | 19 +-
+ drivers/power/jz4740-battery.c | 2 +-
+ drivers/power/lp8788-charger.c | 2 +-
+ drivers/power/pm2301_charger.c | 22 +-
+ drivers/power/power_supply_sysfs.c | 3 +-
+ drivers/power/reset/Kconfig | 2 +
+ drivers/power/reset/arm-versatile-reboot.c | 39 ++-
+ include/linux/power/bq24735-charger.h | 2 +
+ include/linux/power_supply.h | 3 +
+ 24 files changed, 687 insertions(+), 65 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/goldfish/battery.txt
+ create mode 100644 Documentation/devicetree/bindings/power/act8945a-charger.txt
+ create mode 100644 drivers/power/act8945a_charger.c
+Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
+$ git merge omap_dss2/for-next
+Merge made by the 'recursive' strategy.
+ drivers/video/fbdev/Kconfig | 6 +-
+ drivers/video/fbdev/atafb.c | 3 -
+ drivers/video/fbdev/au1100fb.c | 22 -
+ drivers/video/fbdev/bf537-lq035.c | 23 -
+ drivers/video/fbdev/bt431.h | 43 +-
+ drivers/video/fbdev/bt455.h | 68 ++-
+ drivers/video/fbdev/da8xx-fb.c | 7 +-
+ drivers/video/fbdev/exynos/Kconfig | 6 +-
+ drivers/video/fbdev/exynos/Makefile | 6 +-
+ drivers/video/fbdev/exynos/exynos_mipi_dsi.c | 7 +-
+ drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +-
+ drivers/video/fbdev/metronomefb.c | 6 +-
+ drivers/video/fbdev/n411.c | 12 +-
+ drivers/video/fbdev/omap/omapfb_main.c | 22 -
+ drivers/video/fbdev/pmag-aa-fb.c | 602 +++++++++------------------
+ drivers/video/fbdev/pmag-ba-fb.c | 2 +-
+ drivers/video/fbdev/sis/init301.c | 10 +-
+ drivers/video/fbdev/skeletonfb.c | 17 -
+ drivers/video/fbdev/sunxvr1000.c | 42 +-
+ drivers/video/fbdev/sunxvr2500.c | 39 +-
+ drivers/video/fbdev/sunxvr500.c | 42 +-
+ include/linux/fb.h | 3 -
+ 22 files changed, 310 insertions(+), 680 deletions(-)
+Merging regulator/for-next (1d10ea6a8ba4 Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/s2mps11', 'regulator/topic/s5m8767' and 'regulator/topic/vexpress' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging drivers/regulator/axp20x-regulator.c
+Auto-merging drivers/regulator/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/act8945a-regulator.txt | 80 ++
+ .../regulator/hisilicon,hi655x-regulator.txt | 29 +
+ .../devicetree/bindings/regulator/lp872x.txt | 1 +
+ .../devicetree/bindings/regulator/max77802.txt | 2 +-
+ .../bindings/regulator/regulator-max77620.txt | 200 +++++
+ .../devicetree/bindings/regulator/regulator.txt | 5 +
+ Documentation/devicetree/bindings/sound/cs4271.txt | 7 +
+ MAINTAINERS | 4 +-
+ drivers/regulator/Kconfig | 26 +
+ drivers/regulator/Makefile | 9 +-
+ drivers/regulator/act8865-regulator.c | 8 +-
+ drivers/regulator/act8945a-regulator.c | 165 +++++
+ drivers/regulator/ad5398.c | 6 +-
+ drivers/regulator/axp20x-regulator.c | 56 +-
+ drivers/regulator/core.c | 75 +-
+ drivers/regulator/da9210-regulator.c | 5 +
+ drivers/regulator/fan53555.c | 18 +
+ drivers/regulator/gpio-regulator.c | 6 +-
+ drivers/regulator/helpers.c | 23 +
+ drivers/regulator/hi655x-regulator.c | 227 ++++++
+ drivers/regulator/lp872x.c | 38 +-
+ drivers/regulator/ltc3589.c | 15 +-
+ drivers/regulator/max77620-regulator.c | 813 +++++++++++++++++++++
+ .../regulator/{max77686.c => max77686-regulator.c} | 0
+ .../regulator/{max77802.c => max77802-regulator.c} | 0
+ drivers/regulator/mt6397-regulator.c | 15 +-
+ drivers/regulator/of_regulator.c | 6 +
+ drivers/regulator/pv88090-regulator.c | 8 +-
+ drivers/regulator/s2mps11.c | 43 +-
+ drivers/regulator/s5m8767.c | 13 +-
+ .../regulator/{vexpress.c => vexpress-regulator.c} | 0
+ include/linux/regulator/act8865.h | 4 +-
+ include/linux/regulator/driver.h | 17 +
+ include/linux/regulator/lp872x.h | 5 +
+ include/linux/regulator/machine.h | 12 +
+ sound/soc/codecs/cs4271.c | 69 +-
+ 36 files changed, 1889 insertions(+), 121 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/act8945a-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/hisilicon,hi655x-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/regulator-max77620.txt
+ create mode 100644 drivers/regulator/act8945a-regulator.c
+ create mode 100644 drivers/regulator/hi655x-regulator.c
+ create mode 100644 drivers/regulator/max77620-regulator.c
+ rename drivers/regulator/{max77686.c => max77686-regulator.c} (100%)
+ rename drivers/regulator/{max77802.c => max77802-regulator.c} (100%)
+ rename drivers/regulator/{vexpress.c => vexpress-regulator.c} (100%)
+Merging security/next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
+$ git merge security/next
+Auto-merging kernel/module.c
+Auto-merging include/linux/fs.h
+Removing crypto/asymmetric_keys/x509_rsakey.asn1
+Removing crypto/asymmetric_keys/rsa.c
+Removing crypto/asymmetric_keys/public_key.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/ima_policy | 1 +
+ MAINTAINERS | 4 +-
+ arch/arm/configs/colibri_pxa270_defconfig | 1 -
+ arch/arm/configs/iop13xx_defconfig | 1 -
+ arch/arm/configs/iop32x_defconfig | 1 -
+ arch/arm/configs/trizeps4_defconfig | 1 -
+ arch/microblaze/configs/mmu_defconfig | 1 -
+ arch/microblaze/configs/nommu_defconfig | 1 -
+ arch/mips/configs/bigsur_defconfig | 1 -
+ arch/mips/configs/ip22_defconfig | 1 -
+ arch/mips/configs/ip27_defconfig | 1 -
+ arch/mips/configs/ip32_defconfig | 1 -
+ arch/mips/configs/jazz_defconfig | 1 -
+ arch/mips/configs/lemote2f_defconfig | 1 -
+ arch/mips/configs/rm200_defconfig | 1 -
+ arch/mips/configs/sb1250_swarm_defconfig | 1 -
+ arch/parisc/configs/712_defconfig | 1 -
+ arch/parisc/configs/a500_defconfig | 1 -
+ arch/parisc/configs/default_defconfig | 1 -
+ arch/parisc/configs/generic-32bit_defconfig | 1 -
+ arch/powerpc/configs/c2k_defconfig | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/score/configs/spct6600_defconfig | 1 -
+ arch/tile/configs/tilegx_defconfig | 1 -
+ arch/tile/configs/tilepro_defconfig | 1 -
+ arch/x86/configs/i386_defconfig | 1 -
+ arch/x86/configs/x86_64_defconfig | 1 -
+ certs/Kconfig | 16 ++
+ certs/Makefile | 33 ++-
+ certs/system_certificates.S | 13 +
+ certs/system_keyring.c | 4 +-
+ crypto/asymmetric_keys/Kconfig | 7 -
+ crypto/asymmetric_keys/Makefile | 8 +-
+ crypto/asymmetric_keys/mscode_parser.c | 14 +-
+ crypto/asymmetric_keys/pkcs7_parser.c | 32 +--
+ crypto/asymmetric_keys/pkcs7_trust.c | 2 +-
+ crypto/asymmetric_keys/pkcs7_verify.c | 10 +-
+ crypto/asymmetric_keys/public_key.c | 154 +++++++----
+ crypto/asymmetric_keys/public_key.h | 36 ---
+ crypto/asymmetric_keys/rsa.c | 278 -------------------
+ crypto/asymmetric_keys/verify_pefile.c | 4 +-
+ crypto/asymmetric_keys/verify_pefile.h | 2 +-
+ crypto/asymmetric_keys/x509_cert_parser.c | 75 ++---
+ crypto/asymmetric_keys/x509_public_key.c | 34 +--
+ crypto/asymmetric_keys/x509_rsakey.asn1 | 4 -
+ crypto/rsa-pkcs1pad.c | 182 ++++++++++--
+ drivers/base/firmware_class.c | 78 ++----
+ drivers/char/tpm/tpm-chip.c | 19 +-
+ drivers/char/tpm/tpm.h | 7 -
+ drivers/char/tpm/tpm2-cmd.c | 22 +-
+ drivers/char/tpm/tpm_crb.c | 196 +++++++------
+ drivers/char/tpm/tpm_eventlog.c | 14 +-
+ drivers/char/tpm/tpm_tis.c | 253 +++++++++--------
+ fs/exec.c | 92 +++++++
+ include/crypto/public_key.h | 76 +-----
+ include/keys/trusted-type.h | 2 +-
+ include/linux/fs.h | 15 +
+ include/linux/ima.h | 10 +-
+ include/linux/key.h | 1 +
+ include/linux/lsm_hooks.h | 35 +--
+ include/linux/security.h | 16 +-
+ init/Kconfig | 2 +-
+ kernel/kexec_file.c | 73 +----
+ kernel/module.c | 68 +----
+ kernel/module_signing.c | 7 +
+ kernel/time/time.c | 9 +-
+ scripts/.gitignore | 1 +
+ scripts/Makefile | 1 +
+ scripts/extract-sys-certs.pl | 29 +-
+ scripts/insert-sys-cert.c | 410 ++++++++++++++++++++++++++++
+ scripts/sign-file.c | 238 ++++++++++------
+ security/integrity/Kconfig | 2 +-
+ security/integrity/digsig_asymmetric.c | 16 +-
+ security/integrity/iint.c | 4 +-
+ security/integrity/ima/ima.h | 49 ++--
+ security/integrity/ima/ima_api.c | 25 +-
+ security/integrity/ima/ima_appraise.c | 69 ++---
+ security/integrity/ima/ima_crypto.c | 120 +++++++-
+ security/integrity/ima/ima_fs.c | 53 +++-
+ security/integrity/ima/ima_init.c | 2 +-
+ security/integrity/ima/ima_main.c | 92 +++++--
+ security/integrity/ima/ima_policy.c | 115 +++++---
+ security/integrity/ima/ima_template.c | 2 -
+ security/integrity/ima/ima_template_lib.c | 1 -
+ security/integrity/integrity.h | 17 +-
+ security/keys/big_key.c | 15 +-
+ security/keys/key.c | 2 +
+ security/keys/trusted.c | 11 +-
+ security/security.c | 34 +--
+ security/selinux/Makefile | 2 +-
+ security/smack/smack_lsm.c | 46 +---
+ 91 files changed, 1924 insertions(+), 1365 deletions(-)
+ delete mode 100644 crypto/asymmetric_keys/public_key.h
+ delete mode 100644 crypto/asymmetric_keys/rsa.c
+ delete mode 100644 crypto/asymmetric_keys/x509_rsakey.asn1
+ create mode 100644 scripts/insert-sys-cert.c
+Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
+$ git merge integrity/next
+Already up-to-date.
+Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
+$ git merge keys/keys-next
+Already up-to-date.
+Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
+$ git merge selinux/next
+Already up-to-date.
+Merging tpmdd/next (2c4934e534eb Merge branch 'master' into next)
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+ drivers/char/tpm/st33zp24/Kconfig | 11 +-
+ drivers/char/tpm/st33zp24/i2c.c | 76 ++++++++++---
+ drivers/char/tpm/st33zp24/spi.c | 190 ++++++++++++++++++++-------------
+ drivers/char/tpm/st33zp24/st33zp24.c | 2 +-
+ drivers/char/tpm/st33zp24/st33zp24.h | 2 +-
+ include/linux/platform_data/st33zp24.h | 2 +-
+ 6 files changed, 182 insertions(+), 101 deletions(-)
+Merging lblnet/next (b2776bf7149b Linux 3.18)
+$ git merge lblnet/next
+Already up-to-date.
+Merging watchdog/master (97914cf66632 watchdog: imx2: Convert to use infrastructure triggered keepalives)
+$ git merge watchdog/master
+Resolved 'arch/arm64/boot/dts/arm/foundation-v8.dts' using previous resolution.
+Auto-merging drivers/watchdog/Makefile
+Auto-merging drivers/watchdog/Kconfig
+Auto-merging arch/arm64/boot/dts/arm/foundation-v8.dts
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/foundation-v8.dts
+Auto-merging arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi
+Auto-merging arch/arm/mach-lpc32xx/phy3250.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/watchdog/watchdog-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 68ed80060449] Merge remote-tracking branch 'watchdog/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/watchdog/sbsa-gwdt.txt | 31 ++
+ Documentation/watchdog/watchdog-kernel-api.txt | 59 ++-
+ Documentation/watchdog/watchdog-parameters.txt | 12 +
+ MAINTAINERS | 6 +
+ arch/arm/mach-lpc32xx/common.c | 15 -
+ arch/arm/mach-lpc32xx/common.h | 1 -
+ arch/arm/mach-lpc32xx/phy3250.c | 1 -
+ arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 8 +
+ arch/arm64/boot/dts/arm/foundation-v8.dts | 7 +
+ drivers/watchdog/Kconfig | 52 ++-
+ drivers/watchdog/Makefile | 3 +
+ drivers/watchdog/atlas7_wdt.c | 5 +
+ drivers/watchdog/bcm47xx_wdt.c | 3 +-
+ drivers/watchdog/da9063_wdt.c | 3 +-
+ drivers/watchdog/digicolor_wdt.c | 3 +-
+ drivers/watchdog/dw_wdt.c | 323 ++++++----------
+ drivers/watchdog/ebc-c384_wdt.c | 188 ++++++++++
+ drivers/watchdog/imgpdc_wdt.c | 3 +-
+ drivers/watchdog/imx2_wdt.c | 77 +---
+ drivers/watchdog/lpc18xx_wdt.c | 3 +-
+ drivers/watchdog/meson_wdt.c | 3 +-
+ drivers/watchdog/moxart_wdt.c | 3 +-
+ drivers/watchdog/mtk_wdt.c | 3 +-
+ drivers/watchdog/ni903x_wdt.c | 270 ++++++++++++++
+ drivers/watchdog/pnx4008_wdt.c | 42 ++-
+ drivers/watchdog/qcom-wdt.c | 3 +-
+ drivers/watchdog/rc32434_wdt.c | 2 +-
+ drivers/watchdog/s3c2410_wdt.c | 19 +-
+ drivers/watchdog/sbsa_gwdt.c | 408 +++++++++++++++++++++
+ drivers/watchdog/sunxi_wdt.c | 3 +-
+ drivers/watchdog/tangox_wdt.c | 14 +-
+ drivers/watchdog/w83627hf_wdt.c | 22 +-
+ drivers/watchdog/watchdog_core.c | 4 +-
+ drivers/watchdog/watchdog_dev.c | 205 ++++++++++-
+ drivers/watchdog/ziirave_wdt.c | 2 +-
+ include/linux/watchdog.h | 43 ++-
+ 36 files changed, 1495 insertions(+), 354 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/sbsa-gwdt.txt
+ create mode 100644 drivers/watchdog/ebc-c384_wdt.c
+ create mode 100644 drivers/watchdog/ni903x_wdt.c
+ create mode 100644 drivers/watchdog/sbsa_gwdt.c
+Merging iommu/next (d459a0941140 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next)
+$ git merge iommu/next
+Resolved 'arch/arm64/boot/dts/mediatek/mt8173.dtsi' using previous resolution.
+Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi
+CONFLICT (content): Merge conflict in arch/arm64/boot/dts/mediatek/mt8173.dtsi
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5f7b2772162a] Merge remote-tracking branch 'iommu/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/iommu/mediatek,iommu.txt | 68 ++
+ .../bindings/iommu/renesas,ipmmu-vmsa.txt | 15 +-
+ .../devicetree/bindings/iommu/samsung,sysmmu.txt | 22 +-
+ .../memory-controllers/mediatek,smi-common.txt | 24 +
+ .../memory-controllers/mediatek,smi-larb.txt | 25 +
+ MAINTAINERS | 8 +
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 81 ++
+ drivers/iommu/Kconfig | 42 +-
+ drivers/iommu/Makefile | 2 +
+ drivers/iommu/arm-smmu-v3.c | 50 +-
+ drivers/iommu/arm-smmu.c | 79 +-
+ drivers/iommu/exynos-iommu.c | 608 +++++++++------
+ drivers/iommu/io-pgtable-arm-v7s.c | 846 +++++++++++++++++++++
+ drivers/iommu/io-pgtable-arm.c | 34 +-
+ drivers/iommu/io-pgtable.c | 5 +-
+ drivers/iommu/io-pgtable.h | 53 +-
+ drivers/iommu/iommu.c | 3 +-
+ drivers/iommu/mtk_iommu.c | 736 ++++++++++++++++++
+ drivers/iommu/of_iommu.c | 1 +
+ drivers/iommu/rockchip-iommu.c | 214 ++++--
+ drivers/memory/Kconfig | 8 +
+ drivers/memory/Makefile | 1 +
+ drivers/memory/mtk-smi.c | 273 +++++++
+ include/dt-bindings/memory/mt8173-larb-port.h | 111 +++
+ include/soc/mediatek/smi.h | 58 ++
+ 25 files changed, 2953 insertions(+), 414 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.txt
+ create mode 100644 Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt
+ create mode 100644 drivers/iommu/io-pgtable-arm-v7s.c
+ create mode 100644 drivers/iommu/mtk_iommu.c
+ create mode 100644 drivers/memory/mtk-smi.c
+ create mode 100644 include/dt-bindings/memory/mt8173-larb-port.h
+ create mode 100644 include/soc/mediatek/smi.h
+Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
+$ git merge vfio/next
+Auto-merging drivers/vfio/pci/vfio_pci.c
+Merge made by the 'recursive' strategy.
+ drivers/vfio/pci/Kconfig | 4 +
+ drivers/vfio/pci/Makefile | 1 +
+ drivers/vfio/pci/vfio_pci.c | 175 +++++++++++++++++++++-
+ drivers/vfio/pci/vfio_pci_config.c | 45 +++++-
+ drivers/vfio/pci/vfio_pci_igd.c | 280 ++++++++++++++++++++++++++++++++++++
+ drivers/vfio/pci/vfio_pci_intrs.c | 17 +--
+ drivers/vfio/pci/vfio_pci_private.h | 39 +++++
+ drivers/vfio/pci/vfio_pci_rdwr.c | 9 +-
+ drivers/vfio/vfio.c | 70 +++++++--
+ include/linux/vfio.h | 11 ++
+ include/uapi/linux/vfio.h | 92 +++++++++++-
+ 11 files changed, 706 insertions(+), 37 deletions(-)
+ create mode 100644 drivers/vfio/pci/vfio_pci_igd.c
+Merging jc_docs/docs-next (510e64fb0423 Doc: ARM: Fix a typo in clksrc-change-registers.awk)
+$ git merge jc_docs/docs-next
+Auto-merging Documentation/DocBook/device-drivers.tmpl
+Merge made by the 'recursive' strategy.
+ Documentation/CodingStyle | 2 +-
+ Documentation/DocBook/device-drivers.tmpl | 2 +-
+ Documentation/HOWTO | 7 +-
+ Documentation/SubmittingPatches | 2 +-
+ .../arm/Samsung/clksrc-change-registers.awk | 2 +-
+ Documentation/features/list-arch.sh | 2 +-
+ Documentation/i2c/dev-interface | 2 +-
+ Documentation/i2c/slave-eeprom-backend | 4 +-
+ Documentation/ja_JP/HOWTO | 2 +-
+ Documentation/ko_KR/HOWTO | 4 +-
+ Documentation/ko_KR/stable_api_nonsense.txt | 4 +-
+ Documentation/mic/mpssd/mpssd.c | 4 +-
+ .../prctl/disable-tsc-ctxt-sw-stress-test.c | 2 +-
+ .../prctl/disable-tsc-on-off-stress-test.c | 2 +-
+ Documentation/prctl/disable-tsc-test.c | 2 +-
+ Documentation/ptp/testptp.c | 3 +-
+ Documentation/timers/hpet_example.c | 2 +-
+ Documentation/zh_CN/arm64/booting.txt | 93 ++++++++++++++--------
+ Documentation/zh_CN/arm64/silicon-errata.txt | 74 +++++++++++++++++
+ README | 14 ++--
+ 20 files changed, 161 insertions(+), 68 deletions(-)
+ create mode 100644 Documentation/zh_CN/arm64/silicon-errata.txt
+Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
+$ git merge trivial/for-next
+Auto-merging net/openvswitch/vport-geneve.c
+Auto-merging mm/balloon_compaction.c
+Auto-merging lib/842/842_decompress.c
+Auto-merging kernel/time/timekeeping.c
+Auto-merging drivers/usb/gadget/legacy/Kconfig
+Auto-merging drivers/rtc/rtc-rx8025.c
+Auto-merging drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_fence.c
+Merge made by the 'recursive' strategy.
+ REPORTING-BUGS | 2 +-
+ drivers/atm/firestream.c | 2 +-
+ drivers/crypto/nx/nx-842.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_fence.c | 10 +++++-----
+ drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 +-
+ drivers/input/touchscreen/wdt87xx_i2c.c | 2 +-
+ drivers/net/ethernet/nuvoton/w90p910_ether.c | 2 +-
+ drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 2 +-
+ drivers/rtc/rtc-rx8025.c | 2 +-
+ drivers/usb/gadget/legacy/Kconfig | 3 +--
+ kernel/time/timekeeping.c | 2 +-
+ lib/842/842_decompress.c | 2 +-
+ lib/flex_proportions.c | 2 +-
+ lib/percpu-refcount.c | 2 +-
+ mm/balloon_compaction.c | 4 ++--
+ net/openvswitch/vport-geneve.c | 2 +-
+ tools/testing/selftests/timers/alarmtimer-suspend.c | 2 +-
+ 17 files changed, 22 insertions(+), 23 deletions(-)
+Merging audit/next (fd97646b0595 audit: Fix typo in comment)
+$ git merge audit/next
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit.c
+Merge made by the 'recursive' strategy.
+ include/uapi/linux/audit.h | 1 +
+ kernel/audit.c | 20 +++++++++++++++++++-
+ kernel/audit_watch.c | 2 +-
+ kernel/auditfilter.c | 6 +++---
+ 4 files changed, 24 insertions(+), 5 deletions(-)
+Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (fa38a82096a1 scripts/dtc: Update to upstream version 53bf130b1cdd)
+$ git merge dt-rh/for-next
+Auto-merging include/linux/of.h
+Auto-merging Documentation/devicetree/bindings/arm/cpus.txt
+Auto-merging Documentation/devicetree/bindings/arm/arm-boards
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/arm-boards | 4 +-
+ Documentation/devicetree/bindings/arm/cpus.txt | 2 +-
+ .../devicetree/bindings/input/ads7846.txt | 2 +
+ .../devicetree/bindings/property-units.txt | 39 +++
+ arch/arm/boot/compressed/string.c | 9 +
+ drivers/of/base.c | 15 +-
+ drivers/of/of_reserved_mem.c | 4 +-
+ drivers/of/resolver.c | 7 +-
+ drivers/of/unittest.c | 5 +
+ include/linux/of.h | 18 +-
+ scripts/Makefile.lib | 3 +-
+ scripts/dtc/checks.c | 28 +-
+ scripts/dtc/dtc-lexer.l | 39 ++-
+ scripts/dtc/dtc-lexer.lex.c_shipped | 101 +++---
+ scripts/dtc/dtc-parser.tab.c_shipped | 84 ++---
+ scripts/dtc/dtc-parser.y | 20 +-
+ scripts/dtc/dtc.c | 62 +++-
+ scripts/dtc/dtx_diff | 349 +++++++++++++++++++++
+ scripts/dtc/flattree.c | 4 +-
+ scripts/dtc/libfdt/fdt.c | 13 +-
+ scripts/dtc/libfdt/fdt_ro.c | 106 ++++++-
+ scripts/dtc/libfdt/fdt_rw.c | 2 +
+ scripts/dtc/libfdt/libfdt.h | 73 ++++-
+ scripts/dtc/util.c | 3 +-
+ scripts/dtc/version_gen.h | 2 +-
+ 25 files changed, 855 insertions(+), 139 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/property-units.txt
+ create mode 100755 scripts/dtc/dtx_diff
+Merging mailbox/mailbox-for-next (14d653af4e32 mailbox/xgene-slimpro: Checking for IS_ERR instead of NULL)
+$ git merge mailbox/mailbox-for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/mailbox/hisilicon,hi6220-mailbox.txt | 74 ++++
+ .../devicetree/bindings/mailbox/sti-mailbox.txt | 2 +-
+ .../bindings/mailbox/xgene-slimpro-mailbox.txt | 35 ++
+ drivers/mailbox/Kconfig | 17 +
+ drivers/mailbox/Makefile | 4 +
+ drivers/mailbox/hi6220-mailbox.c | 395 +++++++++++++++++++++
+ drivers/mailbox/mailbox-test.c | 53 +--
+ drivers/mailbox/mailbox-xgene-slimpro.c | 284 +++++++++++++++
+ 8 files changed, 841 insertions(+), 23 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mailbox/hisilicon,hi6220-mailbox.txt
+ create mode 100644 Documentation/devicetree/bindings/mailbox/xgene-slimpro-mailbox.txt
+ create mode 100644 drivers/mailbox/hi6220-mailbox.c
+ create mode 100644 drivers/mailbox/mailbox-xgene-slimpro.c
+Merging spi/for-next (215ed9297ce1 Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/sh' and 'spi/topic/ti-qspi' into spi-next)
+$ git merge spi/for-next
+Auto-merging drivers/spi/spi-rockchip.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/spi/adi,axi-spi-engine.txt | 31 ++
+ .../bindings/spi/icpdas-lp8841-spi-rtc.txt | 54 ++
+ .../devicetree/bindings/spi/spi-rockchip.txt | 1 +
+ drivers/spi/Kconfig | 96 ++--
+ drivers/spi/Makefile | 5 +-
+ drivers/spi/spi-axi-spi-engine.c | 591 +++++++++++++++++++++
+ drivers/spi/spi-bcm2835.c | 5 -
+ drivers/spi/spi-bcm2835aux.c | 72 ++-
+ drivers/spi/spi-dw-mid.c | 4 +-
+ drivers/spi/spi-dw-mmio.c | 5 -
+ drivers/spi/spi-imx.c | 354 ++++++------
+ drivers/spi/spi-lp8841-rtc.c | 256 +++++++++
+ drivers/spi/spi-pl022.c | 7 -
+ drivers/spi/spi-pxa2xx-dma.c | 8 +-
+ drivers/spi/spi-pxa2xx-pci.c | 13 +
+ drivers/spi/spi-pxa2xx.c | 151 ++++--
+ drivers/spi/spi-pxa2xx.h | 37 --
+ drivers/spi/spi-rockchip.c | 16 +-
+ drivers/spi/spi-ti-qspi.c | 139 ++++-
+ drivers/spi/spi.c | 402 +++++++++++++-
+ include/linux/pxa2xx_ssp.h | 1 +
+ include/linux/spi/spi.h | 145 +++++
+ 22 files changed, 2020 insertions(+), 373 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/adi,axi-spi-engine.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/icpdas-lp8841-spi-rtc.txt
+ create mode 100644 drivers/spi/spi-axi-spi-engine.c
+ create mode 100644 drivers/spi/spi-lp8841-rtc.c
+Merging tip/auto-latest (9157e20ef190 x86/cpufeatures: Fix up semantic conflict)
+$ git merge tip/auto-latest
+Resolved 'drivers/cpufreq/intel_pstate.c' using previous resolution.
+Resolved 'drivers/firmware/efi/libstub/arm64-stub.c' using previous resolution.
+Resolved 'drivers/firmware/efi/libstub/efistub.h' using previous resolution.
+Auto-merging scripts/sortextable.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/time/timekeeping.c
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sched/rt.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/deadline.c
+Auto-merging kernel/kexec_file.c
+Auto-merging include/linux/perf_event.h
+Auto-merging include/linux/ioport.h
+Auto-merging include/linux/efi.h
+Auto-merging fs/exec.c
+Auto-merging fs/btrfs/disk-io.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+Auto-merging drivers/firmware/efi/libstub/efistub.h
+CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/efistub.h
+Auto-merging drivers/firmware/efi/libstub/arm64-stub.c
+CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/arm64-stub.c
+Auto-merging drivers/firmware/efi/libstub/arm-stub.c
+Auto-merging drivers/firmware/efi/libstub/Makefile
+Auto-merging drivers/cpufreq/intel_pstate.c
+CONFLICT (content): Merge conflict in drivers/cpufreq/intel_pstate.c
+Auto-merging drivers/acpi/acpi_platform.c
+Auto-merging arch/x86/include/asm/efi.h
+Auto-merging arch/x86/events/perf_event.h
+Auto-merging arch/x86/events/intel/uncore_snbep.c
+Auto-merging arch/x86/events/intel/uncore_snb.c
+Auto-merging arch/x86/events/intel/uncore_nhmex.c
+Auto-merging arch/x86/events/intel/uncore.h
+Auto-merging arch/x86/events/intel/uncore.c
+Auto-merging arch/x86/events/intel/rapl.c
+Auto-merging arch/x86/events/intel/pt.c
+Auto-merging arch/x86/events/intel/p6.c
+Auto-merging arch/x86/events/intel/p4.c
+Auto-merging arch/x86/events/intel/lbr.c
+Auto-merging arch/x86/events/intel/knc.c
+Auto-merging arch/x86/events/intel/ds.c
+Auto-merging arch/x86/events/intel/cstate.c
+Auto-merging arch/x86/events/intel/cqm.c
+Auto-merging arch/x86/events/intel/core.c
+Auto-merging arch/x86/events/intel/bts.c
+Auto-merging arch/x86/events/core.c
+Auto-merging arch/x86/events/amd/uncore.c
+Auto-merging arch/x86/events/amd/iommu.c
+Auto-merging arch/x86/events/amd/ibs.c
+Auto-merging arch/x86/events/amd/core.c
+Auto-merging arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S
+Auto-merging arch/s390/kernel/setup.c
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/arm64/kernel/vmlinux.lds.S
+Auto-merging arch/arm64/kernel/smp.c
+Auto-merging arch/arm64/kernel/setup.c
+Auto-merging arch/arm/kvm/arm.c
+Auto-merging arch/arc/kernel/smp.c
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ptp/testptp.c
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 609f155b9d48] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ .../marvell,odmi-controller.txt | 41 +
+ .../bindings/interrupt-controller/mips-gic.txt | 7 +
+ .../interrupt-controller/sigma,smp8642-intc.txt | 49 +
+ Documentation/efi-stub.txt | 4 +-
+ Documentation/kernel-parameters.txt | 25 +-
+ Documentation/ptp/testptp.c | 6 +-
+ Documentation/sysctl/kernel.txt | 21 +
+ Documentation/x86/early-microcode.txt | 25 +
+ Documentation/x86/exception-tables.txt | 35 +
+ Documentation/x86/x86_64/boot-options.txt | 2 +
+ Documentation/x86/x86_64/mm.txt | 12 +-
+ MAINTAINERS | 7 +
+ Makefile | 23 +-
+ arch/Kconfig | 6 +
+ arch/alpha/kernel/smp.c | 2 +-
+ arch/arc/kernel/smp.c | 2 +-
+ arch/arm/include/asm/cacheflush.h | 1 -
+ arch/arm/kernel/setup.c | 6 +-
+ arch/arm/kernel/smp.c | 2 +-
+ arch/arm/kvm/arm.c | 8 +-
+ arch/arm/kvm/psci.c | 4 +-
+ arch/arm/plat-samsung/pm-check.c | 4 +-
+ arch/arm/vdso/vdso.S | 3 +-
+ arch/arm64/include/asm/cacheflush.h | 4 -
+ arch/arm64/kernel/setup.c | 6 +-
+ arch/arm64/kernel/smp.c | 2 +-
+ arch/arm64/kernel/vmlinux.lds.S | 1 +
+ arch/avr32/kernel/setup.c | 6 +-
+ arch/blackfin/mach-common/smp.c | 2 +-
+ arch/c6x/kernel/setup.c | 2 -
+ arch/cris/arch-v32/drivers/cryptocop.c | 8 +-
+ arch/hexagon/kernel/smp.c | 2 +-
+ arch/ia64/include/uapi/asm/siginfo.h | 13 +-
+ arch/ia64/kernel/efi.c | 13 +-
+ arch/ia64/kernel/err_inject.c | 3 +-
+ arch/ia64/kernel/setup.c | 6 +-
+ arch/ia64/kernel/smpboot.c | 2 +-
+ arch/m32r/kernel/setup.c | 4 +-
+ arch/m32r/kernel/smpboot.c | 2 +-
+ arch/metag/kernel/smp.c | 2 +-
+ arch/microblaze/kernel/setup.c | 2 -
+ arch/mips/Kconfig | 7 +-
+ arch/mips/ath79/irq.c | 244 +----
+ arch/mips/bmips/irq.c | 10 +-
+ arch/mips/include/asm/mach-ath79/ath79.h | 4 +
+ arch/mips/include/asm/smp-ops.h | 5 +-
+ arch/mips/include/uapi/asm/siginfo.h | 13 +-
+ arch/mips/kernel/Makefile | 1 -
+ arch/mips/kernel/setup.c | 10 +-
+ arch/mips/kernel/smp-cmp.c | 4 +-
+ arch/mips/kernel/smp-cps.c | 4 +-
+ arch/mips/kernel/smp-mt.c | 2 +-
+ arch/mips/kernel/smp.c | 138 ++-
+ arch/mips/kvm/mips.c | 8 +-
+ arch/mips/mm/gup.c | 3 +-
+ arch/mn10300/kernel/smp.c | 2 +-
+ arch/parisc/include/asm/cache.h | 3 +
+ arch/parisc/include/asm/cacheflush.h | 4 -
+ arch/parisc/kernel/smp.c | 2 +-
+ arch/parisc/mm/init.c | 6 +-
+ arch/powerpc/include/asm/kvm_host.h | 4 +-
+ arch/powerpc/include/asm/mman.h | 5 +-
+ arch/powerpc/include/asm/mmu_context.h | 12 +
+ arch/powerpc/kernel/setup_32.c | 2 -
+ arch/powerpc/kernel/setup_64.c | 3 -
+ arch/powerpc/kernel/smp.c | 2 +-
+ arch/powerpc/kvm/book3s_hv.c | 23 +-
+ arch/powerpc/mm/mem.c | 2 +-
+ arch/s390/include/asm/kvm_host.h | 2 +-
+ arch/s390/include/asm/mmu_context.h | 12 +
+ arch/s390/kernel/early.c | 1 -
+ arch/s390/kernel/setup.c | 8 +-
+ arch/s390/kernel/smp.c | 2 +-
+ arch/s390/kvm/interrupt.c | 4 +-
+ arch/s390/mm/gup.c | 4 +-
+ arch/score/kernel/setup.c | 2 +-
+ arch/sh/kernel/setup.c | 8 +-
+ arch/sh/kernel/smp.c | 2 +-
+ arch/sh/mm/gup.c | 2 +-
+ arch/sparc/kernel/head_64.S | 8 -
+ arch/sparc/kernel/smp_32.c | 2 +-
+ arch/sparc/kernel/smp_64.c | 2 +-
+ arch/sparc/mm/gup.c | 2 +-
+ arch/sparc/mm/init_64.c | 8 +-
+ arch/tile/kernel/setup.c | 11 +-
+ arch/tile/kernel/smpboot.c | 2 +-
+ arch/um/include/asm/mmu_context.h | 14 +
+ arch/unicore32/include/asm/mmu_context.h | 12 +
+ arch/unicore32/kernel/setup.c | 6 +-
+ arch/x86/Kbuild | 3 +-
+ arch/x86/Kconfig | 43 +-
+ arch/x86/Kconfig.debug | 28 +-
+ arch/x86/boot/Makefile | 3 +-
+ arch/x86/boot/compressed/Makefile | 3 +-
+ arch/x86/boot/cpuflags.h | 2 +-
+ arch/x86/boot/mkcpustr.c | 2 +-
+ arch/x86/boot/tools/build.c | 1 -
+ arch/x86/crypto/aesni-intel_asm.S | 75 +-
+ arch/x86/crypto/camellia-aesni-avx-asm_64.S | 15 +
+ arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 15 +
+ arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 9 +
+ arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 13 +
+ arch/x86/crypto/crc32-pclmul_glue.c | 2 +-
+ arch/x86/crypto/crc32c-intel_glue.c | 2 +-
+ arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 8 +-
+ arch/x86/crypto/crct10dif-pclmul_glue.c | 2 +-
+ arch/x86/crypto/ghash-clmulni-intel_asm.S | 5 +
+ arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 13 +
+ arch/x86/crypto/serpent-avx2-asm_64.S | 13 +
+ arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S | 35 +-
+ arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S | 36 +-
+ arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 13 +
+ arch/x86/entry/Makefile | 4 +
+ arch/x86/entry/calling.h | 31 -
+ arch/x86/entry/common.c | 48 +-
+ arch/x86/entry/entry_32.S | 2 +-
+ arch/x86/entry/entry_64.S | 276 ++---
+ arch/x86/entry/syscall_32.c | 10 +-
+ arch/x86/entry/syscall_64.c | 13 +-
+ arch/x86/entry/syscalls/syscall_64.tbl | 20 +-
+ arch/x86/entry/syscalls/syscalltbl.sh | 58 +-
+ arch/x86/entry/thunk_64.S | 4 +
+ arch/x86/entry/vdso/Makefile | 6 +-
+ arch/x86/entry/vdso/vclock_gettime.c | 2 +-
+ arch/x86/entry/vdso/vdso2c.h | 9 +-
+ arch/x86/entry/vdso/vdso32-setup.c | 1 -
+ arch/x86/entry/vdso/vdso32/system_call.S | 2 +-
+ arch/x86/entry/vdso/vma.c | 127 ++-
+ arch/x86/entry/vsyscall/vsyscall_gtod.c | 9 +-
+ arch/x86/events/Makefile | 13 +
+ .../cpu/perf_event_amd.c => events/amd/core.c} | 2 +-
+ .../cpu/perf_event_amd_ibs.c => events/amd/ibs.c} | 12 +-
+ .../perf_event_amd_iommu.c => events/amd/iommu.c} | 4 +-
+ .../perf_event_amd_iommu.h => events/amd/iommu.h} | 0
+ .../amd/uncore.c} | 4 +-
+ .../x86/{kernel/cpu/perf_event.c => events/core.c} | 9 +-
+ .../perf_event_intel_bts.c => events/intel/bts.c} | 2 +-
+ .../cpu/perf_event_intel.c => events/intel/core.c} | 2 +-
+ .../perf_event_intel_cqm.c => events/intel/cqm.c} | 34 +-
+ .../intel/cstate.c} | 2 +-
+ .../perf_event_intel_ds.c => events/intel/ds.c} | 8 +-
+ .../cpu/perf_event_knc.c => events/intel/knc.c} | 2 +-
+ .../perf_event_intel_lbr.c => events/intel/lbr.c} | 4 +-
+ .../cpu/perf_event_p4.c => events/intel/p4.c} | 2 +-
+ .../cpu/perf_event_p6.c => events/intel/p6.c} | 2 +-
+ .../perf_event_intel_pt.c => events/intel/pt.c} | 4 +-
+ .../{kernel/cpu/intel_pt.h => events/intel/pt.h} | 0
+ .../intel/rapl.c} | 418 ++++----
+ .../intel/uncore.c} | 677 ++++++------
+ .../intel/uncore.h} | 55 +-
+ .../intel/uncore_nhmex.c} | 8 +-
+ .../intel/uncore_snb.c} | 16 +-
+ .../intel/uncore_snbep.c} | 21 +-
+ .../{kernel/cpu/perf_event_msr.c => events/msr.c} | 0
+ arch/x86/{kernel/cpu => events}/perf_event.h | 2 +-
+ arch/x86/include/asm/alternative.h | 6 -
+ arch/x86/include/asm/apic.h | 1 -
+ arch/x86/include/asm/arch_hweight.h | 2 +
+ arch/x86/include/asm/asm.h | 40 +-
+ arch/x86/include/asm/barrier.h | 15 +-
+ arch/x86/include/asm/bitops.h | 36 +-
+ arch/x86/include/asm/cacheflush.h | 6 -
+ arch/x86/include/asm/clocksource.h | 9 +-
+ arch/x86/include/asm/cmpxchg.h | 1 +
+ arch/x86/include/asm/cpufeature.h | 507 ++-------
+ arch/x86/include/asm/cpufeatures.h | 289 +++++
+ arch/x86/include/asm/desc_defs.h | 23 +
+ arch/x86/include/asm/disabled-features.h | 15 +
+ arch/x86/include/asm/dmi.h | 2 +-
+ arch/x86/include/asm/efi.h | 28 +-
+ arch/x86/include/asm/elf.h | 2 +-
+ arch/x86/include/asm/fixmap.h | 2 +-
+ arch/x86/include/asm/fpu/internal.h | 20 +-
+ arch/x86/include/asm/fpu/types.h | 12 +
+ arch/x86/include/asm/fpu/xstate.h | 3 +-
+ arch/x86/include/asm/frame.h | 59 +-
+ arch/x86/include/asm/ftrace.h | 2 +-
+ arch/x86/include/asm/hw_irq.h | 14 -
+ arch/x86/include/asm/imr.h | 2 +-
+ arch/x86/include/asm/irq_work.h | 2 +-
+ arch/x86/include/asm/kvm_para.h | 7 -
+ arch/x86/include/asm/mce.h | 1 +
+ arch/x86/include/asm/microcode.h | 26 +
+ arch/x86/include/asm/mmu.h | 3 +-
+ arch/x86/include/asm/mmu_context.h | 85 +-
+ arch/x86/include/asm/msr-index.h | 11 +-
+ arch/x86/include/asm/mwait.h | 2 +
+ arch/x86/include/asm/paravirt.h | 9 +-
+ arch/x86/include/asm/paravirt_types.h | 18 +-
+ arch/x86/include/asm/pgtable.h | 38 +
+ arch/x86/include/asm/pgtable_types.h | 39 +-
+ arch/x86/include/asm/pkeys.h | 34 +
+ arch/x86/include/asm/preempt.h | 13 +-
+ arch/x86/include/asm/processor.h | 5 +-
+ arch/x86/include/asm/qspinlock_paravirt.h | 4 +
+ arch/x86/include/asm/required-features.h | 7 +
+ arch/x86/include/asm/rwsem.h | 2 +-
+ arch/x86/include/asm/sections.h | 2 +-
+ arch/x86/include/asm/sighandling.h | 1 -
+ arch/x86/include/asm/smap.h | 2 +-
+ arch/x86/include/asm/smp.h | 1 -
+ arch/x86/include/asm/special_insns.h | 22 +
+ arch/x86/include/asm/thread_info.h | 2 +-
+ arch/x86/include/asm/tlbflush.h | 58 +
+ arch/x86/include/asm/topology.h | 11 +
+ arch/x86/include/asm/tsc.h | 2 +
+ arch/x86/include/asm/uaccess.h | 21 +-
+ arch/x86/include/asm/uaccess_64.h | 2 +-
+ arch/x86/include/asm/vdso.h | 3 -
+ arch/x86/include/asm/vgtod.h | 6 +
+ arch/x86/include/asm/xen/hypercall.h | 5 +-
+ arch/x86/include/uapi/asm/mman.h | 22 +
+ arch/x86/include/uapi/asm/processor-flags.h | 2 +
+ arch/x86/include/uapi/asm/sigcontext.h | 32 +-
+ arch/x86/include/uapi/asm/ucontext.h | 53 +-
+ arch/x86/kernel/Makefile | 11 +-
+ arch/x86/kernel/acpi/boot.c | 4 +-
+ arch/x86/kernel/acpi/wakeup_64.S | 3 +
+ arch/x86/kernel/apic/apic.c | 16 +-
+ arch/x86/kernel/apic/apic_numachip.c | 4 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 2 +-
+ arch/x86/kernel/apm_32.c | 2 +-
+ arch/x86/kernel/asm-offsets_32.c | 2 +-
+ arch/x86/kernel/asm-offsets_64.c | 10 +-
+ arch/x86/kernel/cpu/Makefile | 26 +-
+ arch/x86/kernel/cpu/amd.c | 30 +-
+ arch/x86/kernel/cpu/bugs_64.c | 2 +-
+ arch/x86/kernel/cpu/centaur.c | 12 +-
+ arch/x86/kernel/cpu/common.c | 122 ++-
+ arch/x86/kernel/cpu/cyrix.c | 11 +-
+ arch/x86/kernel/cpu/hypervisor.c | 2 +-
+ arch/x86/kernel/cpu/intel.c | 25 +-
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +-
+ arch/x86/kernel/cpu/match.c | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce-inject.c | 15 +-
+ arch/x86/kernel/cpu/mcheck/mce-severity.c | 22 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 85 +-
+ arch/x86/kernel/cpu/mcheck/mce_amd.c | 111 +-
+ arch/x86/kernel/cpu/mcheck/p5.c | 18 +-
+ arch/x86/kernel/cpu/mcheck/therm_throt.c | 15 +-
+ arch/x86/kernel/cpu/mcheck/threshold.c | 4 +-
+ arch/x86/kernel/cpu/mcheck/winchip.c | 5 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 17 +-
+ arch/x86/kernel/cpu/microcode/core.c | 19 +-
+ arch/x86/kernel/cpu/microcode/intel.c | 285 +++--
+ arch/x86/kernel/cpu/mkcapflags.sh | 6 +-
+ arch/x86/kernel/cpu/mshyperv.c | 8 +-
+ arch/x86/kernel/cpu/mtrr/centaur.c | 2 +-
+ arch/x86/kernel/cpu/mtrr/cleanup.c | 44 +-
+ arch/x86/kernel/cpu/mtrr/generic.c | 25 +-
+ arch/x86/kernel/cpu/mtrr/main.c | 22 +-
+ arch/x86/kernel/cpu/rdrand.c | 2 +-
+ arch/x86/kernel/cpu/topology.c | 4 +-
+ arch/x86/kernel/cpu/transmeta.c | 10 +-
+ arch/x86/kernel/cpu/vmware.c | 5 +-
+ arch/x86/kernel/crash.c | 41 +-
+ arch/x86/kernel/e820.c | 39 +-
+ arch/x86/kernel/early_printk.c | 2 +-
+ arch/x86/kernel/fpu/core.c | 115 +-
+ arch/x86/kernel/fpu/init.c | 13 +-
+ arch/x86/kernel/fpu/regset.c | 2 +-
+ arch/x86/kernel/fpu/xstate.c | 185 +++-
+ arch/x86/kernel/ftrace.c | 17 +-
+ arch/x86/kernel/head64.c | 14 +-
+ arch/x86/kernel/head_32.S | 8 +-
+ arch/x86/kernel/head_64.S | 5 +-
+ arch/x86/kernel/hpet.c | 1 +
+ arch/x86/kernel/kexec-bzimage64.c | 2 +-
+ arch/x86/kernel/kgdb.c | 12 +-
+ arch/x86/kernel/kprobes/core.c | 61 +-
+ arch/x86/kernel/kvmclock.c | 2 +-
+ arch/x86/kernel/ldt.c | 4 +-
+ arch/x86/kernel/mcount_64.S | 14 +-
+ arch/x86/kernel/mpparse.c | 2 +-
+ arch/x86/kernel/msr.c | 2 +-
+ arch/x86/kernel/pmem.c | 4 +-
+ arch/x86/kernel/process.c | 4 +-
+ arch/x86/kernel/process_64.c | 2 +
+ arch/x86/kernel/setup.c | 15 +-
+ arch/x86/kernel/signal.c | 127 ++-
+ arch/x86/kernel/smpboot.c | 102 +-
+ arch/x86/kernel/test_nx.c | 2 -
+ arch/x86/kernel/test_rodata.c | 2 +-
+ arch/x86/kernel/traps.c | 56 +-
+ arch/x86/kernel/tsc.c | 69 +-
+ arch/x86/kernel/verify_cpu.S | 2 +-
+ arch/x86/kernel/vm86_32.c | 2 +-
+ arch/x86/kernel/vmlinux.lds.S | 42 +-
+ arch/x86/kvm/emulate.c | 31 +-
+ arch/x86/kvm/lapic.c | 6 +-
+ arch/x86/kvm/mmu.c | 4 +-
+ arch/x86/kvm/vmx.c | 8 +-
+ arch/x86/kvm/x86.c | 2 +-
+ arch/x86/lguest/boot.c | 8 +-
+ arch/x86/lib/clear_page_64.S | 2 +-
+ arch/x86/lib/cmdline.c | 60 +-
+ arch/x86/lib/copy_page_64.S | 2 +-
+ arch/x86/lib/copy_user_64.S | 2 +-
+ arch/x86/lib/insn.c | 6 +-
+ arch/x86/lib/memcpy_64.S | 2 +-
+ arch/x86/lib/memmove_64.S | 2 +-
+ arch/x86/lib/memset_64.S | 4 +-
+ arch/x86/lib/rwsem.S | 11 +-
+ arch/x86/mm/Makefile | 2 +
+ arch/x86/mm/dump_pagetables.c | 11 +-
+ arch/x86/mm/extable.c | 100 +-
+ arch/x86/mm/fault.c | 152 ++-
+ arch/x86/mm/gup.c | 45 +-
+ arch/x86/mm/init_32.c | 6 -
+ arch/x86/mm/init_64.c | 27 +-
+ arch/x86/mm/kasan_init_64.c | 17 +-
+ arch/x86/mm/mpx.c | 8 +-
+ arch/x86/mm/numa.c | 67 +-
+ arch/x86/mm/pageattr.c | 38 +-
+ arch/x86/mm/pat.c | 6 +-
+ arch/x86/mm/pkeys.c | 101 ++
+ arch/x86/mm/setup_nx.c | 6 +-
+ arch/x86/net/bpf_jit.S | 48 +-
+ arch/x86/oprofile/op_model_amd.c | 1 -
+ arch/x86/platform/efi/Makefile | 2 +
+ arch/x86/platform/efi/efi-bgrt.c | 52 +-
+ arch/x86/platform/efi/efi.c | 67 +-
+ arch/x86/platform/efi/efi_32.c | 7 +-
+ arch/x86/platform/efi/efi_64.c | 206 +++-
+ arch/x86/platform/efi/efi_stub_64.S | 46 +-
+ arch/x86/platform/efi/quirks.c | 37 +-
+ arch/x86/platform/geode/alix.c | 14 +-
+ arch/x86/platform/geode/geos.c | 8 +-
+ arch/x86/platform/geode/net5501.c | 8 +-
+ .../intel-mid/device_libs/platform_bma023.c | 2 +-
+ .../intel-mid/device_libs/platform_emc1403.c | 2 +-
+ .../intel-mid/device_libs/platform_gpio_keys.c | 2 +-
+ .../intel-mid/device_libs/platform_lis331.c | 2 +-
+ .../intel-mid/device_libs/platform_max7315.c | 2 +-
+ .../intel-mid/device_libs/platform_mpu3050.c | 2 +-
+ .../platform/intel-mid/device_libs/platform_msic.c | 2 +-
+ .../intel-mid/device_libs/platform_msic_audio.c | 2 +-
+ .../intel-mid/device_libs/platform_msic_battery.c | 2 +-
+ .../intel-mid/device_libs/platform_msic_gpio.c | 2 +-
+ .../intel-mid/device_libs/platform_msic_ocd.c | 2 +-
+ .../device_libs/platform_msic_power_btn.c | 2 +-
+ .../intel-mid/device_libs/platform_msic_thermal.c | 2 +-
+ .../intel-mid/device_libs/platform_pmic_gpio.c | 2 +-
+ .../intel-mid/device_libs/platform_tc35876x.c | 2 +-
+ .../intel-mid/device_libs/platform_tca6416.c | 2 +-
+ arch/x86/platform/intel-mid/mfld.c | 5 +-
+ arch/x86/platform/intel-mid/mrfl.c | 5 +-
+ arch/x86/platform/intel-quark/imr.c | 59 +-
+ arch/x86/platform/intel-quark/imr_selftest.c | 30 +-
+ arch/x86/power/hibernate_asm_64.S | 7 +
+ arch/x86/purgatory/Makefile | 2 +
+ arch/x86/purgatory/stack.S | 2 +-
+ arch/x86/realmode/Makefile | 4 +-
+ arch/x86/realmode/rm/Makefile | 3 +-
+ arch/x86/um/asm/barrier.h | 2 +-
+ arch/x86/um/sys_call_table_32.c | 4 +-
+ arch/x86/um/sys_call_table_64.c | 7 +-
+ arch/x86/um/user-offsets.c | 6 +-
+ arch/x86/xen/enlighten.c | 5 +-
+ arch/x86/xen/mmu.c | 8 +-
+ arch/x86/xen/pmu.c | 2 +-
+ arch/x86/xen/smp.c | 2 +-
+ arch/x86/xen/xen-asm.S | 10 +-
+ arch/x86/xen/xen-asm_64.S | 1 +
+ arch/x86/xen/xen-head.S | 2 +-
+ arch/xtensa/kernel/smp.c | 2 +-
+ drivers/acpi/acpi_platform.c | 2 +-
+ drivers/acpi/apei/einj.c | 15 +-
+ drivers/char/agp/frontend.c | 2 +-
+ drivers/clocksource/Kconfig | 1 +
+ drivers/clocksource/arm_arch_timer.c | 40 +-
+ drivers/clocksource/arm_global_timer.c | 18 +
+ drivers/clocksource/exynos_mct.c | 2 +
+ drivers/clocksource/rockchip_timer.c | 21 +-
+ drivers/clocksource/time-lpc32xx.c | 66 +-
+ drivers/firmware/efi/arm-init.c | 14 +-
+ drivers/firmware/efi/efi.c | 41 +-
+ drivers/firmware/efi/efivars.c | 2 +-
+ drivers/firmware/efi/esrt.c | 5 +-
+ drivers/firmware/efi/libstub/Makefile | 1 +
+ drivers/firmware/efi/libstub/arm-stub.c | 4 +
+ drivers/firmware/efi/libstub/arm32-stub.c | 17 +
+ drivers/firmware/efi/libstub/arm64-stub.c | 34 +-
+ drivers/firmware/efi/libstub/efistub.h | 12 +
+ drivers/firmware/efi/runtime-wrappers.c | 113 +-
+ drivers/firmware/efi/vars.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 3 +-
+ drivers/gpu/drm/via/via_dmablit.c | 3 +-
+ drivers/infiniband/core/umem.c | 2 +-
+ drivers/infiniband/core/umem_odp.c | 8 +-
+ drivers/infiniband/hw/mthca/mthca_memfree.c | 3 +-
+ drivers/infiniband/hw/qib/qib_user_pages.c | 3 +-
+ drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +-
+ drivers/iommu/amd_iommu_v2.c | 1 +
+ drivers/irqchip/Kconfig | 17 +
+ drivers/irqchip/Makefile | 5 +
+ drivers/irqchip/irq-ath79-cpu.c | 97 ++
+ drivers/irqchip/irq-ath79-misc.c | 189 ++++
+ drivers/irqchip/irq-atmel-aic-common.c | 14 +-
+ drivers/irqchip/irq-atmel-aic-common.h | 7 +-
+ drivers/irqchip/irq-atmel-aic.c | 9 +-
+ drivers/irqchip/irq-atmel-aic5.c | 9 +-
+ drivers/irqchip/irq-bcm2836.c | 1 -
+ drivers/irqchip/irq-bcm6345-l1.c | 364 +++++++
+ drivers/irqchip/irq-gic-v2m.c | 14 +-
+ drivers/irqchip/irq-gic.c | 2 +-
+ drivers/irqchip/irq-mips-gic.c | 354 +++++--
+ drivers/irqchip/irq-mvebu-odmi.c | 236 +++++
+ drivers/irqchip/irq-tango.c | 232 ++++
+ drivers/irqchip/irq-ts4800.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-udma.c | 4 +-
+ drivers/media/pci/ivtv/ivtv-yuv.c | 10 +-
+ drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +-
+ drivers/misc/lkdtm.c | 29 +-
+ drivers/misc/mic/scif/scif_rma.c | 2 -
+ drivers/misc/sgi-gru/grufault.c | 3 +-
+ drivers/net/ethernet/intel/Kconfig | 9 +
+ drivers/net/ethernet/intel/e1000e/defines.h | 5 +
+ drivers/net/ethernet/intel/e1000e/ptp.c | 85 ++
+ drivers/net/ethernet/intel/e1000e/regs.h | 4 +
+ drivers/nvdimm/e820.c | 2 +-
+ drivers/parisc/eisa_enumerator.c | 4 +-
+ drivers/ptp/ptp_chardev.c | 27 +
+ drivers/rapidio/rio.c | 8 +-
+ drivers/scsi/st.c | 2 -
+ drivers/sh/superhyway/superhyway.c | 2 +-
+ drivers/staging/android/ashmem.c | 4 +-
+ drivers/video/fbdev/pvr2fb.c | 4 +-
+ drivers/virt/fsl_hypervisor.c | 5 +-
+ drivers/watchdog/hpwdt.c | 9 +-
+ drivers/xen/balloon.c | 2 +-
+ fs/btrfs/disk-io.c | 2 +-
+ fs/exec.c | 8 +-
+ fs/proc/task_mmu.c | 14 +
+ include/asm-generic/mm_hooks.h | 12 +
+ include/asm-generic/qspinlock.h | 5 -
+ include/asm-generic/qspinlock_types.h | 5 +
+ include/asm-generic/vmlinux.lds.h | 1 +
+ include/linux/cache.h | 14 +
+ include/linux/clockchips.h | 4 +-
+ include/linux/clocksource.h | 45 +-
+ include/linux/compiler.h | 5 +-
+ include/linux/cpu.h | 27 +-
+ include/linux/cpuhotplug.h | 93 ++
+ include/linux/efi.h | 85 +-
+ include/linux/frame.h | 23 +
+ include/linux/ftrace.h | 12 +
+ include/linux/init.h | 4 +
+ include/linux/ioport.h | 33 +-
+ include/linux/irq.h | 21 +-
+ include/linux/irqchip/mips-gic.h | 3 -
+ include/linux/irqdomain.h | 45 +
+ include/linux/kvm_host.h | 5 +-
+ include/linux/latencytop.h | 3 +
+ include/linux/lockdep.h | 2 -
+ include/linux/mm.h | 104 +-
+ include/linux/mm_types.h | 22 +-
+ include/linux/mman.h | 6 +-
+ include/linux/notifier.h | 2 +
+ include/linux/perf_event.h | 1 +
+ include/linux/pkeys.h | 33 +
+ include/linux/pps_kernel.h | 17 +-
+ include/linux/ptp_clock_kernel.h | 8 +
+ include/linux/rcupdate.h | 4 +-
+ include/linux/sched.h | 8 +-
+ include/linux/sched/sysctl.h | 4 +
+ include/linux/swait.h | 172 +++
+ include/linux/timekeeper_internal.h | 2 +
+ include/linux/timekeeping.h | 58 +
+ include/linux/wait.h | 2 +-
+ include/trace/events/cpuhp.h | 66 ++
+ include/uapi/asm-generic/siginfo.h | 17 +-
+ include/uapi/linux/ptp_clock.h | 13 +-
+ init/main.c | 48 +-
+ kernel/bpf/core.c | 2 +
+ kernel/cpu.c | 1120 +++++++++++++++++---
+ kernel/debug/kdb/kdb_bp.c | 4 +-
+ kernel/events/core.c | 22 +-
+ kernel/events/uprobes.c | 11 +-
+ kernel/futex.c | 131 ++-
+ kernel/irq/Kconfig | 4 +
+ kernel/irq/Makefile | 1 +
+ kernel/irq/handle.c | 6 +-
+ kernel/irq/internals.h | 3 +
+ kernel/irq/ipi.c | 326 ++++++
+ kernel/irq/irqdesc.c | 21 +-
+ kernel/irq/irqdomain.c | 6 +-
+ kernel/irq/manage.c | 8 +-
+ kernel/irq/proc.c | 2 +-
+ kernel/irq/spurious.c | 4 +-
+ kernel/kexec_core.c | 8 +-
+ kernel/kexec_file.c | 8 +-
+ kernel/latencytop.c | 14 +-
+ kernel/locking/lockdep.c | 132 +--
+ kernel/locking/mcs_spinlock.h | 8 +-
+ kernel/locking/mutex.c | 5 +-
+ kernel/locking/qspinlock.c | 7 +-
+ kernel/locking/qspinlock_paravirt.h | 21 +-
+ kernel/locking/qspinlock_stat.h | 16 +-
+ kernel/memremap.c | 13 +-
+ kernel/profile.c | 1 +
+ kernel/rcu/tree.c | 94 +-
+ kernel/rcu/tree.h | 12 +-
+ kernel/rcu/tree_plugin.h | 32 +-
+ kernel/resource.c | 93 +-
+ kernel/sched/Makefile | 2 +-
+ kernel/sched/core.c | 463 ++------
+ kernel/sched/cputime.c | 39 +-
+ kernel/sched/deadline.c | 25 +-
+ kernel/sched/debug.c | 415 +++++++-
+ kernel/sched/fair.c | 297 ++++--
+ kernel/sched/idle.c | 9 +-
+ kernel/sched/rt.c | 96 +-
+ kernel/sched/sched.h | 66 +-
+ kernel/sched/stats.h | 8 +-
+ kernel/sched/swait.c | 123 +++
+ kernel/signal.c | 4 +
+ kernel/smp.c | 1 +
+ kernel/smpboot.c | 6 +-
+ kernel/smpboot.h | 6 +-
+ kernel/softirq.c | 4 +-
+ kernel/sysctl.c | 13 +-
+ kernel/time/clocksource.c | 52 +-
+ kernel/time/jiffies.c | 2 +-
+ kernel/time/timekeeping.c | 286 ++++-
+ kernel/trace/trace_kprobe.c | 19 +-
+ kernel/trace/trace_syscalls.c | 16 +-
+ kernel/tsacct.c | 54 +-
+ lib/Kconfig.debug | 25 +
+ lib/atomic64_test.c | 2 +-
+ lib/cpumask.c | 1 +
+ lib/test_static_keys.c | 62 +-
+ mm/Kconfig | 5 +
+ mm/frame_vector.c | 2 +-
+ mm/gup.c | 127 ++-
+ mm/ksm.c | 12 +-
+ mm/memory.c | 33 +-
+ mm/memory_hotplug.c | 2 +-
+ mm/mempolicy.c | 6 +-
+ mm/mmap.c | 23 +-
+ mm/mprotect.c | 8 +-
+ mm/nommu.c | 66 +-
+ mm/process_vm_access.c | 11 +-
+ mm/util.c | 4 +-
+ net/ceph/pagevec.c | 2 +-
+ scripts/Makefile.build | 41 +-
+ scripts/mod/Makefile | 2 +
+ scripts/sortextable.c | 32 +
+ security/tomoyo/domain.c | 9 +-
+ tools/Makefile | 14 +-
+ tools/build/Makefile.build | 2 +-
+ tools/build/Makefile.feature | 31 +-
+ tools/build/feature/Makefile | 4 +
+ tools/build/feature/test-all.c | 5 +
+ tools/build/feature/test-compile.c | 2 +
+ tools/build/feature/test-libcrypto.c | 17 +
+ tools/lib/api/Build | 1 +
+ tools/lib/api/Makefile | 1 +
+ tools/lib/api/debug-internal.h | 20 +
+ tools/lib/api/debug.c | 28 +
+ tools/lib/api/debug.h | 10 +
+ tools/lib/api/fs/fs.c | 64 ++
+ tools/lib/api/fs/fs.h | 3 +
+ tools/lib/bpf/libbpf.c | 34 +-
+ tools/lib/lockdep/Makefile | 2 +-
+ tools/lib/lockdep/common.c | 5 -
+ tools/lib/lockdep/include/liblockdep/common.h | 1 -
+ tools/lib/lockdep/lockdep.c | 6 +
+ tools/lib/lockdep/preload.c | 2 -
+ tools/lib/lockdep/tests/AA.c | 8 +-
+ tools/lib/lockdep/tests/ABA.c | 13 +
+ tools/lib/lockdep/tests/ABBA_2threads.c | 46 +
+ tools/lib/lockdep/uinclude/linux/compiler.h | 1 +
+ tools/lib/subcmd/Makefile | 6 +-
+ tools/lib/traceevent/event-parse.c | 150 ++-
+ tools/lib/traceevent/event-parse.h | 13 +
+ tools/objtool/.gitignore | 2 +
+ tools/objtool/Build | 13 +
+ tools/objtool/Documentation/stack-validation.txt | 342 ++++++
+ tools/objtool/Makefile | 63 ++
+ tools/objtool/arch.h | 44 +
+ tools/objtool/arch/x86/Build | 12 +
+ tools/objtool/arch/x86/decode.c | 172 +++
+ tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk | 387 +++++++
+ tools/objtool/arch/x86/insn/inat.c | 97 ++
+ tools/objtool/arch/x86/insn/inat.h | 221 ++++
+ tools/objtool/arch/x86/insn/inat_types.h | 29 +
+ tools/objtool/arch/x86/insn/insn.c | 594 +++++++++++
+ tools/objtool/arch/x86/insn/insn.h | 201 ++++
+ tools/objtool/arch/x86/insn/x86-opcode-map.txt | 984 +++++++++++++++++
+ tools/objtool/builtin-check.c | 1072 +++++++++++++++++++
+ tools/objtool/builtin.h | 22 +
+ tools/objtool/elf.c | 403 +++++++
+ tools/objtool/elf.h | 79 ++
+ tools/objtool/objtool.c | 136 +++
+ tools/objtool/special.c | 193 ++++
+ tools/objtool/special.h | 42 +
+ tools/objtool/warn.h | 60 ++
+ tools/perf/Documentation/perf-config.txt | 357 ++++++-
+ tools/perf/Documentation/perf-inject.txt | 7 +
+ tools/perf/Documentation/perf-record.txt | 6 +
+ tools/perf/Documentation/perf-report.txt | 40 +-
+ tools/perf/Documentation/perf-top.txt | 3 +
+ tools/perf/Documentation/perfconfig.example | 2 +-
+ tools/perf/Documentation/tips.txt | 1 +
+ tools/perf/Makefile | 25 +-
+ tools/perf/Makefile.perf | 16 +-
+ tools/perf/arch/powerpc/Makefile | 2 +
+ tools/perf/arch/powerpc/util/Build | 1 +
+ tools/perf/arch/powerpc/util/book3s_hcalls.h | 123 +++
+ tools/perf/arch/powerpc/util/book3s_hv_exits.h | 33 +
+ tools/perf/arch/powerpc/util/kvm-stat.c | 170 +++
+ tools/perf/arch/s390/util/kvm-stat.c | 10 +-
+ tools/perf/arch/x86/tests/rdpmc.c | 1 +
+ tools/perf/arch/x86/util/intel-bts.c | 4 +-
+ tools/perf/arch/x86/util/intel-pt.c | 6 +-
+ tools/perf/arch/x86/util/kvm-stat.c | 16 +-
+ tools/perf/builtin-annotate.c | 2 +-
+ tools/perf/builtin-buildid-cache.c | 14 +-
+ tools/perf/builtin-config.c | 27 +-
+ tools/perf/builtin-diff.c | 2 -
+ tools/perf/builtin-help.c | 5 +-
+ tools/perf/builtin-inject.c | 107 +-
+ tools/perf/builtin-kmem.c | 4 +-
+ tools/perf/builtin-kvm.c | 38 +-
+ tools/perf/builtin-mem.c | 84 +-
+ tools/perf/builtin-record.c | 197 ++--
+ tools/perf/builtin-report.c | 58 +-
+ tools/perf/builtin-script.c | 155 ++-
+ tools/perf/builtin-stat.c | 339 ++++--
+ tools/perf/builtin-top.c | 43 +-
+ tools/perf/builtin-trace.c | 54 +-
+ tools/perf/config/Makefile | 112 +-
+ tools/perf/jvmti/Makefile | 89 ++
+ tools/perf/jvmti/jvmti_agent.c | 465 ++++++++
+ tools/perf/jvmti/jvmti_agent.h | 36 +
+ tools/perf/jvmti/libjvmti.c | 304 ++++++
+ tools/perf/perf.c | 18 +-
+ tools/perf/perf.h | 2 +
+ .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 5 +-
+ tools/perf/tests/.gitignore | 1 +
+ tools/perf/tests/Build | 9 +-
+ tools/perf/tests/bp_signal.c | 140 ++-
+ tools/perf/tests/bpf-script-test-relocation.c | 50 +
+ tools/perf/tests/bpf.c | 65 +-
+ tools/perf/tests/code-reading.c | 10 +-
+ tools/perf/tests/hists_cumulate.c | 2 +-
+ tools/perf/tests/hists_filter.c | 2 +-
+ tools/perf/tests/hists_output.c | 10 +-
+ tools/perf/tests/llvm.c | 25 +-
+ tools/perf/tests/llvm.h | 5 +-
+ tools/perf/tests/make | 50 +-
+ tools/perf/tests/parse-events.c | 54 +-
+ tools/perf/tests/vmlinux-kallsyms.c | 24 +-
+ tools/perf/ui/browser.c | 4 +-
+ tools/perf/ui/browser.h | 2 +-
+ tools/perf/ui/browsers/annotate.c | 2 +-
+ tools/perf/ui/browsers/hists.c | 831 +++++++++++++--
+ tools/perf/ui/gtk/hists.c | 180 +++-
+ tools/perf/ui/hist.c | 194 ++--
+ tools/perf/ui/stdio/hist.c | 295 +++++-
+ tools/perf/util/Build | 7 +
+ tools/perf/util/auxtrace.c | 7 +-
+ tools/perf/util/auxtrace.h | 6 +-
+ tools/perf/util/bpf-loader.c | 724 ++++++++++++-
+ tools/perf/util/bpf-loader.h | 59 ++
+ tools/perf/util/build-id.c | 50 +-
+ tools/perf/util/build-id.h | 1 +
+ tools/perf/util/cache.h | 3 +
+ tools/perf/util/callchain.c | 102 +-
+ tools/perf/util/color.c | 5 +-
+ tools/perf/util/config.c | 4 +-
+ tools/perf/util/cpumap.c | 30 +
+ tools/perf/util/cpumap.h | 32 +-
+ tools/perf/util/ctype.c | 9 +
+ tools/perf/util/data-convert-bt.c | 138 ++-
+ tools/perf/util/debug.c | 111 +-
+ tools/perf/util/debug.h | 1 +
+ tools/perf/util/demangle-java.c | 199 ++++
+ tools/perf/util/demangle-java.h | 10 +
+ tools/perf/util/dso.c | 5 +
+ tools/perf/util/env.c | 13 +
+ tools/perf/util/env.h | 15 +
+ tools/perf/util/event.c | 2 +-
+ tools/perf/util/evlist.c | 43 +-
+ tools/perf/util/evlist.h | 3 +
+ tools/perf/util/evsel.c | 30 +-
+ tools/perf/util/evsel.h | 8 +
+ tools/perf/util/genelf.c | 449 ++++++++
+ tools/perf/util/genelf.h | 67 ++
+ tools/perf/util/genelf_debug.c | 610 +++++++++++
+ tools/perf/util/header.c | 270 +++++
+ tools/perf/util/header.h | 1 +
+ tools/perf/util/help-unknown-cmd.c | 5 +-
+ tools/perf/util/hist.c | 701 ++++++++++--
+ tools/perf/util/hist.h | 104 +-
+ tools/perf/util/intel-pt-decoder/insn.c | 6 +-
+ tools/perf/util/jit.h | 15 +
+ tools/perf/util/jitdump.c | 672 ++++++++++++
+ tools/perf/util/jitdump.h | 124 +++
+ tools/perf/util/kvm-stat.h | 8 +-
+ tools/perf/util/machine.h | 10 +
+ tools/perf/util/mem-events.c | 255 +++++
+ tools/perf/util/mem-events.h | 35 +
+ tools/perf/util/parse-events.c | 314 +++++-
+ tools/perf/util/parse-events.h | 28 +-
+ tools/perf/util/parse-events.l | 19 +-
+ tools/perf/util/parse-events.y | 182 +++-
+ tools/perf/util/pmu.c | 32 +-
+ .../perf/util/scripting-engines/trace-event-perl.c | 3 +
+ .../util/scripting-engines/trace-event-python.c | 7 +-
+ tools/perf/util/setup.py | 4 +
+ tools/perf/util/sort.c | 652 +++++++-----
+ tools/perf/util/sort.h | 28 +-
+ tools/perf/util/stat-shadow.c | 225 ++--
+ tools/perf/util/stat.c | 14 +-
+ tools/perf/util/stat.h | 24 +-
+ tools/perf/util/strbuf.c | 24 -
+ tools/perf/util/strbuf.h | 2 -
+ tools/perf/util/symbol-elf.c | 3 +
+ tools/perf/util/symbol.c | 10 +-
+ tools/perf/util/symbol.h | 3 +-
+ tools/perf/util/trace-event.c | 1 +
+ tools/perf/util/util.c | 112 +-
+ tools/perf/util/util.h | 25 +-
+ tools/power/x86/turbostat/turbostat.c | 8 +-
+ tools/testing/selftests/x86/Makefile | 17 +-
+ .../selftests/x86/check_initial_reg_state.c | 109 ++
+ tools/testing/selftests/x86/ptrace_syscall.c | 132 ++-
+ tools/testing/selftests/x86/sigreturn.c | 230 +++-
+ virt/kvm/async_pf.c | 12 +-
+ virt/kvm/kvm_main.c | 27 +-
+ 735 files changed, 27477 insertions(+), 6576 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,odmi-controller.txt
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/sigma,smp8642-intc.txt
+ create mode 100644 arch/x86/events/Makefile
+ rename arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_amd_ibs.c => events/amd/ibs.c} (98%)
+ rename arch/x86/{kernel/cpu/perf_event_amd_iommu.c => events/amd/iommu.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_amd_iommu.h => events/amd/iommu.h} (100%)
+ rename arch/x86/{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event.c => events/core.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_bts.c => events/intel/bts.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_intel.c => events/intel/core.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_cqm.c => events/intel/cqm.c} (98%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_cstate.c => events/intel/cstate.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_ds.c => events/intel/ds.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_knc.c => events/intel/knc.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_lbr.c => events/intel/lbr.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_p4.c => events/intel/p4.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_p6.c => events/intel/p6.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_pt.c => events/intel/pt.c} (99%)
+ rename arch/x86/{kernel/cpu/intel_pt.h => events/intel/pt.h} (100%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_rapl.c => events/intel/rapl.c} (75%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_uncore.c => events/intel/uncore.c} (75%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_uncore.h => events/intel/uncore.h} (90%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_uncore_nhmex.c => events/intel/uncore_nhmex.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_uncore_snb.c => events/intel/uncore_snb.c} (98%)
+ rename arch/x86/{kernel/cpu/perf_event_intel_uncore_snbep.c => events/intel/uncore_snbep.c} (99%)
+ rename arch/x86/{kernel/cpu/perf_event_msr.c => events/msr.c} (100%)
+ rename arch/x86/{kernel/cpu => events}/perf_event.h (99%)
+ create mode 100644 arch/x86/include/asm/cpufeatures.h
+ create mode 100644 arch/x86/include/asm/pkeys.h
+ create mode 100644 arch/x86/mm/pkeys.c
+ create mode 100644 drivers/irqchip/irq-ath79-cpu.c
+ create mode 100644 drivers/irqchip/irq-ath79-misc.c
+ create mode 100644 drivers/irqchip/irq-bcm6345-l1.c
+ create mode 100644 drivers/irqchip/irq-mvebu-odmi.c
+ create mode 100644 drivers/irqchip/irq-tango.c
+ create mode 100644 include/linux/cpuhotplug.h
+ create mode 100644 include/linux/frame.h
+ create mode 100644 include/linux/pkeys.h
+ create mode 100644 include/linux/swait.h
+ create mode 100644 include/trace/events/cpuhp.h
+ create mode 100644 kernel/irq/ipi.c
+ create mode 100644 kernel/sched/swait.c
+ create mode 100644 tools/build/feature/test-libcrypto.c
+ create mode 100644 tools/lib/api/debug-internal.h
+ create mode 100644 tools/lib/api/debug.c
+ create mode 100644 tools/lib/api/debug.h
+ create mode 100644 tools/lib/lockdep/tests/ABA.c
+ create mode 100644 tools/lib/lockdep/tests/ABBA_2threads.c
+ create mode 100644 tools/objtool/.gitignore
+ create mode 100644 tools/objtool/Build
+ create mode 100644 tools/objtool/Documentation/stack-validation.txt
+ create mode 100644 tools/objtool/Makefile
+ create mode 100644 tools/objtool/arch.h
+ create mode 100644 tools/objtool/arch/x86/Build
+ create mode 100644 tools/objtool/arch/x86/decode.c
+ create mode 100644 tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk
+ create mode 100644 tools/objtool/arch/x86/insn/inat.c
+ create mode 100644 tools/objtool/arch/x86/insn/inat.h
+ create mode 100644 tools/objtool/arch/x86/insn/inat_types.h
+ create mode 100644 tools/objtool/arch/x86/insn/insn.c
+ create mode 100644 tools/objtool/arch/x86/insn/insn.h
+ create mode 100644 tools/objtool/arch/x86/insn/x86-opcode-map.txt
+ create mode 100644 tools/objtool/builtin-check.c
+ create mode 100644 tools/objtool/builtin.h
+ create mode 100644 tools/objtool/elf.c
+ create mode 100644 tools/objtool/elf.h
+ create mode 100644 tools/objtool/objtool.c
+ create mode 100644 tools/objtool/special.c
+ create mode 100644 tools/objtool/special.h
+ create mode 100644 tools/objtool/warn.h
+ create mode 100644 tools/perf/arch/powerpc/util/book3s_hcalls.h
+ create mode 100644 tools/perf/arch/powerpc/util/book3s_hv_exits.h
+ create mode 100644 tools/perf/arch/powerpc/util/kvm-stat.c
+ create mode 100644 tools/perf/jvmti/Makefile
+ create mode 100644 tools/perf/jvmti/jvmti_agent.c
+ create mode 100644 tools/perf/jvmti/jvmti_agent.h
+ create mode 100644 tools/perf/jvmti/libjvmti.c
+ create mode 100644 tools/perf/tests/bpf-script-test-relocation.c
+ create mode 100644 tools/perf/util/demangle-java.c
+ create mode 100644 tools/perf/util/demangle-java.h
+ create mode 100644 tools/perf/util/genelf.c
+ create mode 100644 tools/perf/util/genelf.h
+ create mode 100644 tools/perf/util/genelf_debug.c
+ create mode 100644 tools/perf/util/jit.h
+ create mode 100644 tools/perf/util/jitdump.c
+ create mode 100644 tools/perf/util/jitdump.h
+ create mode 100644 tools/perf/util/mem-events.c
+ create mode 100644 tools/perf/util/mem-events.h
+ create mode 100644 tools/testing/selftests/x86/check_initial_reg_state.c
+Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
+$ git merge clockevents/clockevents/next
+Resolved 'drivers/clocksource/Kconfig' using previous resolution.
+Auto-merging drivers/clocksource/Kconfig
+CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2e26f35878e6] Merge remote-tracking branch 'clockevents/clockevents/next'
+$ git diff -M --stat --summary HEAD^..
+Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup)
+$ git merge edac-amd/for-next
+Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/altera/socfpga-eccmgr.txt | 49 ++
+ .../devicetree/bindings/edac/apm-xgene-edac.txt | 10 +
+ arch/arm/boot/dts/socfpga.dtsi | 20 +
+ arch/arm/mach-socfpga/Makefile | 2 +
+ arch/arm/mach-socfpga/core.h | 2 +
+ arch/arm/mach-socfpga/l2_cache.c | 41 ++
+ arch/arm/mach-socfpga/ocram.c | 49 ++
+ arch/arm/mach-socfpga/socfpga.c | 5 +
+ arch/arm64/boot/dts/apm/apm-storm.dtsi | 6 +
+ drivers/edac/Kconfig | 26 +-
+ drivers/edac/Makefile | 2 +-
+ drivers/edac/altera_edac.c | 492 ++++++++++++++++++++-
+ drivers/edac/amd64_edac.c | 2 +-
+ drivers/edac/debugfs.c | 2 +-
+ drivers/edac/edac_mc.c | 64 +--
+ drivers/edac/edac_pci.c | 67 +--
+ drivers/edac/mpc85xx_edac.c | 2 +-
+ drivers/edac/xgene_edac.c | 70 ++-
+ 18 files changed, 800 insertions(+), 111 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-eccmgr.txt
+ create mode 100644 arch/arm/mach-socfpga/l2_cache.c
+ create mode 100644 arch/arm/mach-socfpga/ocram.c
+Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
+$ git merge irqchip/irqchip/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/interrupt-controller/marvell,odmi-controller.txt | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
+$ git merge tiny/tiny/next
+Already up-to-date.
+Merging ftrace/for-next (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on)
+$ git merge ftrace/for-next
+Already up-to-date.
+Merging rcu/rcu/next (dc96aeda643f Merge commit '27d50c7eeb0f' into wagi.2016.03.01a)
+$ git merge rcu/rcu/next
+Auto-merging kernel/irq/internals.h
+Auto-merging include/linux/irq.h
+Auto-merging include/linux/compiler.h
+Merge made by the 'recursive' strategy.
+ .../Design/Data-Structures/BigTreeClassicRCU.svg | 474 +++++++
+ .../Design/Data-Structures/BigTreeClassicRCUBH.svg | 499 +++++++
+ .../Data-Structures/BigTreeClassicRCUBHdyntick.svg | 695 ++++++++++
+ .../Data-Structures/BigTreePreemptRCUBHdyntick.svg | 741 +++++++++++
+ .../BigTreePreemptRCUBHdyntickCB.svg | 858 ++++++++++++
+ .../Design/Data-Structures/Data-Structures.html | 1395 ++++++++++++++++++++
+ .../Design/Data-Structures/Data-Structures.htmlx | 1295 ++++++++++++++++++
+ .../Design/Data-Structures/HugeTreeClassicRCU.svg | 939 +++++++++++++
+ .../RCU/Design/Data-Structures/TreeLevel.svg | 828 ++++++++++++
+ .../RCU/Design/Data-Structures/TreeMapping.svg | 305 +++++
+ .../Design/Data-Structures/TreeMappingLevel.svg | 380 ++++++
+ .../RCU/Design/Data-Structures/blkd_task.svg | 843 ++++++++++++
+ .../RCU/Design/Data-Structures/nxtlist.svg | 396 ++++++
+ .../RCU/Design/Requirements/Requirements.html | 225 +++-
+ .../RCU/Design/Requirements/Requirements.htmlx | 121 +-
+ Documentation/memory-barriers.txt | 141 +-
+ include/linux/compiler.h | 12 +-
+ include/linux/irq.h | 6 +-
+ include/linux/rcupdate.h | 2 -
+ include/linux/srcu.h | 19 +-
+ kernel/irq/internals.h | 4 +
+ kernel/rcu/rcutorture.c | 14 +-
+ kernel/rcu/tiny_plugin.h | 15 +-
+ kernel/rcu/tree.c | 143 +-
+ kernel/rcu/tree.h | 42 +-
+ kernel/rcu/tree_plugin.h | 27 +-
+ kernel/rcu/update.c | 1 +
+ scripts/checkpatch.pl | 3 +-
+ .../selftests/rcutorture/bin/parse-console.sh | 6 +-
+ 29 files changed, 10233 insertions(+), 196 deletions(-)
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCU.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntickCB.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html
+ create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.htmlx
+ create mode 100644 Documentation/RCU/Design/Data-Structures/HugeTreeClassicRCU.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/TreeLevel.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMapping.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMappingLevel.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/blkd_task.svg
+ create mode 100644 Documentation/RCU/Design/Data-Structures/nxtlist.svg
+Merging kvm/linux-next (0e4d44151af7 KVM: i8254: drop local copy of mul_u64_u32_div)
+$ git merge kvm/linux-next
+Resolved 'arch/powerpc/kvm/book3s_64_vio_hv.c' using previous resolution.
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging virt/kvm/async_pf.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/x86/kvm/paging_tmpl.h
+Auto-merging arch/x86/kvm/mmu.c
+Auto-merging arch/x86/kvm/lapic.c
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/s390/include/asm/kvm_host.h
+Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kvm/book3s_64_vio_hv.c
+CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio_hv.c
+Auto-merging arch/powerpc/kvm/book3s_64_vio.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/include/asm/xics.h
+Auto-merging arch/powerpc/include/asm/smp.h
+Auto-merging arch/powerpc/include/asm/kvm_host.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 131a7471538a] Merge remote-tracking branch 'kvm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 87 ++++++
+ Documentation/virtual/kvm/devices/s390_flic.txt | 2 +
+ Documentation/virtual/kvm/devices/vm.txt | 52 ++++
+ Documentation/virtual/kvm/mmu.txt | 6 +-
+ arch/powerpc/include/asm/kvm_book3s_64.h | 2 -
+ arch/powerpc/include/asm/kvm_host.h | 5 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 51 +++-
+ arch/powerpc/include/asm/pgtable.h | 3 +
+ arch/powerpc/include/asm/smp.h | 4 +
+ arch/powerpc/include/asm/xics.h | 1 +
+ arch/powerpc/include/uapi/asm/kvm.h | 9 +
+ arch/powerpc/kernel/smp.c | 28 +-
+ arch/powerpc/kvm/Makefile | 2 +-
+ arch/powerpc/kvm/book3s.c | 2 +-
+ arch/powerpc/kvm/book3s_64_vio.c | 156 +++++++++--
+ arch/powerpc/kvm/book3s_64_vio_hv.c | 330 +++++++++++++++++++---
+ arch/powerpc/kvm/book3s_hv.c | 192 ++++++++++++-
+ arch/powerpc/kvm/book3s_hv_builtin.c | 3 +
+ arch/powerpc/kvm/book3s_hv_rm_xics.c | 131 ++++++++-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +-
+ arch/powerpc/kvm/book3s_pr_papr.c | 35 +++
+ arch/powerpc/kvm/powerpc.c | 38 ++-
+ arch/powerpc/mm/pgtable.c | 8 +
+ arch/powerpc/perf/hv-24x7.c | 8 -
+ arch/powerpc/sysdev/xics/icp-native.c | 21 ++
+ arch/s390/include/asm/kvm_host.h | 8 +-
+ arch/s390/include/uapi/asm/kvm.h | 8 +-
+ arch/s390/kvm/gaccess.c | 57 ++--
+ arch/s390/kvm/gaccess.h | 38 ++-
+ arch/s390/kvm/intercept.c | 78 +++---
+ arch/s390/kvm/interrupt.c | 40 ++-
+ arch/s390/kvm/kvm-s390.c | 55 ++--
+ arch/s390/kvm/kvm-s390.h | 17 +-
+ arch/s390/kvm/priv.c | 13 +-
+ arch/x86/include/asm/kvm_host.h | 22 +-
+ arch/x86/include/asm/kvm_page_track.h | 61 +++++
+ arch/x86/include/uapi/asm/hyperv.h | 4 +-
+ arch/x86/kvm/Makefile | 3 +-
+ arch/x86/kvm/assigned-dev.c | 14 +-
+ arch/x86/kvm/hyperv.c | 50 +++-
+ arch/x86/kvm/i8254.c | 350 ++++++++++--------------
+ arch/x86/kvm/i8254.h | 17 +-
+ arch/x86/kvm/ioapic.c | 30 +-
+ arch/x86/kvm/ioapic.h | 17 +-
+ arch/x86/kvm/irq.c | 9 +-
+ arch/x86/kvm/irq.h | 8 -
+ arch/x86/kvm/irq_comm.c | 27 +-
+ arch/x86/kvm/lapic.c | 156 ++++++++---
+ arch/x86/kvm/lapic.h | 17 +-
+ arch/x86/kvm/mmu.c | 335 ++++++++++++++---------
+ arch/x86/kvm/mmu.h | 5 +
+ arch/x86/kvm/page_track.c | 222 +++++++++++++++
+ arch/x86/kvm/paging_tmpl.h | 24 +-
+ arch/x86/kvm/pmu.c | 2 +-
+ arch/x86/kvm/svm.c | 3 +-
+ arch/x86/kvm/trace.h | 12 +-
+ arch/x86/kvm/vmx.c | 72 +++--
+ arch/x86/kvm/x86.c | 157 ++++++-----
+ arch/x86/kvm/x86.h | 16 ++
+ drivers/hv/hyperv_vmbus.h | 6 -
+ include/trace/events/kvm.h | 9 +-
+ include/uapi/linux/kvm.h | 17 +-
+ virt/kvm/async_pf.c | 8 +-
+ virt/kvm/kvm_main.c | 37 +--
+ 64 files changed, 2416 insertions(+), 788 deletions(-)
+ create mode 100644 arch/x86/include/asm/kvm_page_track.h
+ create mode 100644 arch/x86/kvm/page_track.c
+Merging kvm-arm/next (9b4a3004439d KVM: arm/arm64: timer: Add active state caching)
+$ git merge kvm-arm/next
+Resolved 'arch/arm/kvm/arm.c' using previous resolution.
+Resolved 'arch/arm64/include/asm/cpufeature.h' using previous resolution.
+Resolved 'arch/arm64/kernel/cpufeature.c' using previous resolution.
+Resolved 'arch/arm64/kvm/hyp.S' using previous resolution.
+Resolved 'include/uapi/linux/kvm.h' using previous resolution.
+Auto-merging virt/kvm/arm/hyp/vgic-v2-sr.c
+Auto-merging virt/kvm/arm/hyp/timer-sr.c
+Auto-merging include/uapi/linux/kvm.h
+CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
+Auto-merging drivers/clocksource/arm_arch_timer.c
+Auto-merging arch/arm64/kvm/sys_regs.c
+Removing arch/arm64/kvm/hyp/hyp.h
+Auto-merging arch/arm64/kvm/hyp/debug-sr.c
+Auto-merging arch/arm64/kvm/hyp.S
+CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp.S
+Auto-merging arch/arm64/kvm/guest.c
+Auto-merging arch/arm64/kernel/perf_event.c
+Auto-merging arch/arm64/kernel/head.S
+Auto-merging arch/arm64/kernel/cpufeature.c
+CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
+Auto-merging arch/arm64/kernel/asm-offsets.c
+Auto-merging arch/arm64/include/asm/kvm_mmu.h
+Auto-merging arch/arm64/include/asm/kvm_host.h
+Auto-merging arch/arm64/include/asm/kvm_asm.h
+Auto-merging arch/arm64/include/asm/kvm_arm.h
+Auto-merging arch/arm64/include/asm/cpufeature.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
+Auto-merging arch/arm64/Kconfig
+Removing arch/arm/kvm/interrupts_head.S
+Auto-merging arch/arm/kvm/guest.c
+Auto-merging arch/arm/kvm/arm.c
+CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
+Auto-merging arch/arm/kernel/vmlinux.lds.S
+Auto-merging arch/arm/include/asm/kvm_asm.h
+Auto-merging Documentation/virtual/kvm/api.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 34566b990279] Merge remote-tracking branch 'kvm-arm/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 12 +-
+ Documentation/virtual/kvm/devices/vcpu.txt | 33 ++
+ arch/arm/include/asm/kvm_asm.h | 41 +-
+ arch/arm/include/asm/kvm_emulate.h | 20 +-
+ arch/arm/include/asm/kvm_host.h | 80 ++-
+ arch/arm/include/asm/kvm_hyp.h | 139 +++++
+ arch/arm/include/asm/kvm_mmu.h | 2 +-
+ arch/arm/include/asm/virt.h | 9 +
+ arch/arm/kernel/asm-offsets.c | 40 +-
+ arch/arm/kernel/vmlinux.lds.S | 6 +
+ arch/arm/kvm/Makefile | 1 +
+ arch/arm/kvm/arm.c | 246 +++++---
+ arch/arm/kvm/coproc.c | 126 +++--
+ arch/arm/kvm/coproc.h | 24 +-
+ arch/arm/kvm/emulate.c | 34 +-
+ arch/arm/kvm/guest.c | 5 +-
+ arch/arm/kvm/handle_exit.c | 7 -
+ arch/arm/kvm/hyp/Makefile | 17 +
+ arch/arm/kvm/hyp/banked-sr.c | 77 +++
+ arch/arm/kvm/hyp/cp15-sr.c | 84 +++
+ arch/arm/kvm/hyp/entry.S | 101 ++++
+ arch/arm/kvm/hyp/hyp-entry.S | 169 ++++++
+ arch/arm/kvm/hyp/s2-setup.c | 33 ++
+ arch/arm/kvm/hyp/switch.c | 232 ++++++++
+ arch/arm/kvm/hyp/tlb.c | 70 +++
+ arch/arm/kvm/hyp/vfp.S | 68 +++
+ arch/arm/kvm/init.S | 8 -
+ arch/arm/kvm/interrupts.S | 480 +---------------
+ arch/arm/kvm/interrupts_head.S | 648 ----------------------
+ arch/arm/kvm/mmu.c | 23 +
+ arch/arm/kvm/reset.c | 2 +-
+ arch/arm64/Kconfig | 13 +
+ arch/arm64/include/asm/cpufeature.h | 1 +
+ arch/arm64/include/asm/hw_breakpoint.h | 18 +-
+ arch/arm64/include/asm/kvm_arm.h | 6 +-
+ arch/arm64/include/asm/kvm_asm.h | 5 +-
+ arch/arm64/include/asm/kvm_emulate.h | 8 +
+ arch/arm64/include/asm/kvm_host.h | 34 +-
+ arch/arm64/include/asm/kvm_hyp.h | 181 ++++++
+ arch/arm64/include/asm/kvm_mmu.h | 12 +-
+ arch/arm64/include/asm/kvm_perf_event.h | 68 +++
+ arch/arm64/include/asm/virt.h | 10 +
+ arch/arm64/include/uapi/asm/kvm.h | 6 +
+ arch/arm64/kernel/asm-offsets.c | 3 -
+ arch/arm64/kernel/cpufeature.c | 11 +
+ arch/arm64/kernel/head.S | 28 +-
+ arch/arm64/kernel/perf_event.c | 6 +-
+ arch/arm64/kvm/Kconfig | 7 +
+ arch/arm64/kvm/Makefile | 1 +
+ arch/arm64/kvm/guest.c | 51 ++
+ arch/arm64/kvm/hyp-init.S | 15 +-
+ arch/arm64/kvm/hyp.S | 7 +
+ arch/arm64/kvm/hyp/Makefile | 8 +-
+ arch/arm64/kvm/hyp/debug-sr.c | 4 +-
+ arch/arm64/kvm/hyp/entry.S | 6 +
+ arch/arm64/kvm/hyp/hyp-entry.S | 109 ++--
+ arch/arm64/kvm/hyp/hyp.h | 90 ---
+ arch/arm64/kvm/hyp/s2-setup.c | 43 ++
+ arch/arm64/kvm/hyp/switch.c | 206 ++++++-
+ arch/arm64/kvm/hyp/sysreg-sr.c | 149 +++--
+ arch/arm64/kvm/hyp/tlb.c | 2 +-
+ arch/arm64/kvm/hyp/vgic-v3-sr.c | 4 +-
+ arch/arm64/kvm/reset.c | 7 +
+ arch/arm64/kvm/sys_regs.c | 609 ++++++++++++++++++--
+ drivers/clocksource/arm_arch_timer.c | 96 ++--
+ include/kvm/arm_arch_timer.h | 5 +
+ include/kvm/arm_pmu.h | 110 ++++
+ include/uapi/linux/kvm.h | 4 +-
+ virt/kvm/arm/arch_timer.c | 31 ++
+ {arch/arm64/kvm => virt/kvm/arm}/hyp/timer-sr.c | 14 +-
+ {arch/arm64/kvm => virt/kvm/arm}/hyp/vgic-v2-sr.c | 4 +-
+ virt/kvm/arm/pmu.c | 529 ++++++++++++++++++
+ 72 files changed, 3599 insertions(+), 1759 deletions(-)
+ create mode 100644 Documentation/virtual/kvm/devices/vcpu.txt
+ create mode 100644 arch/arm/include/asm/kvm_hyp.h
+ create mode 100644 arch/arm/kvm/hyp/Makefile
+ create mode 100644 arch/arm/kvm/hyp/banked-sr.c
+ create mode 100644 arch/arm/kvm/hyp/cp15-sr.c
+ create mode 100644 arch/arm/kvm/hyp/entry.S
+ create mode 100644 arch/arm/kvm/hyp/hyp-entry.S
+ create mode 100644 arch/arm/kvm/hyp/s2-setup.c
+ create mode 100644 arch/arm/kvm/hyp/switch.c
+ create mode 100644 arch/arm/kvm/hyp/tlb.c
+ create mode 100644 arch/arm/kvm/hyp/vfp.S
+ delete mode 100644 arch/arm/kvm/interrupts_head.S
+ create mode 100644 arch/arm64/include/asm/kvm_hyp.h
+ create mode 100644 arch/arm64/include/asm/kvm_perf_event.h
+ delete mode 100644 arch/arm64/kvm/hyp/hyp.h
+ create mode 100644 arch/arm64/kvm/hyp/s2-setup.c
+ create mode 100644 include/kvm/arm_pmu.h
+ rename {arch/arm64/kvm => virt/kvm/arm}/hyp/timer-sr.c (86%)
+ rename {arch/arm64/kvm => virt/kvm/arm}/hyp/vgic-v2-sr.c (98%)
+ create mode 100644 virt/kvm/arm/pmu.c
+Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up-to-date.
+Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
+$ git merge kvm-ppc-paulus/kvm-ppc-next
+Already up-to-date.
+Merging kvms390/next (05af1c4dda44 KVM: s390: enable STFLE interpretation only if enabled for the guest)
+$ git merge kvms390/next
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/s390/include/asm/kvm_host.h
+Merge made by the 'recursive' strategy.
+ arch/s390/include/asm/kvm_host.h | 10 ++++
+ arch/s390/include/uapi/asm/sie.h | 1 +
+ arch/s390/kvm/interrupt.c | 53 ++++++++++++-----
+ arch/s390/kvm/kvm-s390.c | 122 ++++++++++++++++++++++++++++++++++++---
+ arch/s390/kvm/kvm-s390.h | 7 +++
+ 5 files changed, 169 insertions(+), 24 deletions(-)
+Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
+$ git merge xen-tip/linux-next
+Already up-to-date.
+Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (9b7f6597f013 sched/core: Get rid of 'cpu' argument in wq_worker_sleeping())
+$ git merge workqueues/for-next
+Auto-merging kernel/sched/core.c
+Merge made by the 'recursive' strategy.
+ kernel/sched/core.c | 2 +-
+ kernel/workqueue.c | 7 +++----
+ kernel/workqueue_internal.h | 2 +-
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+Merging drivers-x86/for-next (2d6cace8476a ideapad-laptop: Add ideapad Y700 (15) to the no_hw_rfkill DMI list)
+$ git merge drivers-x86/for-next
+Auto-merging drivers/platform/x86/intel-hid.c
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-driver-toshiba_acpi | 16 +
+ drivers/leds/Kconfig | 1 +
+ drivers/leds/dell-led.c | 126 +-------
+ drivers/platform/x86/Kconfig | 14 +-
+ drivers/platform/x86/Makefile | 1 +
+ drivers/platform/x86/alienware-wmi.c | 286 ++++++++++++++---
+ drivers/platform/x86/asus-nb-wmi.c | 9 +
+ drivers/platform/x86/dell-laptop.c | 340 ++++++---------------
+ drivers/platform/x86/dell-rbtn.c | 15 +
+ drivers/platform/x86/dell-smbios.c | 177 +++++++++++
+ drivers/platform/x86/dell-smbios.h | 44 +++
+ drivers/platform/x86/dell-wmi.c | 154 +++++++---
+ drivers/platform/x86/fujitsu-laptop.c | 8 +-
+ drivers/platform/x86/ideapad-laptop.c | 14 +
+ drivers/platform/x86/intel-hid.c | 3 +-
+ drivers/platform/x86/intel_pmc_ipc.c | 8 +-
+ drivers/platform/x86/intel_scu_ipc.c | 35 +--
+ drivers/platform/x86/intel_telemetry_pltdrv.c | 13 +-
+ drivers/platform/x86/thinkpad_acpi.c | 4 +-
+ drivers/platform/x86/toshiba_acpi.c | 115 +++++++
+ 20 files changed, 912 insertions(+), 471 deletions(-)
+ create mode 100644 drivers/platform/x86/dell-smbios.c
+ create mode 100644 drivers/platform/x86/dell-smbios.h
+Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
+$ git merge chrome-platform/for-next
+Already up-to-date.
+Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
+$ git merge hsi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/hsi/nokia-modem.txt | 12 +++++++-----
+ drivers/hsi/clients/nokia-modem.c | 2 ++
+ drivers/hsi/clients/ssi_protocol.c | 16 +++++-----------
+ 3 files changed, 14 insertions(+), 16 deletions(-)
+Merging leds/for-next (3e8d09d79e63 leds: gpio: Use GPIOF_OUT_INIT_LOW instead of hardcoded zero)
+$ git merge leds/for-next
+Auto-merging drivers/leds/Kconfig
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/leds/leds-sn3218.txt | 41 +++
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ drivers/leds/Kconfig | 12 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/led-class.c | 2 +
+ drivers/leds/led-core.c | 45 ++-
+ drivers/leds/leds-gpio.c | 6 +-
+ drivers/leds/leds-lp3944.c | 7 +-
+ drivers/leds/leds-sn3218.c | 306 +++++++++++++++++++++
+ include/linux/leds.h | 8 +-
+ 10 files changed, 407 insertions(+), 22 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/leds/leds-sn3218.txt
+ create mode 100644 drivers/leds/leds-sn3218.c
+Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
+$ git merge ipmi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/ipmi_si_intf.c | 11 +++++++----
+ drivers/char/ipmi/ipmi_ssif.c | 13 ++++---------
+ 2 files changed, 11 insertions(+), 13 deletions(-)
+Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles")
+$ git merge driver-core/driver-core-next
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-firmware-qemu_fw_cfg | 100 +++
+ Documentation/devicetree/bindings/arm/fw-cfg.txt | 38 +-
+ Documentation/driver-model/platform.txt | 2 +-
+ drivers/base/bus.c | 15 +-
+ drivers/base/component.c | 2 +-
+ drivers/base/dma-coherent.c | 28 +-
+ drivers/firmware/Kconfig | 20 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/qemu_fw_cfg.c | 751 +++++++++++++++++++++
+ fs/kernfs/dir.c | 19 +-
+ include/linux/debugfs.h | 8 +
+ lib/kobject.c | 1 +
+ 12 files changed, 915 insertions(+), 70 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg
+ create mode 100644 drivers/firmware/qemu_fw_cfg.c
+Merging tty/tty-next (a3f0b77f36ca sc16is7xx: implemented get_mctrl)
+$ git merge tty/tty-next
+Auto-merging security/selinux/hooks.c
+Auto-merging kernel/audit.c
+Auto-merging include/linux/sched.h
+Auto-merging include/asm-generic/vmlinux.lds.h
+Removing drivers/tty/serial/m32r_sio.h
+Removing drivers/tty/serial/68328serial.c
+Auto-merging drivers/of/fdt.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/serial/brcm,bcm2835-aux-uart.txt | 18 +
+ .../bindings/serial/renesas,sci-serial.txt | 2 +
+ Documentation/serial/tty.txt | 3 -
+ MAINTAINERS | 2 +-
+ arch/alpha/include/asm/serial.h | 8 +-
+ arch/arm/mach-omap2/serial.c | 2 +-
+ arch/frv/include/asm/serial.h | 2 +-
+ arch/ia64/kernel/unaligned.c | 7 +-
+ arch/m68k/include/asm/serial.h | 8 +-
+ arch/mips/pmcs-msp71xx/msp_serial.c | 2 +-
+ arch/mn10300/include/asm/serial.h | 10 +-
+ arch/xtensa/platforms/iss/console.c | 4 -
+ arch/xtensa/platforms/xt2000/setup.c | 2 +-
+ drivers/char/pcmcia/synclink_cs.c | 21 +-
+ drivers/char/ttyprintk.c | 2 +-
+ drivers/isdn/i4l/isdn_tty.c | 12 +-
+ drivers/mmc/card/sdio_uart.c | 14 +-
+ drivers/net/irda/irtty-sir.c | 10 -
+ drivers/of/fdt.c | 32 +-
+ drivers/of/fdt_address.c | 11 +-
+ drivers/s390/char/con3215.c | 3 +-
+ drivers/staging/dgap/dgap.c | 36 +-
+ drivers/staging/dgnc/dgnc_tty.c | 20 +-
+ drivers/tty/Kconfig | 2 +-
+ drivers/tty/amiserial.c | 28 +-
+ drivers/tty/cyclades.c | 22 +-
+ drivers/tty/ehv_bytechan.c | 40 +-
+ drivers/tty/goldfish.c | 2 +-
+ drivers/tty/hvc/hvc_vio.c | 29 +-
+ drivers/tty/hvc/hvc_xen.c | 6 +-
+ drivers/tty/isicom.c | 3 +-
+ drivers/tty/mxser.c | 21 +-
+ drivers/tty/n_gsm.c | 22 +-
+ drivers/tty/n_hdlc.c | 19 +-
+ drivers/tty/n_tty.c | 117 +-
+ drivers/tty/nozomi.c | 2 +-
+ drivers/tty/pty.c | 30 +-
+ drivers/tty/rocket.c | 18 +-
+ drivers/tty/rocket_int.h | 1 -
+ drivers/tty/serial/68328serial.c | 1322 --------------------
+ drivers/tty/serial/8250/8250.h | 14 +
+ drivers/tty/serial/8250/8250_accent.c | 13 +-
+ drivers/tty/serial/8250/8250_acorn.c | 2 +-
+ drivers/tty/serial/8250/8250_bcm2835aux.c | 146 +++
+ drivers/tty/serial/8250/8250_boca.c | 41 +-
+ drivers/tty/serial/8250/8250_core.c | 21 +-
+ drivers/tty/serial/8250/8250_dw.c | 126 +-
+ drivers/tty/serial/8250/8250_early.c | 38 +-
+ drivers/tty/serial/8250/8250_exar_st16c554.c | 17 +-
+ drivers/tty/serial/8250/8250_fourport.c | 28 +-
+ drivers/tty/serial/8250/8250_gsc.c | 7 +-
+ drivers/tty/serial/8250/8250_hp300.c | 27 +-
+ drivers/tty/serial/8250/8250_hub6.c | 2 +-
+ drivers/tty/serial/8250/8250_ingenic.c | 40 +-
+ drivers/tty/serial/8250/8250_mtk.c | 10 +-
+ drivers/tty/serial/8250/8250_of.c | 1 +
+ drivers/tty/serial/8250/8250_omap.c | 31 +
+ drivers/tty/serial/8250/8250_pci.c | 96 +-
+ drivers/tty/serial/8250/8250_pnp.c | 48 +-
+ drivers/tty/serial/8250/8250_port.c | 453 +++++--
+ drivers/tty/serial/8250/Kconfig | 24 +
+ drivers/tty/serial/8250/Makefile | 1 +
+ drivers/tty/serial/8250/serial_cs.c | 90 +-
+ drivers/tty/serial/Kconfig | 18 +-
+ drivers/tty/serial/Makefile | 1 -
+ drivers/tty/serial/amba-pl011.c | 20 +-
+ drivers/tty/serial/arc_uart.c | 1 -
+ drivers/tty/serial/atmel_serial.c | 134 +-
+ drivers/tty/serial/clps711x.c | 10 +-
+ drivers/tty/serial/crisv10.c | 33 +-
+ drivers/tty/serial/digicolor-usart.c | 9 +-
+ drivers/tty/serial/earlycon.c | 118 +-
+ drivers/tty/serial/imx.c | 5 +-
+ drivers/tty/serial/jsm/jsm_tty.c | 13 +-
+ drivers/tty/serial/m32r_sio.c | 134 +-
+ drivers/tty/serial/m32r_sio.h | 49 -
+ drivers/tty/serial/meson_uart.c | 8 +-
+ drivers/tty/serial/mpc52xx_uart.c | 8 +-
+ drivers/tty/serial/mpsc.c | 178 ++-
+ drivers/tty/serial/msm_serial.c | 2 -
+ drivers/tty/serial/omap-serial.c | 2 +-
+ drivers/tty/serial/samsung.c | 6 -
+ drivers/tty/serial/sc16is7xx.c | 38 +-
+ drivers/tty/serial/serial_core.c | 125 +-
+ drivers/tty/serial/serial_ks8695.c | 2 +-
+ drivers/tty/serial/sh-sci.c | 183 ++-
+ drivers/tty/serial/sh-sci.h | 15 +
+ drivers/tty/serial/sprd_serial.c | 2 -
+ drivers/tty/serial/uartlite.c | 45 +
+ drivers/tty/serial/xilinx_uartps.c | 539 ++++----
+ drivers/tty/serial/zs.c | 4 +
+ drivers/tty/synclink.c | 23 +-
+ drivers/tty/synclink_gt.c | 19 +-
+ drivers/tty/synclinkmp.c | 63 +-
+ drivers/tty/tty_audit.c | 231 +---
+ drivers/tty/tty_buffer.c | 39 +-
+ drivers/tty/tty_io.c | 267 ++--
+ drivers/tty/tty_ioctl.c | 12 +-
+ drivers/tty/tty_ldisc.c | 198 +--
+ drivers/tty/tty_mutex.c | 8 +-
+ drivers/tty/tty_port.c | 11 +-
+ drivers/tty/vt/keyboard.c | 14 +-
+ drivers/tty/vt/selection.c | 2 +
+ drivers/tty/vt/vt.c | 2 +-
+ drivers/usb/serial/console.c | 6 +-
+ drivers/usb/serial/cypress_m8.c | 3 +-
+ drivers/usb/serial/digi_acceleport.c | 8 +-
+ drivers/usb/serial/io_edgeport.c | 4 +-
+ drivers/usb/serial/mct_u232.c | 2 +-
+ drivers/usb/serial/mos7720.c | 4 +-
+ drivers/usb/serial/mos7840.c | 4 +-
+ include/asm-generic/vmlinux.lds.h | 6 +-
+ include/linux/audit.h | 4 +
+ include/linux/isdn.h | 1 +
+ include/linux/of_fdt.h | 2 +-
+ include/linux/platform_data/serial-omap.h | 2 +-
+ include/linux/sched.h | 1 -
+ include/linux/serial_8250.h | 8 +
+ include/linux/serial_core.h | 25 +-
+ include/linux/tty.h | 58 +-
+ include/linux/tty_ldisc.h | 13 -
+ kernel/audit.c | 27 +-
+ net/irda/ircomm/ircomm_tty.c | 15 +-
+ net/irda/ircomm/ircomm_tty_ioctl.c | 13 +-
+ net/nfc/nci/uart.c | 9 +-
+ security/selinux/hooks.c | 4 +-
+ 126 files changed, 2383 insertions(+), 3618 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm2835-aux-uart.txt
+ delete mode 100644 drivers/tty/serial/68328serial.c
+ create mode 100644 drivers/tty/serial/8250/8250_bcm2835aux.c
+ delete mode 100644 drivers/tty/serial/m32r_sio.h
+Merging usb/usb-next (3d0712deb0a4 Merge tag 'usb-for-v4.6' of http://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next)
+$ git merge usb/usb-next
+Auto-merging include/linux/device.h
+Auto-merging drivers/usb/gadget/function/f_rndis.c
+Auto-merging drivers/usb/gadget/function/f_mass_storage.c
+Auto-merging drivers/usb/gadget/configfs.c
+Auto-merging drivers/usb/core/hcd-pci.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 23 +
+ Documentation/devicetree/bindings/usb/dwc2.txt | 2 +
+ Documentation/devicetree/bindings/usb/usb-xhci.txt | 21 +-
+ Documentation/usb/chipidea.txt | 9 +-
+ .../usbip => Documentation/usb}/usbip_protocol.txt | 0
+ MAINTAINERS | 3 +-
+ arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 198 --
+ arch/arm/mach-pxa/include/mach/pxa25x-udc.h | 163 --
+ drivers/phy/phy-dm816x-usb.c | 4 +-
+ drivers/phy/phy-twl4030-usb.c | 4 +-
+ drivers/usb/Makefile | 2 +-
+ drivers/usb/atm/cxacru.c | 2 +
+ drivers/usb/chipidea/ci_hdrc_imx.c | 13 +-
+ drivers/usb/chipidea/core.c | 3 +
+ drivers/usb/chipidea/debug.c | 5 +-
+ drivers/usb/chipidea/otg_fsm.c | 29 +-
+ drivers/usb/chipidea/otg_fsm.h | 2 +
+ drivers/usb/chipidea/udc.c | 4 +-
+ drivers/usb/class/cdc-acm.c | 67 +
+ drivers/usb/class/cdc-acm.h | 1 +
+ drivers/usb/class/usbtmc.c | 331 +++
+ drivers/usb/common/common.c | 1 +
+ drivers/usb/common/usb-otg-fsm.c | 87 +
+ drivers/usb/core/buffer.c | 18 +-
+ drivers/usb/core/config.c | 37 +-
+ drivers/usb/core/devices.c | 26 +-
+ drivers/usb/core/devio.c | 240 ++-
+ drivers/usb/core/file.c | 9 +-
+ drivers/usb/core/hcd-pci.c | 2 +-
+ drivers/usb/core/hcd.c | 114 +-
+ drivers/usb/core/hub.c | 122 +-
+ drivers/usb/core/hub.h | 7 +
+ drivers/usb/core/sysfs.c | 68 +-
+ drivers/usb/core/urb.c | 3 +-
+ drivers/usb/core/usb.c | 5 +-
+ drivers/usb/core/usb.h | 2 +-
+ drivers/usb/dwc2/Kconfig | 1 +
+ drivers/usb/dwc2/core.c | 2242 ++-----------------
+ drivers/usb/dwc2/core.h | 151 +-
+ drivers/usb/dwc2/gadget.c | 102 +
+ drivers/usb/dwc2/hcd.c | 2255 ++++++++++++++++++--
+ drivers/usb/dwc2/hcd.h | 134 +-
+ drivers/usb/dwc2/hcd_ddma.c | 49 +-
+ drivers/usb/dwc2/hcd_intr.c | 174 +-
+ drivers/usb/dwc2/hcd_queue.c | 1969 +++++++++++++----
+ drivers/usb/dwc2/platform.c | 38 +-
+ drivers/usb/dwc3/core.c | 31 +-
+ drivers/usb/dwc3/core.h | 11 +-
+ drivers/usb/dwc3/ep0.c | 9 +-
+ drivers/usb/dwc3/gadget.c | 30 +-
+ drivers/usb/gadget/composite.c | 150 +-
+ drivers/usb/gadget/config.c | 9 +-
+ drivers/usb/gadget/configfs.c | 1 +
+ drivers/usb/gadget/function/f_acm.c | 6 +-
+ drivers/usb/gadget/function/f_ecm.c | 2 +-
+ drivers/usb/gadget/function/f_eem.c | 2 +-
+ drivers/usb/gadget/function/f_fs.c | 155 +-
+ drivers/usb/gadget/function/f_hid.c | 2 +-
+ drivers/usb/gadget/function/f_loopback.c | 2 +-
+ drivers/usb/gadget/function/f_mass_storage.c | 2 +-
+ drivers/usb/gadget/function/f_midi.c | 200 +-
+ drivers/usb/gadget/function/f_ncm.c | 2 +-
+ drivers/usb/gadget/function/f_obex.c | 3 +-
+ drivers/usb/gadget/function/f_phonet.c | 2 +-
+ drivers/usb/gadget/function/f_printer.c | 2 +-
+ drivers/usb/gadget/function/f_rndis.c | 2 +-
+ drivers/usb/gadget/function/f_serial.c | 2 +-
+ drivers/usb/gadget/function/f_sourcesink.c | 2 +-
+ drivers/usb/gadget/function/f_subset.c | 2 +-
+ drivers/usb/gadget/function/f_tcm.c | 2 +-
+ drivers/usb/gadget/function/f_uac1.c | 3 +-
+ drivers/usb/gadget/function/f_uac2.c | 3 +-
+ drivers/usb/gadget/function/rndis.c | 20 +-
+ drivers/usb/gadget/legacy/inode.c | 28 +-
+ drivers/usb/gadget/udc/Kconfig | 7 +-
+ drivers/usb/gadget/udc/bdc/bdc_udc.c | 5 +
+ drivers/usb/gadget/udc/lpc32xx_udc.c | 103 +-
+ drivers/usb/gadget/udc/pxa25x_udc.c | 530 +++--
+ drivers/usb/gadget/udc/pxa25x_udc.h | 11 +-
+ drivers/usb/gadget/udc/udc-core.c | 30 +
+ drivers/usb/host/Kconfig | 18 +-
+ drivers/usb/host/Makefile | 3 +-
+ drivers/usb/host/bcma-hcd.c | 83 +-
+ drivers/usb/host/ehci-atmel.c | 6 +-
+ drivers/usb/host/ehci-dbg.c | 477 +++--
+ drivers/usb/host/ehci-fsl.c | 24 +-
+ drivers/usb/host/ehci-hcd.c | 22 +-
+ drivers/usb/host/ehci-hub.c | 6 +-
+ drivers/usb/host/ehci-msm.c | 66 +-
+ drivers/usb/host/ehci-pci.c | 8 +-
+ drivers/usb/host/ehci-platform.c | 6 +-
+ drivers/usb/host/ehci-q.c | 104 +-
+ drivers/usb/host/ehci-sched.c | 524 ++---
+ drivers/usb/host/ehci-st.c | 6 +-
+ drivers/usb/host/ehci-timer.c | 5 +-
+ drivers/usb/host/ehci.h | 99 +-
+ drivers/usb/host/fotg210-hcd.c | 15 +-
+ drivers/usb/host/fsl-mph-dr-of.c | 7 +-
+ drivers/usb/host/max3421-hcd.c | 16 +-
+ drivers/usb/host/ohci-at91.c | 8 +-
+ drivers/usb/host/ohci-nxp.c | 87 +-
+ drivers/usb/host/ohci-platform.c | 6 +-
+ drivers/usb/host/ohci-pxa27x.c | 2 +-
+ drivers/usb/host/ohci-st.c | 6 +-
+ drivers/usb/host/ohci.h | 2 -
+ drivers/usb/host/oxu210hp-hcd.c | 15 +-
+ drivers/usb/host/pci-quirks.c | 3 +-
+ drivers/usb/host/r8a66597-hcd.c | 11 +-
+ drivers/usb/host/u132-hcd.c | 18 +-
+ drivers/usb/host/xhci-hub.c | 27 +-
+ drivers/usb/host/xhci-mem.c | 180 +-
+ drivers/usb/host/xhci-mtk.c | 10 +-
+ drivers/usb/host/xhci-plat.c | 6 +
+ drivers/usb/host/xhci-ring.c | 134 +-
+ drivers/usb/host/xhci.c | 8 +-
+ drivers/usb/host/xhci.h | 15 +-
+ drivers/usb/misc/chaoskey.c | 122 +-
+ drivers/usb/misc/idmouse.c | 2 +-
+ drivers/usb/misc/sisusbvga/sisusb.c | 1543 +++++++-------
+ drivers/usb/mon/mon_main.c | 9 +-
+ drivers/usb/musb/Kconfig | 2 +
+ drivers/usb/musb/musb_core.c | 2 +-
+ drivers/usb/musb/musb_core.h | 2 +-
+ drivers/usb/musb/musbhsdma.c | 8 +-
+ drivers/usb/musb/tusb6010_omap.c | 4 +-
+ drivers/usb/musb/ux500_dma.c | 3 -
+ drivers/usb/phy/phy-am335x.c | 1 -
+ drivers/usb/phy/phy-generic.c | 11 +-
+ drivers/usb/phy/phy-isp1301-omap.c | 2 +-
+ drivers/usb/renesas_usbhs/Kconfig | 2 +-
+ drivers/usb/renesas_usbhs/Makefile | 2 +-
+ drivers/usb/renesas_usbhs/common.c | 14 +-
+ drivers/usb/renesas_usbhs/fifo.c | 20 +-
+ drivers/usb/renesas_usbhs/fifo.h | 20 +-
+ drivers/usb/renesas_usbhs/mod_gadget.c | 2 +-
+ drivers/usb/renesas_usbhs/pipe.c | 6 +-
+ drivers/usb/renesas_usbhs/pipe.h | 2 +-
+ drivers/usb/renesas_usbhs/rcar3.c | 54 +
+ drivers/usb/renesas_usbhs/rcar3.h | 3 +
+ drivers/usb/storage/debug.c | 12 +-
+ drivers/usb/storage/debug.h | 3 -
+ drivers/usb/storage/ene_ub6250.c | 4 +-
+ drivers/usb/storage/sddr09.c | 18 +-
+ drivers/usb/storage/uas.c | 36 +-
+ drivers/usb/usbip/usbip_event.c | 5 +-
+ drivers/usb/usbip/vhci_hcd.c | 88 +-
+ drivers/usb/usbip/vhci_rx.c | 30 +-
+ drivers/usb/usbip/vhci_sysfs.c | 19 +-
+ drivers/usb/usbip/vhci_tx.c | 14 +-
+ drivers/usb/wusbcore/wusbhc.h | 2 +-
+ include/linux/device.h | 5 +
+ include/linux/usb.h | 11 +-
+ include/linux/usb/composite.h | 6 +
+ include/linux/usb/gadget.h | 20 +-
+ include/linux/usb/hcd.h | 5 +-
+ include/linux/usb/msm_hsusb_hw.h | 1 +
+ include/linux/usb/musb.h | 2 +-
+ include/linux/usb/otg-fsm.h | 15 +
+ include/linux/usb/renesas_usbhs.h | 1 +
+ include/linux/usb/storage.h | 12 +-
+ include/uapi/linux/usb/ch11.h | 21 +
+ include/uapi/linux/usb/ch9.h | 36 +
+ include/uapi/linux/usb/tmc.h | 29 +-
+ include/uapi/linux/usbdevice_fs.h | 1 +
+ 164 files changed, 8570 insertions(+), 5808 deletions(-)
+ rename {drivers/usb/usbip => Documentation/usb}/usbip_protocol.txt (100%)
+ create mode 100644 drivers/usb/renesas_usbhs/rcar3.c
+ create mode 100644 drivers/usb/renesas_usbhs/rcar3.h
+Merging usb-gadget/next (0561f77e2db9 usb: gadget: f_acm: Fix configfs attr name)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (7084fa868b50 USB: serial: cp210x: add new access functions for large registers)
+$ git merge usb-serial/usb-next
+Auto-merging drivers/usb/serial/mos7840.c
+Auto-merging drivers/usb/serial/cp210x.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/ch341.c | 2 +-
+ drivers/usb/serial/cp210x.c | 306 +++++++++++++++++++++++----------------
+ drivers/usb/serial/cyberjack.c | 3 +-
+ drivers/usb/serial/ftdi_sio.c | 10 +-
+ drivers/usb/serial/ftdi_sio.h | 8 +-
+ drivers/usb/serial/garmin_gps.c | 51 ++++---
+ drivers/usb/serial/iuu_phoenix.c | 4 +-
+ drivers/usb/serial/keyspan.c | 2 +-
+ drivers/usb/serial/kl5kusb105.c | 3 -
+ drivers/usb/serial/mos7840.c | 4 +-
+ drivers/usb/serial/quatech2.c | 2 +-
+ drivers/usb/serial/safe_serial.c | 11 +-
+ 12 files changed, 228 insertions(+), 178 deletions(-)
+Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Merge made by the 'recursive' strategy.
+Merging staging/staging-next (a921e9bd4e22 isdn: i4l: move active-isdn drivers to staging)
+$ git merge staging/staging-next
+Resolved 'drivers/base/firmware_class.c' using previous resolution.
+Resolved 'drivers/media/dvb-frontends/mn88473.c' using previous resolution.
+Resolved 'drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c' using previous resolution.
+Resolved 'drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h' using previous resolution.
+Resolved 'drivers/watchdog/Kconfig' using previous resolution.
+Resolved 'drivers/watchdog/Makefile' using previous resolution.
+Resolved 'include/linux/irqdomain.h' using previous resolution.
+Auto-merging include/linux/irqdomain.h
+CONFLICT (content): Merge conflict in include/linux/irqdomain.h
+Auto-merging drivers/watchdog/Makefile
+CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
+Auto-merging drivers/watchdog/Kconfig
+CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
+Removing drivers/staging/wilc1000/linux_wlan_common.h
+Removing drivers/staging/staging.c
+Removing drivers/staging/sm750fb/sm750_help.h
+Auto-merging drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
+Removing drivers/staging/panel/TODO
+Removing drivers/staging/panel/Makefile
+Removing drivers/staging/panel/Kconfig
+Removing drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
+Removing drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+Removing drivers/staging/olpc_dcon/olpc_dcon.h
+Removing drivers/staging/olpc_dcon/olpc_dcon.c
+Removing drivers/staging/olpc_dcon/TODO
+Removing drivers/staging/olpc_dcon/Makefile
+Removing drivers/staging/olpc_dcon/Kconfig
+Auto-merging drivers/staging/media/davinci_vpfe/vpfe_video.c
+Auto-merging drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
+CONFLICT (content): Merge conflict in drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
+Auto-merging drivers/staging/lustre/lustre/obdclass/kernelcomm.c
+Auto-merging drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
+CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
+Auto-merging drivers/staging/lustre/lustre/include/uapi_kernelcomm.h
+Removing drivers/staging/lustre/lustre/include/lustre/lustre_build_version.h
+Removing drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
+Removing drivers/staging/iio/magnetometer/Makefile
+Removing drivers/staging/iio/magnetometer/Kconfig
+Auto-merging drivers/staging/i4l/icn/icn.c
+Removing drivers/staging/dgap/dgap.h
+CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
+Removing drivers/staging/dgap/Makefile
+Removing drivers/staging/dgap/Kconfig
+Auto-merging drivers/staging/android/ion/ion.c
+Auto-merging drivers/staging/android/ashmem.c
+Auto-merging drivers/misc/panel.c
+Auto-merging drivers/misc/mic/vop/vop_main.h
+Auto-merging drivers/misc/mic/scif/scif_rma.c
+Removing drivers/misc/mic/host/mic_virtio.c
+Removing drivers/misc/mic/host/mic_fops.h
+Removing drivers/misc/mic/host/mic_fops.c
+Removing drivers/misc/mic/card/mic_virtio.h
+Removing drivers/misc/mic/card/mic_virtio.c
+Removing drivers/misc/mei/wd.c
+Auto-merging drivers/misc/lkdtm.c
+Auto-merging drivers/media/dvb-frontends/mn88473.c
+CONFLICT (content): Merge conflict in drivers/media/dvb-frontends/mn88473.c
+Auto-merging drivers/iio/magnetometer/hmc5843_spi.c
+Auto-merging drivers/iio/magnetometer/hmc5843_i2c.c
+Auto-merging drivers/iio/magnetometer/hmc5843_core.c
+Auto-merging drivers/iio/magnetometer/hmc5843.h
+Auto-merging drivers/iio/adc/mxs-lradc.c
+Auto-merging drivers/iio/adc/Makefile
+Auto-merging drivers/iio/adc/Kconfig
+Auto-merging drivers/hv/hyperv_vmbus.h
+Auto-merging drivers/base/firmware_class.c
+CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/mic/mpssd/mpssd.c
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/dgap/dgap.c
+drivers/staging/dgap/dgap.c: needs merge
+rm 'drivers/staging/dgap/dgap.c'
+$ git commit -v -a
+[master 70e6ed3f33b1] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 1 +
+ Documentation/ABI/stable/sysfs-bus-vmbus | 14 +
+ Documentation/ABI/testing/sysfs-bus-iio | 10 +
+ .../ABI/testing/sysfs-bus-iio-health-afe440x | 54 +
+ .../ABI/testing/sysfs-bus-iio-magnetometer-hmc5843 | 15 +
+ Documentation/ABI/testing/sysfs-bus-iio-vf610 | 9 +
+ .../devicetree/bindings/goldfish/pipe.txt | 17 +
+ .../devicetree/bindings/iio/accel/mma8452.txt | 4 +-
+ .../bindings/iio/adc/at91-sama5d2_adc.txt | 28 +
+ .../devicetree/bindings/iio/adc/mcp3422.txt | 1 +
+ .../devicetree/bindings/iio/adc/ti-adc0832.txt | 19 +
+ .../bindings/iio/chemical/atlas,ph-sm.txt | 22 +
+ .../devicetree/bindings/iio/dac/vf610-dac.txt | 20 +
+ .../devicetree/bindings/iio/health/afe4403.txt | 34 +
+ .../devicetree/bindings/iio/health/afe4404.txt | 30 +
+ .../devicetree/bindings/iio/health/max30100.txt | 8 +
+ .../devicetree/bindings/iio/light/opt3001.txt | 26 +
+ .../devicetree/bindings/misc/eeprom-93xx46.txt | 25 +
+ .../devicetree/bindings/nvmem/lpc1857-eeprom.txt | 28 +
+ .../devicetree/bindings/nvmem/mtk-efuse.txt | 36 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/isdn/00-INDEX | 8 -
+ Documentation/mic/mic_overview.txt | 54 +-
+ Documentation/mic/mpssd/mpss | 2 +-
+ Documentation/mic/mpssd/mpssd.c | 2 +-
+ .../misc-devices}/lcd-panel-cgram.txt | 0
+ Documentation/misc-devices/mei/mei.txt | 12 +-
+ MAINTAINERS | 40 +-
+ drivers/android/binder.c | 31 +-
+ drivers/base/firmware_class.c | 9 +-
+ drivers/char/nvram.c | 12 +-
+ drivers/char/nwbutton.c | 5 +-
+ drivers/char/ppdev.c | 397 +-
+ drivers/char/raw.c | 4 +-
+ drivers/hv/channel.c | 36 +-
+ drivers/hv/channel_mgmt.c | 268 +-
+ drivers/hv/connection.c | 8 +-
+ drivers/hv/hv.c | 26 +-
+ drivers/hv/hyperv_vmbus.h | 6 +-
+ drivers/hv/ring_buffer.c | 31 +-
+ drivers/hv/vmbus_drv.c | 25 +
+ drivers/hwtracing/coresight/Kconfig | 1 +
+ drivers/hwtracing/coresight/Makefile | 4 +-
+ drivers/hwtracing/coresight/coresight-etb10.c | 293 +-
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 393 ++
+ drivers/hwtracing/coresight/coresight-etm-perf.h | 32 +
+ drivers/hwtracing/coresight/coresight-etm.h | 142 +-
+ .../hwtracing/coresight/coresight-etm3x-sysfs.c | 1272 ++++
+ drivers/hwtracing/coresight/coresight-etm3x.c | 1737 +----
+ drivers/hwtracing/coresight/coresight-etm4x.c | 37 +-
+ drivers/hwtracing/coresight/coresight-funnel.c | 21 +-
+ drivers/hwtracing/coresight/coresight-priv.h | 15 +
+ .../coresight/coresight-replicator-qcom.c | 19 +-
+ drivers/hwtracing/coresight/coresight-replicator.c | 25 +-
+ drivers/hwtracing/coresight/coresight-tmc.c | 35 +-
+ drivers/hwtracing/coresight/coresight-tpiu.c | 23 +-
+ drivers/hwtracing/coresight/coresight.c | 388 +-
+ drivers/hwtracing/coresight/of_coresight.c | 3 +-
+ drivers/hwtracing/intel_th/Kconfig | 1 +
+ drivers/hwtracing/intel_th/core.c | 30 +-
+ drivers/hwtracing/intel_th/gth.c | 32 +-
+ drivers/hwtracing/intel_th/gth.h | 3 -
+ drivers/hwtracing/intel_th/intel_th.h | 41 +
+ drivers/hwtracing/intel_th/msu.c | 9 +-
+ drivers/hwtracing/intel_th/pci.c | 12 +-
+ drivers/hwtracing/intel_th/sth.c | 11 +-
+ drivers/hwtracing/stm/Kconfig | 16 +
+ drivers/hwtracing/stm/Makefile | 2 +
+ drivers/hwtracing/stm/core.c | 175 +-
+ drivers/hwtracing/stm/dummy_stm.c | 71 +-
+ drivers/hwtracing/stm/heartbeat.c | 130 +
+ drivers/hwtracing/stm/policy.c | 25 +-
+ drivers/hwtracing/stm/stm.h | 2 +
+ drivers/iio/accel/Kconfig | 2 +-
+ drivers/iio/accel/mma8452.c | 206 +-
+ drivers/iio/accel/st_accel_core.c | 16 +
+ drivers/iio/adc/Kconfig | 53 +-
+ drivers/iio/adc/Makefile | 4 +
+ drivers/iio/adc/at91-sama5d2_adc.c | 508 ++
+ drivers/iio/adc/axp288_adc.c | 2 +-
+ drivers/iio/adc/ina2xx-adc.c | 155 +-
+ drivers/iio/adc/mcp320x.c | 31 +-
+ drivers/iio/adc/mcp3422.c | 9 +-
+ drivers/{staging => }/iio/adc/mxs-lradc.c | 13 +-
+ drivers/iio/adc/palmas_gpadc.c | 6 +-
+ drivers/iio/adc/ti-adc081c.c | 2 +-
+ drivers/iio/adc/ti-adc0832.c | 288 +
+ drivers/iio/adc/ti-ads1015.c | 612 ++
+ drivers/iio/buffer/industrialio-buffer-dmaengine.c | 7 +-
+ drivers/iio/chemical/Kconfig | 14 +
+ drivers/iio/chemical/Makefile | 1 +
+ drivers/iio/chemical/atlas-ph-sensor.c | 509 ++
+ drivers/iio/chemical/vz89x.c | 2 +-
+ drivers/iio/common/st_sensors/st_sensors_core.c | 6 +-
+ drivers/iio/common/st_sensors/st_sensors_core.h | 8 +
+ drivers/iio/common/st_sensors/st_sensors_trigger.c | 52 +-
+ drivers/iio/dac/Kconfig | 39 +-
+ drivers/iio/dac/Makefile | 3 +
+ drivers/iio/dac/ad5064.c | 391 +-
+ drivers/iio/dac/ad5761.c | 430 ++
+ drivers/iio/dac/mcp4725.c | 87 +-
+ drivers/iio/dac/stx104.c | 152 +
+ drivers/iio/dac/vf610_dac.c | 298 +
+ drivers/iio/gyro/st_gyro_core.c | 15 +
+ drivers/iio/health/Kconfig | 32 +-
+ drivers/iio/health/Makefile | 2 +
+ drivers/iio/health/afe4403.c | 708 ++
+ drivers/iio/health/afe4404.c | 679 ++
+ drivers/iio/health/afe440x.h | 191 +
+ drivers/iio/health/max30100.c | 81 +-
+ drivers/iio/humidity/Kconfig | 6 +-
+ drivers/iio/humidity/dht11.c | 77 +-
+ drivers/iio/humidity/hdc100x.c | 2 +-
+ drivers/iio/humidity/htu21.c | 2 +-
+ drivers/iio/humidity/si7005.c | 3 +-
+ drivers/iio/humidity/si7020.c | 3 +-
+ drivers/iio/imu/inv_mpu6050/Kconfig | 24 +-
+ drivers/iio/imu/inv_mpu6050/Makefile | 8 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 24 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 458 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 208 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 37 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 54 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 98 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 32 +-
+ drivers/iio/industrialio-buffer.c | 59 +-
+ drivers/iio/industrialio-core.c | 1 +
+ drivers/iio/light/bh1750.c | 2 +-
+ drivers/iio/light/jsa1212.c | 2 +-
+ drivers/iio/light/opt3001.c | 156 +-
+ drivers/iio/magnetometer/Kconfig | 33 +
+ drivers/iio/magnetometer/Makefile | 4 +
+ drivers/iio/magnetometer/ak8975.c | 4 +-
+ drivers/{staging => }/iio/magnetometer/hmc5843.h | 5 +-
+ .../{staging => }/iio/magnetometer/hmc5843_core.c | 138 +-
+ .../{staging => }/iio/magnetometer/hmc5843_i2c.c | 3 +-
+ .../{staging => }/iio/magnetometer/hmc5843_spi.c | 3 +-
+ drivers/iio/magnetometer/st_magn_core.c | 4 +
+ drivers/iio/potentiometer/Kconfig | 12 +
+ drivers/iio/potentiometer/Makefile | 1 +
+ drivers/iio/potentiometer/mcp4531.c | 2 +-
+ drivers/iio/potentiometer/tpl0102.c | 166 +
+ drivers/iio/pressure/Kconfig | 43 +-
+ drivers/iio/pressure/Makefile | 2 +
+ drivers/iio/pressure/mpl115.c | 66 +-
+ drivers/iio/pressure/mpl115.h | 24 +
+ drivers/iio/pressure/mpl115_i2c.c | 67 +
+ drivers/iio/pressure/mpl115_spi.c | 106 +
+ drivers/iio/pressure/ms5611.h | 4 +-
+ drivers/iio/pressure/ms5611_core.c | 122 +-
+ drivers/iio/pressure/ms5611_i2c.c | 11 +-
+ drivers/iio/pressure/ms5611_spi.c | 12 +-
+ drivers/iio/pressure/ms5637.c | 2 +-
+ drivers/iio/pressure/st_pressure_core.c | 8 +
+ drivers/iio/pressure/t5403.c | 2 +-
+ drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 2 +-
+ drivers/iio/temperature/mlx90614.c | 2 +-
+ drivers/iio/temperature/tmp006.c | 2 +-
+ drivers/iio/temperature/tsys01.c | 2 +-
+ drivers/iio/temperature/tsys02d.c | 2 +-
+ drivers/isdn/Makefile | 3 -
+ drivers/isdn/i4l/Kconfig | 10 -
+ drivers/misc/Kconfig | 282 +-
+ drivers/misc/Makefile | 1 +
+ drivers/misc/apds990x.c | 8 +-
+ drivers/misc/arm-charlcd.c | 24 +-
+ drivers/misc/bh1770glc.c | 8 +-
+ drivers/misc/c2port/core.c | 8 +-
+ drivers/misc/cxl/sysfs.c | 5 +-
+ drivers/misc/eeprom/at24.c | 4 +-
+ drivers/misc/eeprom/at25.c | 4 +-
+ drivers/misc/eeprom/eeprom.c | 2 +-
+ drivers/misc/eeprom/eeprom_93xx46.c | 216 +-
+ drivers/misc/genwqe/card_sysfs.c | 2 +-
+ drivers/misc/ibmasm/ibmasm.h | 9 +-
+ drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 8 +-
+ drivers/misc/lkdtm.c | 2 +-
+ drivers/misc/mei/Kconfig | 6 +-
+ drivers/misc/mei/Makefile | 1 -
+ drivers/misc/mei/amthif.c | 130 +-
+ drivers/misc/mei/bus-fixup.c | 41 +-
+ drivers/misc/mei/bus.c | 57 +-
+ drivers/misc/mei/client.c | 189 +-
+ drivers/misc/mei/client.h | 27 +-
+ drivers/misc/mei/debugfs.c | 65 +-
+ drivers/misc/mei/hbm.c | 24 +-
+ drivers/misc/mei/hw-me.c | 10 +-
+ drivers/misc/mei/hw-txe.c | 10 +-
+ drivers/misc/mei/hw.h | 32 +-
+ drivers/misc/mei/init.c | 20 +-
+ drivers/misc/mei/interrupt.c | 94 +-
+ drivers/misc/mei/main.c | 106 +-
+ drivers/misc/mei/mei-trace.c | 2 +
+ drivers/misc/mei/mei-trace.h | 40 +-
+ drivers/misc/mei/mei_dev.h | 118 +-
+ drivers/misc/mei/pci-me.c | 4 +-
+ drivers/misc/mei/pci-txe.c | 4 +-
+ drivers/misc/mei/wd.c | 391 --
+ drivers/misc/mic/Kconfig | 44 +-
+ drivers/misc/mic/Makefile | 1 +
+ drivers/misc/mic/bus/Makefile | 1 +
+ drivers/misc/mic/bus/cosm_bus.h | 2 +
+ drivers/misc/mic/bus/vop_bus.c | 203 +
+ drivers/misc/mic/bus/vop_bus.h | 140 +
+ drivers/misc/mic/card/Makefile | 1 -
+ drivers/misc/mic/card/mic_device.c | 89 +-
+ drivers/misc/mic/card/mic_device.h | 3 +
+ drivers/misc/mic/card/mic_virtio.c | 634 --
+ drivers/misc/mic/card/mic_virtio.h | 76 -
+ drivers/misc/mic/card/mic_x100.c | 1 +
+ drivers/misc/mic/cosm/cosm_main.c | 13 +-
+ drivers/misc/mic/host/Makefile | 2 -
+ drivers/misc/mic/host/mic_boot.c | 125 +-
+ drivers/misc/mic/host/mic_debugfs.c | 190 -
+ drivers/misc/mic/host/mic_device.h | 9 +-
+ drivers/misc/mic/host/mic_fops.c | 222 -
+ drivers/misc/mic/host/mic_fops.h | 32 -
+ drivers/misc/mic/host/mic_main.c | 49 +-
+ drivers/misc/mic/host/mic_virtio.c | 811 ---
+ drivers/misc/mic/host/mic_x100.c | 19 +-
+ drivers/misc/mic/scif/scif_dma.c | 41 +-
+ drivers/misc/mic/scif/scif_rma.c | 7 +-
+ drivers/misc/mic/vop/Makefile | 9 +
+ drivers/misc/mic/vop/vop_debugfs.c | 232 +
+ drivers/misc/mic/vop/vop_main.c | 755 +++
+ .../misc/mic/{host/mic_virtio.h => vop/vop_main.h} | 129 +-
+ drivers/misc/mic/vop/vop_vringh.c | 1165 ++++
+ drivers/{staging/panel => misc}/panel.c | 136 +-
+ drivers/misc/pch_phub.c | 6 +-
+ drivers/misc/ti-st/st_core.c | 1 -
+ drivers/misc/vmw_vmci/vmci_driver.c | 2 +-
+ drivers/nvmem/Kconfig | 20 +
+ drivers/nvmem/Makefile | 4 +
+ drivers/nvmem/core.c | 4 +-
+ drivers/nvmem/lpc18xx_eeprom.c | 330 +
+ drivers/nvmem/mtk-efuse.c | 89 +
+ drivers/nvmem/rockchip-efuse.c | 90 +-
+ drivers/nvmem/sunxi_sid.c | 9 +-
+ drivers/platform/Kconfig | 3 +-
+ drivers/platform/goldfish/Kconfig | 18 +
+ drivers/platform/goldfish/Makefile | 2 +-
+ drivers/platform/goldfish/goldfish_pipe.c | 183 +-
+ drivers/staging/Kconfig | 8 +-
+ drivers/staging/Makefile | 7 +-
+ drivers/staging/android/Kconfig | 9 -
+ drivers/staging/android/ashmem.c | 4 +-
+ drivers/staging/android/ion/ion.c | 74 +-
+ drivers/staging/android/ion/ion.h | 20 +-
+ drivers/staging/android/ion/ion_carveout_heap.c | 2 +-
+ drivers/staging/android/ion/ion_page_pool.c | 4 +-
+ drivers/staging/android/ion/ion_system_heap.c | 2 +-
+ drivers/staging/android/lowmemorykiller.c | 24 +-
+ drivers/staging/android/sw_sync.c | 191 +-
+ drivers/staging/android/sw_sync.h | 8 +-
+ drivers/staging/android/sync.c | 469 +-
+ drivers/staging/android/sync.h | 241 +-
+ drivers/staging/android/sync_debug.c | 221 +-
+ drivers/staging/android/trace/sync.h | 44 -
+ drivers/staging/android/uapi/ashmem.h | 1 +
+ drivers/staging/android/uapi/sync.h | 37 +-
+ drivers/staging/board/armadillo800eva.c | 1 -
+ drivers/staging/board/board.c | 1 -
+ .../clocking-wizard/clk-xlnx-clock-wizard.c | 9 +-
+ drivers/staging/comedi/TODO | 1 +
+ drivers/staging/comedi/comedi.h | 599 +-
+ drivers/staging/comedi/comedi_fops.c | 84 +-
+ drivers/staging/comedi/comedi_pcmcia.h | 3 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 6 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 2 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 68 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 141 +-
+ drivers/staging/comedi/drivers/comedi_isadma.c | 3 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 47 +-
+ drivers/staging/comedi/drivers/dt2801.c | 18 +-
+ drivers/staging/comedi/drivers/dt282x.c | 2 +-
+ drivers/staging/comedi/drivers/dt3000.c | 2 +-
+ drivers/staging/comedi/drivers/mite.c | 72 +-
+ drivers/staging/comedi/drivers/mite.h | 3 +
+ drivers/staging/comedi/drivers/ni_mio_c_common.c | 0
+ drivers/staging/comedi/drivers/ni_mio_common.c | 611 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 2 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 20 +-
+ drivers/staging/comedi/drivers/ni_tiocmd.c | 2 +-
+ drivers/staging/comedi/drivers/s626.c | 33 -
+ drivers/staging/dgap/Kconfig | 6 -
+ drivers/staging/dgap/Makefile | 1 -
+ drivers/staging/dgap/dgap.c | 7057 --------------------
+ drivers/staging/dgap/dgap.h | 1229 ----
+ drivers/staging/dgnc/dgnc_neo.c | 6 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 53 +-
+ drivers/staging/fbtft/Kconfig | 12 +
+ drivers/staging/fbtft/Makefile | 2 +
+ drivers/staging/fbtft/fb_hx8340bn.c | 144 +-
+ drivers/staging/fbtft/fb_hx8347d.c | 9 +-
+ drivers/staging/fbtft/fb_hx8353d.c | 52 +-
+ drivers/staging/fbtft/fb_hx8357d.c | 144 +-
+ drivers/staging/fbtft/fb_hx8357d.h | 60 +-
+ drivers/staging/fbtft/fb_ili9163.c | 189 +-
+ drivers/staging/fbtft/fb_ili9320.c | 13 +-
+ drivers/staging/fbtft/fb_ili9325.c | 81 +-
+ drivers/staging/fbtft/fb_ili9340.c | 34 +-
+ drivers/staging/fbtft/fb_ili9341.c | 69 +-
+ drivers/staging/fbtft/fb_ili9481.c | 33 +-
+ drivers/staging/fbtft/fb_ili9486.c | 35 +-
+ drivers/staging/fbtft/fb_s6d02a1.c | 42 +-
+ drivers/staging/fbtft/fb_ssd1305.c | 216 +
+ drivers/staging/fbtft/fb_ssd1325.c | 205 +
+ drivers/staging/fbtft/fb_st7735r.c | 42 +-
+ drivers/staging/fbtft/fb_tinylcd.c | 28 +-
+ drivers/staging/fbtft/fb_uc1701.c | 27 +-
+ drivers/staging/fbtft/fbtft-core.c | 24 +-
+ drivers/staging/fbtft/fbtft.h | 8 -
+ drivers/staging/fbtft/fbtft_device.c | 75 +-
+ drivers/staging/fsl-mc/bus/Kconfig | 3 +-
+ drivers/staging/fsl-mc/bus/Makefile | 2 +
+ drivers/staging/fsl-mc/bus/dprc-driver.c | 333 +-
+ .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 127 +
+ drivers/staging/fsl-mc/bus/mc-allocator.c | 201 +-
+ drivers/staging/fsl-mc/bus/mc-bus.c | 19 +-
+ drivers/staging/fsl-mc/bus/mc-msi.c | 276 +
+ drivers/staging/fsl-mc/include/dprc.h | 2 +-
+ drivers/staging/fsl-mc/include/mc-private.h | 41 +-
+ drivers/staging/fsl-mc/include/mc.h | 26 +
+ drivers/staging/fwserial/dma_fifo.c | 10 +-
+ drivers/staging/fwserial/fwserial.c | 17 +-
+ drivers/staging/fwserial/fwserial.h | 1 -
+ drivers/staging/gdm724x/gdm_lte.c | 8 +-
+ drivers/staging/gdm724x/gdm_mux.c | 20 +-
+ drivers/staging/gdm724x/gdm_usb.c | 34 +-
+ drivers/staging/gdm72xx/gdm_qos.c | 14 +-
+ drivers/staging/gdm72xx/gdm_qos.h | 2 +-
+ drivers/staging/gdm72xx/gdm_sdio.c | 4 +-
+ drivers/staging/gdm72xx/gdm_sdio.h | 4 +-
+ drivers/staging/gdm72xx/gdm_usb.c | 9 +-
+ drivers/staging/gdm72xx/gdm_usb.h | 10 +-
+ drivers/staging/gdm72xx/gdm_wimax.c | 45 +-
+ drivers/staging/gdm72xx/gdm_wimax.h | 4 +-
+ drivers/staging/gdm72xx/hci.h | 11 +-
+ drivers/staging/gdm72xx/netlink_k.c | 16 +-
+ drivers/staging/gdm72xx/netlink_k.h | 2 +-
+ drivers/staging/gdm72xx/sdio_boot.c | 2 +-
+ drivers/staging/gdm72xx/usb_boot.c | 16 +-
+ drivers/staging/gdm72xx/usb_ids.h | 64 +-
+ drivers/staging/gdm72xx/wm_ioctl.h | 4 +-
+ drivers/staging/goldfish/goldfish_audio.c | 8 +-
+ drivers/staging/goldfish/goldfish_nand.c | 50 +-
+ drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 6 +-
+ .../staging/i4l/Documentation}/README.act2000 | 0
+ .../staging/i4l/Documentation}/README.icn | 0
+ .../staging/i4l/Documentation}/README.pcbit | 0
+ .../staging/i4l/Documentation}/README.sc | 0
+ drivers/staging/i4l/Kconfig | 13 +
+ drivers/staging/i4l/Makefile | 5 +
+ drivers/staging/i4l/TODO | 3 +
+ drivers/{isdn => staging/i4l}/act2000/Kconfig | 0
+ drivers/{isdn => staging/i4l}/act2000/Makefile | 0
+ drivers/{isdn => staging/i4l}/act2000/act2000.h | 0
+ .../{isdn => staging/i4l}/act2000/act2000_isa.c | 0
+ .../{isdn => staging/i4l}/act2000/act2000_isa.h | 0
+ drivers/{isdn => staging/i4l}/act2000/capi.c | 0
+ drivers/{isdn => staging/i4l}/act2000/capi.h | 0
+ drivers/{isdn => staging/i4l}/act2000/module.c | 0
+ drivers/{isdn => staging/i4l}/icn/Kconfig | 0
+ drivers/{isdn => staging/i4l}/icn/Makefile | 0
+ drivers/{isdn => staging/i4l}/icn/icn.c | 2 +-
+ drivers/{isdn => staging/i4l}/icn/icn.h | 0
+ drivers/{isdn => staging/i4l}/pcbit/Kconfig | 0
+ drivers/{isdn => staging/i4l}/pcbit/Makefile | 0
+ drivers/{isdn => staging/i4l}/pcbit/callbacks.c | 0
+ drivers/{isdn => staging/i4l}/pcbit/callbacks.h | 0
+ drivers/{isdn => staging/i4l}/pcbit/capi.c | 0
+ drivers/{isdn => staging/i4l}/pcbit/capi.h | 0
+ drivers/{isdn => staging/i4l}/pcbit/drv.c | 0
+ drivers/{isdn => staging/i4l}/pcbit/edss1.c | 0
+ drivers/{isdn => staging/i4l}/pcbit/edss1.h | 0
+ drivers/{isdn => staging/i4l}/pcbit/layer2.c | 0
+ drivers/{isdn => staging/i4l}/pcbit/layer2.h | 0
+ drivers/{isdn => staging/i4l}/pcbit/module.c | 0
+ drivers/{isdn => staging/i4l}/pcbit/pcbit.h | 0
+ .../staging/iio/Documentation/sysfs-bus-iio-light | 28 -
+ drivers/staging/iio/Kconfig | 1 -
+ drivers/staging/iio/Makefile | 1 -
+ drivers/staging/iio/TODO | 8 -
+ drivers/staging/iio/accel/lis3l02dq_core.c | 4 +-
+ drivers/staging/iio/accel/sca3000_core.c | 3 +-
+ drivers/staging/iio/accel/sca3000_ring.c | 3 +-
+ drivers/staging/iio/adc/Kconfig | 18 +-
+ drivers/staging/iio/adc/Makefile | 1 -
+ drivers/staging/iio/adc/ad7192.c | 78 +-
+ drivers/staging/iio/adc/ad7280a.c | 4 +-
+ drivers/staging/iio/adc/ad7606.h | 10 +-
+ drivers/staging/iio/adc/ad7606_core.c | 53 +-
+ drivers/staging/iio/adc/ad7606_par.c | 32 +-
+ drivers/staging/iio/adc/ad7606_spi.c | 32 +-
+ drivers/staging/iio/adc/ad7816.c | 4 +-
+ drivers/staging/iio/adc/spear_adc.c | 17 +-
+ drivers/staging/iio/cdc/ad7150.c | 34 +-
+ drivers/staging/iio/cdc/ad7746.c | 4 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 8 +-
+ drivers/staging/iio/light/isl29018.c | 75 +-
+ drivers/staging/iio/light/isl29028.c | 31 +-
+ drivers/staging/iio/light/tsl2583.c | 92 +-
+ drivers/staging/iio/light/tsl2x7x_core.c | 6 +-
+ drivers/staging/iio/magnetometer/Kconfig | 40 -
+ drivers/staging/iio/magnetometer/Makefile | 7 -
+ drivers/staging/iio/resolver/ad2s1200.c | 12 +-
+ drivers/staging/iio/resolver/ad2s1210.c | 39 +-
+ drivers/staging/iio/trigger/Kconfig | 10 -
+ drivers/staging/iio/trigger/Makefile | 1 -
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 216 -
+ .../staging/lustre/include/linux/libcfs/libcfs.h | 8 +-
+ .../lustre/include/linux/libcfs/libcfs_cpu.h | 5 -
+ .../lustre/include/linux/libcfs/libcfs_debug.h | 2 +-
+ .../lustre/include/linux/libcfs/libcfs_ioctl.h | 60 +-
+ .../lustre/include/linux/libcfs/libcfs_private.h | 5 -
+ .../lustre/include/linux/libcfs/libcfs_string.h | 2 -
+ .../lustre/include/linux/libcfs/linux/libcfs.h | 3 -
+ .../lustre/include/linux/libcfs/linux/linux-cpu.h | 5 -
+ drivers/staging/lustre/include/linux/lnet/api.h | 23 +-
+ .../staging/lustre/include/linux/lnet/lib-dlc.h | 122 +
+ .../staging/lustre/include/linux/lnet/lib-lnet.h | 102 +-
+ .../staging/lustre/include/linux/lnet/lib-types.h | 98 +-
+ .../staging/lustre/include/linux/lnet/lnetctl.h | 4 -
+ drivers/staging/lustre/include/linux/lnet/lnetst.h | 104 +-
+ drivers/staging/lustre/include/linux/lnet/nidstr.h | 9 +-
+ .../staging/lustre/include/linux/lnet/socklnd.h | 9 +-
+ drivers/staging/lustre/include/linux/lnet/types.h | 49 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 705 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 159 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 1046 +--
+ .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 8 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 622 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 31 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 789 ++-
+ .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 195 +-
+ .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 11 +-
+ .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 168 +-
+ drivers/staging/lustre/lnet/lnet/acceptor.c | 113 +-
+ drivers/staging/lustre/lnet/lnet/api-ni.c | 1523 +++--
+ drivers/staging/lustre/lnet/lnet/config.c | 314 +-
+ drivers/staging/lustre/lnet/lnet/lib-eq.c | 82 +-
+ drivers/staging/lustre/lnet/lnet/lib-md.c | 103 +-
+ drivers/staging/lustre/lnet/lnet/lib-me.c | 21 +-
+ drivers/staging/lustre/lnet/lnet/lib-move.c | 643 +-
+ drivers/staging/lustre/lnet/lnet/lib-msg.c | 108 +-
+ drivers/staging/lustre/lnet/lnet/lib-ptl.c | 258 +-
+ drivers/staging/lustre/lnet/lnet/lib-socket.c | 147 +-
+ drivers/staging/lustre/lnet/lnet/lo.c | 14 +-
+ drivers/staging/lustre/lnet/lnet/module.c | 121 +-
+ drivers/staging/lustre/lnet/lnet/nidstrings.c | 119 +-
+ drivers/staging/lustre/lnet/lnet/peer.c | 235 +-
+ drivers/staging/lustre/lnet/lnet/router.c | 675 +-
+ drivers/staging/lustre/lnet/lnet/router_proc.c | 165 +-
+ drivers/staging/lustre/lnet/selftest/brw_test.c | 105 +-
+ drivers/staging/lustre/lnet/selftest/conctl.c | 270 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.c | 201 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.h | 5 +-
+ drivers/staging/lustre/lnet/selftest/console.c | 416 +-
+ drivers/staging/lustre/lnet/selftest/console.h | 67 +-
+ drivers/staging/lustre/lnet/selftest/framework.c | 305 +-
+ drivers/staging/lustre/lnet/selftest/module.c | 27 +-
+ drivers/staging/lustre/lnet/selftest/ping_test.c | 36 +-
+ drivers/staging/lustre/lnet/selftest/rpc.c | 350 +-
+ drivers/staging/lustre/lnet/selftest/rpc.h | 6 +-
+ drivers/staging/lustre/lnet/selftest/selftest.h | 51 +-
+ drivers/staging/lustre/lnet/selftest/timer.c | 17 +-
+ drivers/staging/lustre/lnet/selftest/timer.h | 8 +-
+ drivers/staging/lustre/lustre/fid/fid_request.c | 32 +-
+ drivers/staging/lustre/lustre/fid/lproc_fid.c | 16 +-
+ drivers/staging/lustre/lustre/fld/fld_cache.c | 33 +-
+ drivers/staging/lustre/lustre/fld/fld_internal.h | 35 +-
+ drivers/staging/lustre/lustre/fld/fld_request.c | 69 +-
+ drivers/staging/lustre/lustre/fld/lproc_fld.c | 14 +-
+ drivers/staging/lustre/lustre/include/cl_object.h | 491 +-
+ drivers/staging/lustre/lustre/include/lclient.h | 7 +-
+ drivers/staging/lustre/lustre/include/linux/obd.h | 18 +-
+ .../staging/lustre/lustre/include/lprocfs_status.h | 57 +-
+ drivers/staging/lustre/lustre/include/lu_object.h | 22 +-
+ drivers/staging/lustre/lustre/include/lu_ref.h | 4 -
+ .../lustre/lustre/include/lustre/ll_fiemap.h | 63 +-
+ .../lustre/include/lustre/lustre_build_version.h | 2 -
+ .../lustre/lustre/include/lustre/lustre_idl.h | 791 +--
+ .../lustre/lustre/include/lustre/lustre_user.h | 98 +-
+ drivers/staging/lustre/lustre/include/lustre_cfg.h | 20 +-
+ .../staging/lustre/lustre/include/lustre_disk.h | 252 +-
+ drivers/staging/lustre/lustre/include/lustre_dlm.h | 133 +-
+ .../lustre/lustre/include/lustre_dlm_flags.h | 55 +-
+ .../staging/lustre/lustre/include/lustre_export.h | 91 +-
+ drivers/staging/lustre/lustre/include/lustre_fid.h | 20 +-
+ drivers/staging/lustre/lustre/include/lustre_fld.h | 33 +-
+ .../staging/lustre/lustre/include/lustre_handles.h | 3 +-
+ .../staging/lustre/lustre/include/lustre_import.h | 3 +-
+ .../lustre/lustre/include/lustre_kernelcomm.h | 55 +
+ drivers/staging/lustre/lustre/include/lustre_lib.h | 27 +-
+ .../staging/lustre/lustre/include/lustre_lite.h | 50 +-
+ drivers/staging/lustre/lustre/include/lustre_log.h | 15 +-
+ drivers/staging/lustre/lustre/include/lustre_mdc.h | 16 +-
+ drivers/staging/lustre/lustre/include/lustre_net.h | 76 +-
+ .../lustre/lustre/include/lustre_req_layout.h | 13 +-
+ drivers/staging/lustre/lustre/include/lustre_sec.h | 128 +-
+ drivers/staging/lustre/lustre/include/lustre_ver.h | 18 +-
+ drivers/staging/lustre/lustre/include/obd.h | 130 +-
+ drivers/staging/lustre/lustre/include/obd_cksum.h | 21 +-
+ drivers/staging/lustre/lustre/include/obd_class.h | 182 +-
+ .../staging/lustre/lustre/include/obd_support.h | 19 +-
+ .../include/uapi_kernelcomm.h} | 72 +-
+ drivers/staging/lustre/lustre/lclient/glimpse.c | 3 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 77 +-
+ .../staging/lustre/lustre/lclient/lcommon_misc.c | 6 +-
+ drivers/staging/lustre/lustre/ldlm/interval_tree.c | 8 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 25 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 64 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 15 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 95 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 177 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 91 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 17 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 224 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 73 +-
+ drivers/staging/lustre/lustre/libcfs/Makefile | 5 +-
+ drivers/staging/lustre/lustre/libcfs/debug.c | 33 +-
+ drivers/staging/lustre/lustre/libcfs/fail.c | 3 +-
+ drivers/staging/lustre/lustre/libcfs/hash.c | 153 +-
+ drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 19 +-
+ drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 12 +-
+ drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 14 +-
+ .../staging/lustre/lustre/libcfs/libcfs_string.c | 77 +-
+ .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 78 +-
+ .../lustre/lustre/libcfs/linux/linux-crypto.c | 25 +-
+ .../lustre/lustre/libcfs/linux/linux-curproc.c | 7 +-
+ .../lustre/lustre/libcfs/linux/linux-debug.c | 23 +-
+ .../staging/lustre/lustre/libcfs/linux/linux-mem.c | 2 +-
+ .../lustre/lustre/libcfs/linux/linux-module.c | 85 +-
+ .../lustre/lustre/libcfs/linux/linux-tracefile.c | 31 +-
+ drivers/staging/lustre/lustre/libcfs/module.c | 284 +-
+ drivers/staging/lustre/lustre/libcfs/prng.c | 13 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.c | 167 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.h | 87 +-
+ drivers/staging/lustre/lustre/libcfs/workitem.c | 47 +-
+ drivers/staging/lustre/lustre/llite/dcache.c | 41 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 152 +-
+ drivers/staging/lustre/lustre/llite/file.c | 451 +-
+ drivers/staging/lustre/lustre/llite/llite_close.c | 39 +-
+ .../staging/lustre/lustre/llite/llite_internal.h | 165 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 220 +-
+ drivers/staging/lustre/lustre/llite/llite_mmap.c | 40 +-
+ drivers/staging/lustre/lustre/llite/llite_nfs.c | 54 +-
+ drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 18 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 30 +-
+ drivers/staging/lustre/lustre/llite/lproc_llite.c | 33 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 106 +-
+ drivers/staging/lustre/lustre/llite/remote_perm.c | 4 +-
+ drivers/staging/lustre/lustre/llite/rw.c | 112 +-
+ drivers/staging/lustre/lustre/llite/rw26.c | 81 +-
+ drivers/staging/lustre/lustre/llite/statahead.c | 112 +-
+ drivers/staging/lustre/lustre/llite/super25.c | 33 +-
+ drivers/staging/lustre/lustre/llite/symlink.c | 8 +-
+ drivers/staging/lustre/lustre/llite/vvp_dev.c | 20 +-
+ drivers/staging/lustre/lustre/llite/vvp_internal.h | 13 +-
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 70 +-
+ drivers/staging/lustre/lustre/llite/vvp_object.c | 8 +-
+ drivers/staging/lustre/lustre/llite/vvp_page.c | 43 +-
+ drivers/staging/lustre/lustre/llite/xattr.c | 53 +-
+ drivers/staging/lustre/lustre/llite/xattr_cache.c | 45 +-
+ drivers/staging/lustre/lustre/lmv/lmv_fld.c | 3 +-
+ drivers/staging/lustre/lustre/lmv/lmv_intent.c | 22 +-
+ drivers/staging/lustre/lustre/lmv/lmv_internal.h | 10 +-
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c | 287 +-
+ drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 4 +-
+ .../staging/lustre/lustre/lov/lov_cl_internal.h | 93 +-
+ drivers/staging/lustre/lustre/lov/lov_dev.c | 48 +-
+ drivers/staging/lustre/lustre/lov/lov_ea.c | 11 +-
+ drivers/staging/lustre/lustre/lov/lov_internal.h | 15 +-
+ drivers/staging/lustre/lustre/lov/lov_io.c | 32 +-
+ drivers/staging/lustre/lustre/lov/lov_lock.c | 133 +-
+ drivers/staging/lustre/lustre/lov/lov_merge.c | 3 +-
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 201 +-
+ drivers/staging/lustre/lustre/lov/lov_object.c | 117 +-
+ drivers/staging/lustre/lustre/lov/lov_offset.c | 20 +-
+ drivers/staging/lustre/lustre/lov/lov_pack.c | 36 +-
+ drivers/staging/lustre/lustre/lov/lov_page.c | 9 +-
+ drivers/staging/lustre/lustre/lov/lov_pool.c | 45 +-
+ drivers/staging/lustre/lustre/lov/lov_request.c | 64 +-
+ drivers/staging/lustre/lustre/lov/lovsub_dev.c | 7 +-
+ drivers/staging/lustre/lustre/lov/lovsub_lock.c | 14 +-
+ drivers/staging/lustre/lustre/lov/lovsub_object.c | 6 +-
+ drivers/staging/lustre/lustre/lov/lovsub_page.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lproc_lov.c | 34 +-
+ drivers/staging/lustre/lustre/mdc/mdc_internal.h | 16 +-
+ drivers/staging/lustre/lustre/mdc/mdc_lib.c | 15 +-
+ drivers/staging/lustre/lustre/mdc/mdc_locks.c | 176 +-
+ drivers/staging/lustre/lustre/mdc/mdc_reint.c | 40 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 197 +-
+ drivers/staging/lustre/lustre/mgc/mgc_request.c | 150 +-
+ drivers/staging/lustre/lustre/obdclass/Makefile | 10 +-
+ drivers/staging/lustre/lustre/obdclass/acl.c | 10 +-
+ drivers/staging/lustre/lustre/obdclass/cl_io.c | 161 +-
+ drivers/staging/lustre/lustre/obdclass/cl_lock.c | 96 +-
+ drivers/staging/lustre/lustre/obdclass/cl_object.c | 56 +-
+ drivers/staging/lustre/lustre/obdclass/cl_page.c | 107 +-
+ drivers/staging/lustre/lustre/obdclass/class_obd.c | 51 +-
+ drivers/staging/lustre/lustre/obdclass/genops.c | 109 +-
+ .../kernel_user_comm.c => obdclass/kernelcomm.c} | 80 +-
+ .../lustre/lustre/obdclass/linux/linux-module.c | 30 +-
+ .../lustre/lustre/obdclass/linux/linux-sysctl.c | 8 +-
+ drivers/staging/lustre/lustre/obdclass/llog.c | 41 +-
+ drivers/staging/lustre/lustre/obdclass/llog_cat.c | 6 +-
+ drivers/staging/lustre/lustre/obdclass/llog_obd.c | 10 +-
+ drivers/staging/lustre/lustre/obdclass/llog_swab.c | 6 +-
+ .../lustre/lustre/obdclass/lprocfs_counters.c | 10 +-
+ .../lustre/lustre/obdclass/lprocfs_status.c | 217 +-
+ drivers/staging/lustre/lustre/obdclass/lu_object.c | 102 +-
+ .../lustre/lustre/obdclass/lustre_handles.c | 15 +-
+ .../staging/lustre/lustre/obdclass/lustre_peer.c | 9 +-
+ .../staging/lustre/lustre/obdclass/obd_config.c | 66 +-
+ drivers/staging/lustre/lustre/obdclass/obd_mount.c | 114 +-
+ drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +-
+ .../staging/lustre/lustre/obdecho/echo_client.c | 463 +-
+ .../staging/lustre/lustre/obdecho/echo_internal.h | 5 -
+ drivers/staging/lustre/lustre/osc/lproc_osc.c | 53 +-
+ drivers/staging/lustre/lustre/osc/osc_cache.c | 311 +-
+ .../staging/lustre/lustre/osc/osc_cl_internal.h | 41 +-
+ drivers/staging/lustre/lustre/osc/osc_dev.c | 10 +-
+ drivers/staging/lustre/lustre/osc/osc_internal.h | 8 +-
+ drivers/staging/lustre/lustre/osc/osc_io.c | 32 +-
+ drivers/staging/lustre/lustre/osc/osc_lock.c | 138 +-
+ drivers/staging/lustre/lustre/osc/osc_object.c | 6 +-
+ drivers/staging/lustre/lustre/osc/osc_page.c | 204 +-
+ drivers/staging/lustre/lustre/osc/osc_quota.c | 39 +-
+ drivers/staging/lustre/lustre/osc/osc_request.c | 336 +-
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 120 +-
+ drivers/staging/lustre/lustre/ptlrpc/connection.c | 5 +-
+ drivers/staging/lustre/lustre/ptlrpc/events.c | 68 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c | 174 +-
+ drivers/staging/lustre/lustre/ptlrpc/layout.c | 143 +-
+ drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 28 +-
+ drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 2 +-
+ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 56 +-
+ drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 76 +-
+ drivers/staging/lustre/lustre/ptlrpc/nrs.c | 133 +-
+ drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 12 +-
+ .../staging/lustre/lustre/ptlrpc/pack_generic.c | 93 +-
+ drivers/staging/lustre/lustre/ptlrpc/pinger.c | 31 +-
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 -
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 35 +-
+ drivers/staging/lustre/lustre/ptlrpc/recover.c | 32 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec.c | 87 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 15 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 33 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 10 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 7 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 22 +-
+ drivers/staging/lustre/lustre/ptlrpc/service.c | 309 +-
+ drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 272 -
+ .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 4 +-
+ drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 11 +-
+ .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 12 +-
+ .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 7 +-
+ drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 5 +-
+ drivers/staging/media/davinci_vpfe/dm365_isif.c | 24 +-
+ drivers/staging/media/davinci_vpfe/dm365_resizer.c | 20 +-
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 6 +-
+ drivers/staging/media/davinci_vpfe/vpfe_video.c | 100 +-
+ drivers/staging/media/mn88472/mn88472.c | 6 +-
+ drivers/staging/most/aim-cdev/cdev.c | 374 +-
+ drivers/staging/most/aim-network/networking.c | 11 +-
+ drivers/staging/most/hdm-dim2/dim2_hal.c | 4 +-
+ drivers/staging/most/hdm-dim2/dim2_hal.h | 7 +-
+ drivers/staging/most/hdm-dim2/dim2_hdm.c | 68 +-
+ drivers/staging/most/hdm-dim2/dim2_hdm.h | 2 +-
+ drivers/staging/most/hdm-dim2/dim2_sysfs.c | 4 +-
+ drivers/staging/most/hdm-usb/hdm_usb.c | 20 +-
+ drivers/staging/most/mostcore/core.c | 194 +-
+ drivers/staging/most/mostcore/mostcore.h | 3 +-
+ drivers/staging/mt29f_spinand/mt29f_spinand.c | 79 +-
+ drivers/staging/netlogic/platform_net.c | 14 +-
+ drivers/staging/netlogic/xlr_net.c | 178 +-
+ drivers/staging/netlogic/xlr_net.h | 978 +--
+ drivers/staging/nvec/TODO | 2 -
+ drivers/staging/nvec/nvec.c | 95 +-
+ drivers/staging/nvec/nvec.h | 5 +-
+ drivers/staging/nvec/nvec_paz00.c | 12 +-
+ drivers/staging/nvec/nvec_power.c | 14 +-
+ drivers/staging/octeon-usb/TODO | 7 +-
+ drivers/staging/octeon-usb/octeon-hcd.c | 1094 ++-
+ drivers/staging/octeon-usb/octeon-hcd.h | 536 +-
+ drivers/staging/octeon/ethernet-mdio.c | 26 +-
+ drivers/staging/octeon/ethernet-rgmii.c | 291 +-
+ drivers/staging/octeon/ethernet-rx.c | 23 +-
+ drivers/staging/octeon/ethernet-tx.c | 13 +-
+ drivers/staging/octeon/ethernet.c | 18 +-
+ drivers/staging/octeon/octeon-ethernet.h | 4 +-
+ drivers/staging/olpc_dcon/Kconfig | 35 -
+ drivers/staging/olpc_dcon/Makefile | 6 -
+ drivers/staging/olpc_dcon/TODO | 9 -
+ drivers/staging/olpc_dcon/olpc_dcon.c | 813 ---
+ drivers/staging/olpc_dcon/olpc_dcon.h | 111 -
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 205 -
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 161 -
+ drivers/staging/panel/Kconfig | 278 -
+ drivers/staging/panel/Makefile | 1 -
+ drivers/staging/panel/TODO | 8 -
+ drivers/staging/rdma/hfi1/chip.c | 1 -
+ drivers/staging/rdma/hfi1/chip_registers.h | 11 +
+ drivers/staging/rdma/hfi1/diag.c | 2 +-
+ drivers/staging/rdma/hfi1/driver.c | 2 +-
+ drivers/staging/rdma/hfi1/efivar.c | 6 +-
+ drivers/staging/rdma/hfi1/hfi.h | 8 +-
+ drivers/staging/rdma/hfi1/mad.c | 33 +-
+ drivers/staging/rdma/hfi1/mr.c | 6 +-
+ drivers/staging/rdma/hfi1/pcie.c | 84 +-
+ drivers/staging/rdma/hfi1/ud.c | 2 +-
+ drivers/staging/rdma/hfi1/user_sdma.c | 8 +-
+ drivers/staging/rtl8188eu/Makefile | 2 +-
+ drivers/staging/rtl8188eu/TODO | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 12 +-
+ drivers/staging/rtl8188eu/core/rtw_debug.c | 14 +-
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_iol.c | 13 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 25 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 18 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 66 +-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 28 +-
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 23 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 5 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 91 +-
+ drivers/staging/rtl8188eu/hal/bb_cfg.c | 26 -
+ drivers/staging/rtl8188eu/hal/fw.c | 50 +-
+ drivers/staging/rtl8188eu/hal/phy.c | 26 -
+ drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 4 +-
+ drivers/staging/rtl8188eu/include/drv_types.h | 2 +-
+ drivers/staging/rtl8188eu/include/odm_HWConfig.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 2 -
+ drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +-
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 3 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 8 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 3 +-
+ drivers/staging/rtl8192e/dot11d.h | 3 -
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 28 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +-
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 6 +-
+ drivers/staging/rtl8192e/rtllib.h | 2 +-
+ drivers/staging/rtl8192e/rtllib_module.c | 5 -
+ drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 8 +-
+ drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 6 -
+ .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 3 -
+ .../staging/rtl8192u/ieee80211/ieee80211_module.c | 1 -
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 16 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 67 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 2 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 14 +-
+ drivers/staging/rtl8192u/r8190_rtl8256.c | 24 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 43 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 65 +-
+ drivers/staging/rtl8192u/r8192U_wx.c | 38 +-
+ drivers/staging/rtl8192u/r819xU_phy.c | 3 +-
+ drivers/staging/rtl8712/drv_types.h | 1 +
+ drivers/staging/rtl8712/ieee80211.h | 112 +-
+ drivers/staging/rtl8712/os_intfs.c | 3 +-
+ drivers/staging/rtl8712/rtl8712_cmd.c | 2 +-
+ drivers/staging/rtl8712/rtl8712_efuse.c | 8 +-
+ drivers/staging/rtl8712/rtl8712_io.c | 77 +-
+ drivers/staging/rtl8712/rtl871x_cmd.c | 13 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 10 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 45 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 15 +-
+ drivers/staging/rtl8712/rtl871x_recv.c | 16 +-
+ drivers/staging/rtl8712/rtl871x_sta_mgt.c | 25 +-
+ drivers/staging/rtl8712/rtl871x_xmit.c | 37 +-
+ drivers/staging/rtl8712/usb_intf.c | 12 +
+ drivers/staging/rtl8712/usb_ops_linux.c | 7 +-
+ drivers/staging/rtl8712/xmit_linux.c | 4 +-
+ drivers/staging/rtl8723au/TODO | 2 +-
+ drivers/staging/rtl8723au/core/rtw_ap.c | 92 +-
+ drivers/staging/rtl8723au/core/rtw_cmd.c | 3 +-
+ drivers/staging/rtl8723au/core/rtw_mlme.c | 38 +-
+ drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 36 +-
+ drivers/staging/rtl8723au/core/rtw_recv.c | 74 +-
+ drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 36 +-
+ drivers/staging/rtl8723au/core/rtw_xmit.c | 90 +-
+ drivers/staging/rtl8723au/hal/HalHWImg8723A_BB.c | 6 +-
+ drivers/staging/rtl8723au/hal/HalHWImg8723A_MAC.c | 2 +-
+ drivers/staging/rtl8723au/hal/HalHWImg8723A_RF.c | 2 +-
+ drivers/staging/rtl8723au/hal/hal_com.c | 2 +-
+ drivers/staging/rtl8723au/hal/odm.c | 2 +-
+ .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 28 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 6 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 8 +-
+ drivers/staging/rtl8723au/hal/usb_halinit.c | 6 +-
+ drivers/staging/rtl8723au/include/osdep_service.h | 6 +-
+ drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 2 +-
+ drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 22 +-
+ drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 9 +-
+ drivers/staging/rts5208/rtsx.c | 2 -
+ drivers/staging/rts5208/rtsx_transport.c | 157 +-
+ drivers/staging/rts5208/sd.c | 20 +-
+ drivers/staging/rts5208/spi.c | 2 -
+ drivers/staging/slicoss/slic.h | 2 +
+ drivers/staging/slicoss/slicoss.c | 47 +-
+ drivers/staging/sm750fb/ddk750_chip.c | 132 +-
+ drivers/staging/sm750fb/ddk750_display.c | 200 +-
+ drivers/staging/sm750fb/ddk750_help.h | 1 -
+ drivers/staging/sm750fb/ddk750_hwi2c.c | 34 +-
+ drivers/staging/sm750fb/ddk750_mode.c | 161 +-
+ drivers/staging/sm750fb/ddk750_power.c | 54 +-
+ drivers/staging/sm750fb/ddk750_power.h | 11 +-
+ drivers/staging/sm750fb/ddk750_reg.h | 3002 +++------
+ drivers/staging/sm750fb/ddk750_sii164.c | 4 +-
+ drivers/staging/sm750fb/ddk750_sii164.h | 5 +-
+ drivers/staging/sm750fb/sm750.c | 187 +-
+ drivers/staging/sm750fb/sm750.h | 4 +-
+ drivers/staging/sm750fb/sm750_accel.c | 148 +-
+ drivers/staging/sm750fb/sm750_accel.h | 278 +-
+ drivers/staging/sm750fb/sm750_cursor.c | 60 +-
+ drivers/staging/sm750fb/sm750_help.h | 56 -
+ drivers/staging/sm750fb/sm750_hw.c | 211 +-
+ drivers/staging/speakup/buffers.c | 4 +-
+ drivers/staging/speakup/devsynth.c | 4 +-
+ drivers/staging/speakup/fakekey.c | 6 +-
+ drivers/staging/speakup/i18n.c | 5 +-
+ drivers/staging/speakup/keyhelp.c | 22 +-
+ drivers/staging/speakup/kobjects.c | 54 +-
+ drivers/staging/speakup/main.c | 33 +-
+ drivers/staging/speakup/serialio.c | 10 +-
+ drivers/staging/speakup/speakup_acntpc.c | 5 -
+ drivers/staging/speakup/speakup_acntsa.c | 4 -
+ drivers/staging/speakup/speakup_apollo.c | 4 -
+ drivers/staging/speakup/speakup_audptr.c | 4 -
+ drivers/staging/speakup/speakup_bns.c | 4 -
+ drivers/staging/speakup/speakup_decext.c | 28 +-
+ drivers/staging/speakup/speakup_decpc.c | 4 -
+ drivers/staging/speakup/speakup_dectlk.c | 4 -
+ drivers/staging/speakup/speakup_dtlk.c | 4 -
+ drivers/staging/speakup/speakup_dummy.c | 4 -
+ drivers/staging/speakup/speakup_keypc.c | 4 -
+ drivers/staging/speakup/speakup_ltlk.c | 4 -
+ drivers/staging/speakup/speakup_soft.c | 3 -
+ drivers/staging/speakup/speakup_spkout.c | 4 -
+ drivers/staging/speakup/speakup_txprt.c | 4 -
+ drivers/staging/speakup/spk_priv.h | 4 -
+ drivers/staging/speakup/spk_priv_keyinfo.h | 4 -
+ drivers/staging/speakup/spkguide.txt | 1 -
+ drivers/staging/speakup/synth.c | 2 +-
+ drivers/staging/speakup/varhandlers.c | 50 +-
+ drivers/staging/staging.c | 19 -
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 9 +-
+ drivers/staging/unisys/MAINTAINERS | 2 +-
+ drivers/staging/unisys/include/guestlinuxdebug.h | 13 +-
+ drivers/staging/unisys/include/iochannel.h | 14 +-
+ drivers/staging/unisys/visorbus/controlvmchannel.h | 237 +-
+ drivers/staging/unisys/visorbus/vbusdeviceinfo.h | 7 +-
+ drivers/staging/unisys/visorbus/visorbus_main.c | 97 +-
+ drivers/staging/unisys/visorbus/visorchannel.c | 4 +-
+ drivers/staging/unisys/visorbus/visorchipset.c | 163 +-
+ drivers/staging/unisys/visorhba/visorhba_main.c | 8 +-
+ drivers/staging/unisys/visorinput/Kconfig | 2 +-
+ .../staging/unisys/visorinput/ultrainputreport.h | 45 +-
+ drivers/staging/unisys/visornic/visornic_main.c | 63 +-
+ drivers/staging/vt6655/card.c | 18 +-
+ drivers/staging/vt6655/channel.c | 67 +-
+ drivers/staging/vt6655/channel.h | 2 +-
+ drivers/staging/vt6655/device_main.c | 29 +-
+ drivers/staging/vt6655/key.c | 8 +-
+ drivers/staging/vt6655/mac.c | 109 +-
+ drivers/staging/vt6655/mac.h | 58 +-
+ drivers/staging/vt6655/power.c | 66 +-
+ drivers/staging/vt6655/power.h | 8 +-
+ drivers/staging/vt6655/rf.c | 178 +-
+ drivers/staging/vt6656/device.h | 4 +-
+ drivers/staging/vt6656/main_usb.c | 30 +-
+ drivers/staging/vt6656/power.c | 2 +-
+ drivers/staging/vt6656/usbpipe.c | 21 +-
+ drivers/staging/wilc1000/Makefile | 6 +-
+ drivers/staging/wilc1000/coreconfigurator.c | 424 +-
+ drivers/staging/wilc1000/coreconfigurator.h | 97 +-
+ drivers/staging/wilc1000/host_interface.c | 2071 +++---
+ drivers/staging/wilc1000/host_interface.h | 133 +-
+ drivers/staging/wilc1000/linux_mon.c | 134 +-
+ drivers/staging/wilc1000/linux_wlan.c | 514 +-
+ drivers/staging/wilc1000/linux_wlan_common.h | 166 -
+ drivers/staging/wilc1000/wilc_debugfs.c | 53 +-
+ drivers/staging/wilc1000/wilc_msgqueue.c | 143 +-
+ drivers/staging/wilc1000/wilc_msgqueue.h | 110 +-
+ drivers/staging/wilc1000/wilc_sdio.c | 152 +-
+ drivers/staging/wilc1000/wilc_spi.c | 51 +-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 1149 +---
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 1 -
+ drivers/staging/wilc1000/wilc_wfi_netdevice.h | 17 +-
+ drivers/staging/wilc1000/wilc_wlan.c | 581 +-
+ drivers/staging/wilc1000/wilc_wlan.h | 25 +-
+ drivers/staging/wilc1000/wilc_wlan_cfg.c | 91 +-
+ drivers/staging/wilc1000/wilc_wlan_cfg.h | 18 +-
+ drivers/staging/wilc1000/wilc_wlan_if.h | 31 +-
+ drivers/staging/wlan-ng/cfg80211.c | 41 +-
+ drivers/staging/wlan-ng/hfa384x.h | 5 -
+ drivers/staging/wlan-ng/hfa384x_usb.c | 149 +-
+ drivers/staging/wlan-ng/p80211conv.c | 132 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 8 +-
+ drivers/staging/wlan-ng/p80211wep.c | 10 +-
+ drivers/staging/wlan-ng/prism2mgmt.h | 1 -
+ drivers/staging/wlan-ng/prism2mib.c | 24 +-
+ drivers/staging/wlan-ng/prism2usb.c | 18 +-
+ drivers/staging/xgifb/XGI_main_26.c | 22 +-
+ drivers/staging/xgifb/vb_init.c | 3 +-
+ drivers/staging/xgifb/vb_setmode.c | 42 +-
+ drivers/staging/xgifb/vgatypes.h | 7 +-
+ drivers/vme/bridges/vme_ca91cx42.c | 11 +-
+ drivers/w1/masters/omap_hdq.c | 1 -
+ drivers/w1/w1.c | 1 -
+ drivers/watchdog/Kconfig | 15 +
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/mei_wdt.c | 724 ++
+ fs/compat_ioctl.c | 22 -
+ include/linux/amba/bus.h | 9 +
+ include/linux/coresight-pmu.h | 39 +
+ include/linux/coresight.h | 34 +-
+ include/linux/eeprom_93xx46.h | 9 +
+ include/linux/exportfs.h | 6 +
+ include/linux/fence.h | 2 +
+ include/linux/hyperv.h | 95 +
+ include/linux/iio/common/st_sensors.h | 4 +
+ include/linux/iio/iio.h | 8 +-
+ include/linux/irqdomain.h | 1 +
+ include/linux/msi.h | 9 +
+ include/linux/platform_data/ad5761.h | 44 +
+ include/linux/stm.h | 10 +
+ include/linux/vmw_vmci_defs.h | 43 +-
+ include/uapi/linux/iio/types.h | 1 +
+ lib/devres.c | 2 +-
+ scripts/ver_linux | 2 +-
+ tools/hv/Makefile | 2 +
+ 940 files changed, 41020 insertions(+), 42385 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-health-afe440x
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc5843
+ create mode 100644 Documentation/devicetree/bindings/goldfish/pipe.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-adc0832.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/vf610-dac.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/health/afe4403.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/health/afe4404.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/light/opt3001.txt
+ create mode 100644 Documentation/devicetree/bindings/misc/eeprom-93xx46.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/lpc1857-eeprom.txt
+ create mode 100644 Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
+ rename {drivers/staging/panel => Documentation/misc-devices}/lcd-panel-cgram.txt (100%)
+ create mode 100644 drivers/hwtracing/coresight/coresight-etm-perf.c
+ create mode 100644 drivers/hwtracing/coresight/coresight-etm-perf.h
+ create mode 100644 drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
+ create mode 100644 drivers/hwtracing/stm/heartbeat.c
+ create mode 100644 drivers/iio/adc/at91-sama5d2_adc.c
+ rename drivers/{staging => }/iio/adc/mxs-lradc.c (99%)
+ create mode 100644 drivers/iio/adc/ti-adc0832.c
+ create mode 100644 drivers/iio/adc/ti-ads1015.c
+ create mode 100644 drivers/iio/chemical/atlas-ph-sensor.c
+ create mode 100644 drivers/iio/common/st_sensors/st_sensors_core.h
+ create mode 100644 drivers/iio/dac/ad5761.c
+ create mode 100644 drivers/iio/dac/stx104.c
+ create mode 100644 drivers/iio/dac/vf610_dac.c
+ create mode 100644 drivers/iio/health/afe4403.c
+ create mode 100644 drivers/iio/health/afe4404.c
+ create mode 100644 drivers/iio/health/afe440x.h
+ create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c
+ create mode 100644 drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c
+ rename drivers/{staging => }/iio/magnetometer/hmc5843.h (99%)
+ rename drivers/{staging => }/iio/magnetometer/hmc5843_core.c (86%)
+ rename drivers/{staging => }/iio/magnetometer/hmc5843_i2c.c (99%)
+ rename drivers/{staging => }/iio/magnetometer/hmc5843_spi.c (99%)
+ create mode 100644 drivers/iio/potentiometer/tpl0102.c
+ create mode 100644 drivers/iio/pressure/mpl115.h
+ create mode 100644 drivers/iio/pressure/mpl115_i2c.c
+ create mode 100644 drivers/iio/pressure/mpl115_spi.c
+ delete mode 100644 drivers/misc/mei/wd.c
+ create mode 100644 drivers/misc/mic/bus/vop_bus.c
+ create mode 100644 drivers/misc/mic/bus/vop_bus.h
+ delete mode 100644 drivers/misc/mic/card/mic_virtio.c
+ delete mode 100644 drivers/misc/mic/card/mic_virtio.h
+ delete mode 100644 drivers/misc/mic/host/mic_fops.c
+ delete mode 100644 drivers/misc/mic/host/mic_fops.h
+ delete mode 100644 drivers/misc/mic/host/mic_virtio.c
+ create mode 100644 drivers/misc/mic/vop/Makefile
+ create mode 100644 drivers/misc/mic/vop/vop_debugfs.c
+ create mode 100644 drivers/misc/mic/vop/vop_main.c
+ rename drivers/misc/mic/{host/mic_virtio.h => vop/vop_main.h} (58%)
+ create mode 100644 drivers/misc/mic/vop/vop_vringh.c
+ rename drivers/{staging/panel => misc}/panel.c (96%)
+ create mode 100644 drivers/nvmem/lpc18xx_eeprom.c
+ create mode 100644 drivers/nvmem/mtk-efuse.c
+ create mode 100644 drivers/staging/comedi/drivers/ni_mio_c_common.c
+ delete mode 100644 drivers/staging/dgap/Kconfig
+ delete mode 100644 drivers/staging/dgap/Makefile
+ delete mode 100644 drivers/staging/dgap/dgap.c
+ delete mode 100644 drivers/staging/dgap/dgap.h
+ create mode 100644 drivers/staging/fbtft/fb_ssd1305.c
+ create mode 100644 drivers/staging/fbtft/fb_ssd1325.c
+ create mode 100644 drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c
+ create mode 100644 drivers/staging/fsl-mc/bus/mc-msi.c
+ rename {Documentation/isdn => drivers/staging/i4l/Documentation}/README.act2000 (100%)
+ rename {Documentation/isdn => drivers/staging/i4l/Documentation}/README.icn (100%)
+ rename {Documentation/isdn => drivers/staging/i4l/Documentation}/README.pcbit (100%)
+ rename {Documentation/isdn => drivers/staging/i4l/Documentation}/README.sc (100%)
+ create mode 100644 drivers/staging/i4l/Kconfig
+ create mode 100644 drivers/staging/i4l/Makefile
+ create mode 100644 drivers/staging/i4l/TODO
+ rename drivers/{isdn => staging/i4l}/act2000/Kconfig (100%)
+ rename drivers/{isdn => staging/i4l}/act2000/Makefile (100%)
+ rename drivers/{isdn => staging/i4l}/act2000/act2000.h (100%)
+ rename drivers/{isdn => staging/i4l}/act2000/act2000_isa.c (100%)
+ rename drivers/{isdn => staging/i4l}/act2000/act2000_isa.h (100%)
+ rename drivers/{isdn => staging/i4l}/act2000/capi.c (100%)
+ rename drivers/{isdn => staging/i4l}/act2000/capi.h (100%)
+ rename drivers/{isdn => staging/i4l}/act2000/module.c (100%)
+ rename drivers/{isdn => staging/i4l}/icn/Kconfig (100%)
+ rename drivers/{isdn => staging/i4l}/icn/Makefile (100%)
+ rename drivers/{isdn => staging/i4l}/icn/icn.c (99%)
+ rename drivers/{isdn => staging/i4l}/icn/icn.h (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/Kconfig (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/Makefile (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/callbacks.c (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/callbacks.h (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/capi.c (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/capi.h (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/drv.c (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/edss1.c (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/edss1.h (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/layer2.c (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/layer2.h (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/module.c (100%)
+ rename drivers/{isdn => staging/i4l}/pcbit/pcbit.h (100%)
+ delete mode 100644 drivers/staging/iio/magnetometer/Kconfig
+ delete mode 100644 drivers/staging/iio/magnetometer/Makefile
+ delete mode 100644 drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
+ create mode 100644 drivers/staging/lustre/include/linux/lnet/lib-dlc.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_build_version.h
+ create mode 100644 drivers/staging/lustre/lustre/include/lustre_kernelcomm.h
+ rename drivers/staging/lustre/{include/linux/libcfs/libcfs_kernelcomm.h => lustre/include/uapi_kernelcomm.h} (51%)
+ rename drivers/staging/lustre/lustre/{libcfs/kernel_user_comm.c => obdclass/kernelcomm.c} (81%)
+ delete mode 100644 drivers/staging/olpc_dcon/Kconfig
+ delete mode 100644 drivers/staging/olpc_dcon/Makefile
+ delete mode 100644 drivers/staging/olpc_dcon/TODO
+ delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.c
+ delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.h
+ delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+ delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
+ delete mode 100644 drivers/staging/panel/Kconfig
+ delete mode 100644 drivers/staging/panel/Makefile
+ delete mode 100644 drivers/staging/panel/TODO
+ delete mode 100644 drivers/staging/sm750fb/sm750_help.h
+ delete mode 100644 drivers/staging/staging.c
+ delete mode 100644 drivers/staging/wilc1000/linux_wlan_common.h
+ create mode 100644 drivers/watchdog/mei_wdt.c
+ create mode 100644 include/linux/coresight-pmu.h
+ create mode 100644 include/linux/platform_data/ad5761.h
+$ git am -3 ../patches/0001-staging-mark-CONFIG_FSL_MC_BUS-as-broken-for-now.patch
+Applying: staging: mark CONFIG_FSL_MC_BUS as broken for now
+Using index info to reconstruct a base tree...
+M drivers/staging/fsl-mc/bus/Kconfig
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/staging/fsl-mc/bus/Kconfig
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/staging/fsl-mc/bus/Kconfig
+$ git add -A .
+$ git commit -v -a --amend
+[master 0229e62aed8b] Merge remote-tracking branch 'staging/staging-next'
+ Date: Tue Mar 8 14:30:32 2016 +1100
+Merging char-misc/char-misc-next (16617535684f goldfish: Fix build error of missing ioremap on UM)
+$ git merge char-misc/char-misc-next
+Auto-merging drivers/misc/lkdtm.c
+Auto-merging drivers/hv/hyperv_vmbus.h
+Auto-merging arch/arm/mach-davinci/board-mityomapl138.c
+Auto-merging arch/arm/boot/dts/am57xx-beagle-x15.dts
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 5 +
+ arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +-
+ arch/arm/mach-davinci/board-mityomapl138.c | 5 +-
+ arch/arm/mach-davinci/common.c | 4 +-
+ drivers/char/Kconfig | 3 +-
+ drivers/char/mem.c | 2 +-
+ drivers/char/xillybus/xillybus_core.c | 4 +-
+ drivers/extcon/extcon-arizona.c | 4 +-
+ drivers/extcon/extcon-gpio.c | 2 +-
+ drivers/extcon/extcon-max14577.c | 3 +
+ drivers/extcon/extcon-max77693.c | 12 +-
+ drivers/extcon/extcon-max77843.c | 5 +-
+ drivers/extcon/extcon-max8997.c | 3 +
+ drivers/extcon/extcon-palmas.c | 54 ++++++++-
+ drivers/extcon/extcon-rt8973a.c | 8 +-
+ drivers/extcon/extcon-sm5502.c | 8 +-
+ drivers/hv/channel_mgmt.c | 16 +--
+ drivers/hv/connection.c | 12 +-
+ drivers/hv/hv.c | 10 ++
+ drivers/hv/hv_fcopy.c | 2 +-
+ drivers/hv/hv_kvp.c | 2 +-
+ drivers/hv/hv_snapshot.c | 2 +-
+ drivers/hv/hv_util.c | 1 +
+ drivers/hv/hv_utils_transport.c | 3 +
+ drivers/hv/hyperv_vmbus.h | 30 ++++-
+ drivers/hv/vmbus_drv.c | 92 ++++----------
+ drivers/hwtracing/coresight/coresight-etm-perf.c | 4 +-
+ drivers/misc/ad525x_dpot.c | 4 +-
+ drivers/misc/eeprom/Kconfig | 6 +
+ drivers/misc/eeprom/at24.c | 130 +++++++++++---------
+ drivers/misc/eeprom/at25.c | 148 +++++++++++------------
+ drivers/misc/eeprom/eeprom_93xx46.c | 120 +++++++++++++-----
+ drivers/misc/lkdtm.c | 122 ++++++++++++++++++-
+ drivers/misc/mei/hw-me-regs.h | 4 +
+ drivers/misc/mei/pci-me.c | 3 +
+ drivers/misc/pch_phub.c | 4 +-
+ drivers/nvmem/Kconfig | 4 +
+ drivers/nvmem/core.c | 141 +++++++++++++++++++--
+ drivers/nvmem/imx-ocotp.c | 2 +-
+ drivers/nvmem/mtk-efuse.c | 23 +++-
+ drivers/platform/goldfish/Kconfig | 1 +
+ include/linux/davinci_emac.h | 4 +-
+ include/linux/hyperv.h | 1 +
+ include/linux/memory.h | 11 --
+ include/linux/mfd/palmas.h | 3 +
+ include/linux/nvmem-provider.h | 5 +-
+ include/linux/platform_data/at24.h | 10 +-
+ include/linux/spi/eeprom.h | 2 -
+ 48 files changed, 734 insertions(+), 313 deletions(-)
+Merging extcon/extcon-next (ae64e42cc2b3 extcon: palmas: Drop IRQF_EARLY_RESUME flag)
+$ git merge extcon/extcon-next
+Already up-to-date.
+Merging cgroup/for-next (4e1ba57ecabd Merge branch 'for-4.6' into for-next)
+$ git merge cgroup/for-next
+Auto-merging kernel/sched/core.c
+Auto-merging init/Kconfig
+Auto-merging fs/kernfs/dir.c
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/cgroup-v2.txt
+Merge made by the 'recursive' strategy.
+ Documentation/cgroup-v1/00-INDEX | 2 -
+ Documentation/cgroup-v2.txt | 153 +++++
+ Documentation/kernel-parameters.txt | 5 +
+ fs/kernfs/dir.c | 191 +++++-
+ fs/kernfs/mount.c | 69 ++
+ fs/proc/namespaces.c | 3 +
+ include/linux/cgroup-defs.h | 21 +-
+ include/linux/cgroup.h | 49 ++
+ include/linux/kernfs.h | 11 +-
+ include/linux/nsproxy.h | 2 +
+ include/linux/proc_ns.h | 4 +
+ include/uapi/linux/sched.h | 3 +-
+ init/Kconfig | 4 +-
+ kernel/Makefile | 3 +-
+ kernel/cgroup.c | 1270 +++++++++++++++++++++++------------
+ kernel/cpuset.c | 10 +-
+ kernel/fork.c | 2 +-
+ kernel/nsproxy.c | 19 +-
+ kernel/sched/core.c | 2 +-
+ kernel/sched/cpuacct.c | 2 +-
+ 20 files changed, 1314 insertions(+), 511 deletions(-)
+Merging scsi/for-next (8fa77b0134a9 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/st.c
+Auto-merging drivers/scsi/hosts.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/scsi/hisilicon-sas.txt | 21 +-
+ Documentation/scsi/st.txt | 15 +-
+ MAINTAINERS | 15 +-
+ drivers/message/fusion/mptbase.c | 42 +-
+ drivers/scsi/Kconfig | 1 +
+ drivers/scsi/NCR5380.c | 133 +-
+ drivers/scsi/aacraid/aachba.c | 27 +-
+ drivers/scsi/aacraid/aacraid.h | 14 +-
+ drivers/scsi/aacraid/commctrl.c | 13 +-
+ drivers/scsi/aacraid/comminit.c | 6 +-
+ drivers/scsi/aacraid/commsup.c | 69 +-
+ drivers/scsi/aacraid/dpcsup.c | 2 -
+ drivers/scsi/aacraid/linit.c | 199 +-
+ drivers/scsi/aacraid/src.c | 30 +-
+ drivers/scsi/aha1542.c | 3 +
+ drivers/scsi/aic7xxx/aic7xxx_osm.c | 1 +
+ drivers/scsi/arm/acornscsi.c | 3 +-
+ drivers/scsi/arm/fas216.c | 2 +
+ drivers/scsi/atari_NCR5380.c | 133 +-
+ drivers/scsi/be2iscsi/be.h | 20 +-
+ drivers/scsi/be2iscsi/be_cmds.c | 867 ++++----
+ drivers/scsi/be2iscsi/be_cmds.h | 148 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 62 +-
+ drivers/scsi/be2iscsi/be_main.c | 307 +--
+ drivers/scsi/be2iscsi/be_main.h | 25 +-
+ drivers/scsi/be2iscsi/be_mgmt.c | 573 ++---
+ drivers/scsi/be2iscsi/be_mgmt.h | 2 +
+ drivers/scsi/bfa/bfa_core.c | 19 +
+ drivers/scsi/bfa/bfa_cs.h | 41 +-
+ drivers/scsi/bfa/bfa_ioc.c | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 9 +
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 5 +-
+ drivers/scsi/device_handler/Kconfig | 8 +-
+ drivers/scsi/device_handler/scsi_dh_alua.c | 979 ++++++---
+ drivers/scsi/device_handler/scsi_dh_emc.c | 7 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 38 +-
+ drivers/scsi/dpt_i2o.c | 3 +
+ drivers/scsi/esas2r/esas2r_ioctl.c | 5 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c | 3 +-
+ drivers/scsi/fdomain.c | 2 +-
+ drivers/scsi/gdth.c | 7 +-
+ drivers/scsi/gdth_proc.c | 11 +-
+ drivers/scsi/hisi_sas/Makefile | 2 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 43 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 136 +-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 100 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2214 ++++++++++++++++++++
+ drivers/scsi/hosts.c | 22 +-
+ drivers/scsi/hpsa.c | 52 +-
+ drivers/scsi/hpsa.h | 3 +-
+ drivers/scsi/hpsa_cmd.h | 5 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 3 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 122 +-
+ drivers/scsi/ibmvscsi/viosrp.h | 26 +-
+ drivers/scsi/imm.c | 7 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 4 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +
+ drivers/scsi/lpfc/lpfc_scsi.c | 17 -
+ drivers/scsi/lpfc/lpfc_sli.c | 43 +
+ drivers/scsi/megaraid/megaraid_sas.h | 351 +++-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 1064 ++++++----
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 2 +
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 1287 +++++++++---
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 136 +-
+ drivers/scsi/mpt3sas/mpi/mpi2.h | 82 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 127 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_init.h | 22 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 117 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_raid.h | 5 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_sas.h | 10 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 5 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_type.h | 5 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 152 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 47 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 37 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 272 ++-
+ drivers/scsi/mpt3sas/mpt3sas_transport.c | 25 +-
+ drivers/scsi/mvumi.c | 4 +-
+ drivers/scsi/osd/osd_initiator.c | 3 +-
+ drivers/scsi/ppa.c | 46 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 22 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 201 ++
+ drivers/scsi/qla2xxx/qla_bsg.h | 34 +
+ drivers/scsi/qla2xxx/qla_dbg.c | 146 +-
+ drivers/scsi/qla2xxx/qla_def.h | 56 +-
+ drivers/scsi/qla2xxx/qla_fw.h | 14 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 2 +
+ drivers/scsi/qla2xxx/qla_init.c | 119 +-
+ drivers/scsi/qla2xxx/qla_inline.h | 4 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 4 -
+ drivers/scsi/qla2xxx/qla_mbx.c | 27 +-
+ drivers/scsi/qla2xxx/qla_os.c | 10 +
+ drivers/scsi/qla2xxx/qla_sup.c | 70 +-
+ drivers/scsi/qla2xxx/qla_version.h | 2 +-
+ drivers/scsi/qla4xxx/ql4_83xx.c | 6 +-
+ drivers/scsi/qlogicpti.c | 4 +-
+ drivers/scsi/scsi_devinfo.c | 2 +
+ drivers/scsi/scsi_lib.c | 1 +
+ drivers/scsi/scsi_scan.c | 23 +-
+ drivers/scsi/scsi_sysfs.c | 106 +-
+ drivers/scsi/scsi_transport_iscsi.c | 2 +
+ drivers/scsi/sim710.c | 3 +-
+ drivers/scsi/snic/snic_ctl.c | 2 +-
+ drivers/scsi/st.c | 122 +-
+ drivers/scsi/stex.c | 153 +-
+ drivers/scsi/ufs/ufs.h | 2 +-
+ drivers/scsi/ufs/ufshcd.c | 397 +++-
+ drivers/scsi/ufs/ufshcd.h | 6 +-
+ include/scsi/iscsi_if.h | 2 +
+ include/scsi/scsi_device.h | 3 +
+ include/scsi/scsi_devinfo.h | 1 +
+ include/scsi/scsi_dh.h | 2 +
+ include/scsi/scsi_proto.h | 12 +
+ 113 files changed, 9031 insertions(+), 3004 deletions(-)
+ create mode 100644 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+Merging target-updates/for-next (f630dbf5b534 target/iblock: Use -EAGAIN/-ENOMEM to propigate SAM BUSY/TASK_SET_FULL)
+$ git merge target-updates/for-next
+Auto-merging include/target/target_core_base.h
+Auto-merging drivers/xen/xen-scsiback.c
+Auto-merging drivers/usb/gadget/function/f_tcm.c
+Auto-merging drivers/target/target_core_internal.h
+Auto-merging drivers/target/target_core_fabric_configfs.c
+Auto-merging drivers/scsi/qla2xxx/qla_def.h
+Merge made by the 'recursive' strategy.
+ Documentation/target/tcmu-design.txt | 11 +-
+ drivers/infiniband/ulp/isert/ib_isert.c | 810 ++++++++++++---------------
+ drivers/infiniband/ulp/isert/ib_isert.h | 72 +--
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 76 +--
+ drivers/infiniband/ulp/srpt/ib_srpt.h | 2 -
+ drivers/scsi/qla2xxx/qla_def.h | 1 +
+ drivers/scsi/qla2xxx/qla_dfs.c | 55 ++
+ drivers/scsi/qla2xxx/qla_target.c | 57 +-
+ drivers/scsi/qla2xxx/qla_target.h | 2 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 79 +--
+ drivers/target/loopback/tcm_loop.c | 35 +-
+ drivers/target/sbp/sbp_target.c | 99 ++--
+ drivers/target/target_core_device.c | 41 +-
+ drivers/target/target_core_fabric_configfs.c | 32 +-
+ drivers/target/target_core_iblock.c | 72 ++-
+ drivers/target/target_core_iblock.h | 1 +
+ drivers/target/target_core_internal.h | 8 +-
+ drivers/target/target_core_spc.c | 3 +-
+ drivers/target/target_core_tpg.c | 21 +-
+ drivers/target/target_core_transport.c | 77 ++-
+ drivers/target/target_core_user.c | 267 +++++----
+ drivers/target/tcm_fc/tfc_cmd.c | 18 +-
+ drivers/target/tcm_fc/tfc_sess.c | 44 +-
+ drivers/usb/gadget/function/f_tcm.c | 181 +++---
+ drivers/vhost/scsi.c | 99 ++--
+ drivers/xen/xen-scsiback.c | 269 +++++----
+ include/target/target_core_base.h | 11 +-
+ include/target/target_core_fabric.h | 6 +
+ include/uapi/linux/target_core_user.h | 1 +
+ 29 files changed, 1250 insertions(+), 1200 deletions(-)
+Merging target-merge/for-next-merge (4bc76cc43f8a iscsi-target: update Kconfig and Makefile)
+$ git merge target-merge/for-next-merge
+Resolved 'drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h' using previous resolution.
+Auto-merging include/target/iscsi/iscsi_target_core.h
+Auto-merging drivers/target/iscsi/iscsi_target_login.c
+Auto-merging drivers/target/iscsi/iscsi_target_configfs.c
+Auto-merging drivers/target/iscsi/iscsi_target.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
+CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/sge.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c9246383c5e6] Merge remote-tracking branch 'target-merge/for-next-merge'
+$ git diff -M --stat --summary HEAD^..
+ drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 99 -
+ drivers/infiniband/ulp/isert/ib_isert.c | 10 +
+ drivers/net/ethernet/chelsio/Kconfig | 11 +
+ drivers/net/ethernet/chelsio/cxgb4/Makefile | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 27 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 34 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 97 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.c | 464 +++++
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.h | 310 +++
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 11 +
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 -
+ drivers/net/ethernet/chelsio/cxgb4/l2t.h | 2 +
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 13 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 217 +++
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 8 +-
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.h | 17 -
+ drivers/target/iscsi/Kconfig | 2 +
+ drivers/target/iscsi/Makefile | 1 +
+ drivers/target/iscsi/cxgbit/Kconfig | 7 +
+ drivers/target/iscsi/cxgbit/Makefile | 6 +
+ drivers/target/iscsi/cxgbit/cxgbit.h | 363 ++++
+ drivers/target/iscsi/cxgbit/cxgbit_cm.c | 1893 ++++++++++++++++++
+ drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 374 ++++
+ drivers/target/iscsi/cxgbit/cxgbit_lro.h | 70 +
+ drivers/target/iscsi/cxgbit/cxgbit_main.c | 719 +++++++
+ drivers/target/iscsi/cxgbit/cxgbit_target.c | 2027 ++++++++++++++++++++
+ drivers/target/iscsi/iscsi_target.c | 184 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 79 +
+ drivers/target/iscsi/iscsi_target_datain_values.c | 3 +
+ drivers/target/iscsi/iscsi_target_erl0.c | 7 +-
+ drivers/target/iscsi/iscsi_target_erl1.c | 1 +
+ drivers/target/iscsi/iscsi_target_login.c | 13 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 1 +
+ drivers/target/iscsi/iscsi_target_parameters.c | 1 +
+ drivers/target/iscsi/iscsi_target_util.c | 7 +
+ include/target/iscsi/iscsi_target_core.h | 27 +
+ include/target/iscsi/iscsi_transport.h | 52 +
+ 37 files changed, 6928 insertions(+), 232 deletions(-)
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.c
+ create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ppm.h
+ create mode 100644 drivers/target/iscsi/cxgbit/Kconfig
+ create mode 100644 drivers/target/iscsi/cxgbit/Makefile
+ create mode 100644 drivers/target/iscsi/cxgbit/cxgbit.h
+ create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_cm.c
+ create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_ddp.c
+ create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_lro.h
+ create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_main.c
+ create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_target.c
+Merging pinctrl/for-next (cf48fde5f6c9 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/tegra/pinctrl-tegra.c
+Auto-merging drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
+Merge made by the 'recursive' strategy.
+ .../bindings/gpio/microchip,pic32-gpio.txt | 49 +
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 +
+ .../bindings/pinctrl/microchip,pic32-pinctrl.txt | 60 +
+ .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 1 +
+ .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 74 +
+ .../bindings/pinctrl/rockchip,pinctrl.txt | 2 +-
+ .../bindings/pinctrl/st,stm32-pinctrl.txt | 126 ++
+ arch/arm/boot/dts/mt2701-pinfunc.h | 735 +++++++
+ drivers/pinctrl/Kconfig | 52 +-
+ drivers/pinctrl/Makefile | 16 +-
+ drivers/pinctrl/freescale/pinctrl-imx.c | 26 +
+ drivers/pinctrl/intel/pinctrl-intel.c | 4 -
+ drivers/pinctrl/mediatek/Kconfig | 22 +-
+ drivers/pinctrl/mediatek/Makefile | 12 +-
+ drivers/pinctrl/mediatek/pinctrl-mt2701.c | 585 +++++
+ drivers/pinctrl/mediatek/pinctrl-mt7623.c | 379 ++++
+ drivers/pinctrl/mediatek/pinctrl-mt8127.c | 8 +-
+ drivers/pinctrl/mediatek/pinctrl-mt8135.c | 8 +-
+ drivers/pinctrl/mediatek/pinctrl-mt8173.c | 8 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 55 +
+ drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 12 +-
+ drivers/pinctrl/mediatek/pinctrl-mtk-mt2701.h | 2323 ++++++++++++++++++++
+ drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h | 1936 ++++++++++++++++
+ drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 7 +
+ drivers/pinctrl/pinctrl-amd.c | 4 +-
+ drivers/pinctrl/pinctrl-coh901.c | 2 +-
+ drivers/pinctrl/pinctrl-pic32.c | 2312 +++++++++++++++++++
+ drivers/pinctrl/pinctrl-pic32.h | 141 ++
+ drivers/pinctrl/pinctrl-rockchip.c | 369 +++-
+ drivers/pinctrl/pinctrl-st.c | 1 +
+ drivers/pinctrl/pinctrl-zynq.c | 2 +-
+ drivers/pinctrl/qcom/Kconfig | 8 +
+ drivers/pinctrl/qcom/Makefile | 1 +
+ drivers/pinctrl/qcom/pinctrl-ipq4019.c | 453 ++++
+ drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 30 +-
+ drivers/pinctrl/sh-pfc/Kconfig | 56 +-
+ drivers/pinctrl/sh-pfc/Makefile | 7 +-
+ drivers/pinctrl/sh-pfc/core.c | 4 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 690 +++---
+ drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 1136 +++++-----
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 774 +++----
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 624 +++---
+ drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 1405 ++++++++----
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 915 +++++---
+ drivers/pinctrl/sh-pfc/pfc-sh7734.c | 412 ++--
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 98 +-
+ drivers/pinctrl/stm32/Kconfig | 16 +
+ drivers/pinctrl/stm32/Makefile | 5 +
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 829 +++++++
+ drivers/pinctrl/stm32/pinctrl-stm32.h | 51 +
+ drivers/pinctrl/stm32/pinctrl-stm32f429.c | 1598 ++++++++++++++
+ drivers/pinctrl/sunxi/Kconfig | 32 +-
+ drivers/pinctrl/sunxi/Makefile | 3 +-
+ drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c | 106 +
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 5 +-
+ drivers/pinctrl/tegra/Kconfig | 30 +
+ drivers/pinctrl/tegra/Makefile | 7 +
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra-xusb.c | 4 +-
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra.c | 4 +-
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra.h | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra114.c | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra124.c | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra20.c | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra210.c | 0
+ drivers/pinctrl/{ => tegra}/pinctrl-tegra30.c | 0
+ drivers/pinctrl/uniphier/Kconfig | 2 +-
+ include/dt-bindings/pinctrl/mt7623-pinfunc.h | 520 +++++
+ 67 files changed, 16450 insertions(+), 2707 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/microchip,pic32-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,pic32-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
+ create mode 100644 arch/arm/boot/dts/mt2701-pinfunc.h
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt2701.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7623.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt2701.h
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h
+ create mode 100644 drivers/pinctrl/pinctrl-pic32.c
+ create mode 100644 drivers/pinctrl/pinctrl-pic32.h
+ create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq4019.c
+ create mode 100644 drivers/pinctrl/stm32/Kconfig
+ create mode 100644 drivers/pinctrl/stm32/Makefile
+ create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32.c
+ create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32.h
+ create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32f429.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c
+ create mode 100644 drivers/pinctrl/tegra/Kconfig
+ create mode 100644 drivers/pinctrl/tegra/Makefile
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra-xusb.c (99%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra.c (99%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra.h (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra114.c (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra124.c (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra20.c (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra210.c (100%)
+ rename drivers/pinctrl/{ => tegra}/pinctrl-tegra30.c (100%)
+ create mode 100644 include/dt-bindings/pinctrl/mt7623-pinfunc.h
+Merging vhost/linux-next (2f47f0294edd virtio_balloon: Allow to resize and update the balloon stats in parallel)
+$ git merge vhost/linux-next
+Auto-merging lib/Makefile
+Auto-merging drivers/vhost/scsi.c
+Auto-merging arch/s390/pci/pci_dma.c
+Auto-merging arch/s390/pci/pci.c
+Auto-merging arch/s390/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/alpha/kernel/pci-noop.c | 46 +---
+ arch/s390/Kconfig | 5 +-
+ arch/s390/include/asm/device.h | 6 +-
+ arch/s390/include/asm/dma-mapping.h | 6 +-
+ arch/s390/pci/pci.c | 1 +
+ arch/s390/pci/pci_dma.c | 4 +-
+ drivers/block/virtio_blk.c | 11 +-
+ drivers/s390/virtio/virtio_ccw.c | 15 +-
+ drivers/vhost/net.c | 2 +-
+ drivers/vhost/scsi.c | 2 +-
+ drivers/vhost/test.c | 2 +-
+ drivers/vhost/vhost.c | 34 ++-
+ drivers/vhost/vhost.h | 2 +-
+ drivers/virtio/Kconfig | 2 +-
+ drivers/virtio/virtio_balloon.c | 122 +++++-----
+ drivers/virtio/virtio_mmio.c | 67 ++----
+ drivers/virtio/virtio_pci_common.h | 6 -
+ drivers/virtio/virtio_pci_legacy.c | 42 ++--
+ drivers/virtio/virtio_pci_modern.c | 61 ++---
+ drivers/virtio/virtio_ring.c | 439 +++++++++++++++++++++++++++++++-----
+ include/linux/dma-mapping.h | 2 +
+ include/linux/virtio.h | 23 +-
+ include/linux/virtio_ring.h | 35 +++
+ include/uapi/linux/virtio_blk.h | 6 +-
+ lib/Makefile | 1 +
+ lib/dma-noop.c | 75 ++++++
+ tools/virtio/linux/dma-mapping.h | 17 ++
+ 27 files changed, 705 insertions(+), 329 deletions(-)
+ create mode 100644 lib/dma-noop.c
+ create mode 100644 tools/virtio/linux/dma-mapping.h
+Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
+$ git merge remoteproc/for-next
+Auto-merging drivers/remoteproc/remoteproc_core.c
+Merge made by the 'recursive' strategy.
+ drivers/remoteproc/remoteproc_core.c | 4 +++-
+ drivers/remoteproc/wkup_m3_rproc.c | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
+$ git merge rpmsg/for-next
+Already up-to-date.
+Merging gpio/for-next (531dd08c87bd Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'drivers/gpio/Kconfig' using previous resolution.
+Resolved 'drivers/gpio/Makefile' using previous resolution.
+Resolved 'drivers/pinctrl/sunxi/pinctrl-sunxi.c' using previous resolution.
+Resolved 'tools/Makefile' using previous resolution.
+Auto-merging tools/Makefile
+CONFLICT (content): Merge conflict in tools/Makefile
+Auto-merging drivers/usb/host/ohci-at91.c
+Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c
+Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c
+CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c
+Auto-merging drivers/gpio/Makefile
+CONFLICT (content): Merge conflict in drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
+Removing arch/xtensa/include/asm/gpio.h
+Removing arch/x86/include/asm/gpio.h
+Removing arch/sparc/include/asm/gpio.h
+Removing arch/powerpc/include/asm/gpio.h
+Removing arch/openrisc/include/asm/gpio.h
+Auto-merging arch/mips/jz4740/gpio.c
+Removing arch/microblaze/include/asm/gpio.h
+Removing arch/metag/include/asm/gpio.h
+Removing arch/ia64/include/asm/gpio.h
+Auto-merging arch/arm/mach-imx/mach-mx27ads.c
+Removing arch/alpha/include/asm/gpio.h
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging Documentation/ABI/obsolete/sysfs-gpio
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7459fea75b70] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/{testing => obsolete}/sysfs-gpio | 4 +-
+ Documentation/ABI/testing/gpio-cdev | 26 +
+ .../devicetree/bindings/gpio/gpio-ts4800.txt | 20 +
+ .../devicetree/bindings/gpio/gpio-xgene-sb.txt | 47 +-
+ Documentation/gpio/board.txt | 11 +-
+ MAINTAINERS | 16 +
+ arch/alpha/include/asm/gpio.h | 4 -
+ arch/arm/common/scoop.c | 10 +-
+ arch/arm/mach-gemini/gpio.c | 4 +-
+ arch/arm/mach-imx/mach-mx27ads.c | 4 +-
+ arch/arm/mach-ixp4xx/common.c | 4 +-
+ arch/arm/mach-s3c24xx/mach-h1940.c | 2 +-
+ arch/arm/mach-sa1100/simpad.c | 4 +-
+ arch/arm/mach-w90x900/gpio.c | 13 +-
+ arch/arm/plat-orion/gpio.c | 24 +-
+ arch/avr32/boards/merisc/setup.c | 1 -
+ arch/avr32/mach-at32ap/pio.c | 2 +-
+ arch/blackfin/kernel/bfin_gpio.c | 6 +-
+ arch/blackfin/kernel/debug-mmrs.c | 2 +-
+ arch/blackfin/mach-bf538/boards/ezkit.c | 2 +-
+ arch/blackfin/mach-bf538/ext-gpio.c | 8 +-
+ arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 +-
+ arch/blackfin/mach-bf548/boards/ezkit.c | 2 +-
+ arch/blackfin/mach-bf609/boards/ezkit.c | 2 +-
+ arch/blackfin/mach-common/ints-priority.c | 2 +-
+ arch/blackfin/mach-common/pm.c | 2 +-
+ arch/ia64/include/asm/gpio.h | 4 -
+ arch/m68k/coldfire/gpio.c | 2 +-
+ arch/metag/include/asm/gpio.h | 4 -
+ arch/microblaze/include/asm/gpio.h | 4 -
+ arch/mips/alchemy/common/gpiolib.c | 8 +-
+ arch/mips/ar7/gpio.c | 26 +-
+ arch/mips/bcm63xx/gpio.c | 4 +-
+ arch/mips/jz4740/gpio.c | 10 +-
+ arch/mips/kernel/gpio_txx9.c | 4 +-
+ arch/mips/rb532/gpio.c | 12 +-
+ arch/mips/txx9/generic/setup.c | 10 +-
+ arch/mips/txx9/rbtx4938/setup.c | 3 +-
+ arch/openrisc/include/asm/gpio.h | 4 -
+ arch/powerpc/include/asm/gpio.h | 4 -
+ arch/powerpc/sysdev/ppc4xx_gpio.c | 2 +-
+ arch/powerpc/sysdev/simple_gpio.c | 2 +-
+ arch/sh/include/mach-common/mach/magicpanelr2.h | 2 +-
+ arch/sparc/include/asm/gpio.h | 4 -
+ arch/unicore32/kernel/gpio.c | 2 +-
+ arch/x86/include/asm/gpio.h | 4 -
+ arch/xtensa/include/asm/gpio.h | 4 -
+ drivers/ata/pata_at91.c | 3 +-
+ drivers/ata/pata_bf54x.c | 2 +-
+ drivers/gpio/Kconfig | 72 ++-
+ drivers/gpio/Makefile | 8 +-
+ drivers/gpio/devres.c | 2 +-
+ drivers/gpio/gpio-104-dio-48e.c | 430 +++++++++++++
+ drivers/gpio/gpio-104-idi-48.c | 30 +-
+ drivers/gpio/gpio-104-idio-16.c | 27 +-
+ drivers/gpio/gpio-amd8111.c | 7 +-
+ drivers/gpio/gpio-ath79.c | 264 +++++---
+ drivers/gpio/gpio-brcmstb.c | 13 +-
+ drivers/gpio/gpio-davinci.c | 5 +-
+ drivers/gpio/gpio-f7188x.c | 27 +-
+ drivers/gpio/gpio-ich.c | 51 +-
+ drivers/gpio/gpio-ks8695.c | 12 -
+ drivers/gpio/gpio-mcp23s08.c | 2 +
+ drivers/gpio/gpio-mpc5200.c | 1 -
+ drivers/gpio/gpio-mpc8xxx.c | 259 +++-----
+ drivers/gpio/gpio-pisosr.c | 183 ++++++
+ drivers/gpio/gpio-sch311x.c | 8 +-
+ drivers/gpio/gpio-tpic2810.c | 170 +++++
+ drivers/gpio/gpio-tps65218.c | 222 +++++++
+ drivers/gpio/gpio-ts4800.c | 91 +++
+ drivers/gpio/gpio-ws16c48.c | 427 +++++++++++++
+ drivers/gpio/gpio-xgene-sb.c | 265 +++++++-
+ drivers/gpio/gpiolib-acpi.c | 18 +-
+ drivers/gpio/gpiolib-sysfs.c | 51 +-
+ drivers/gpio/gpiolib.c | 705 +++++++++++++++------
+ drivers/gpio/gpiolib.h | 79 ++-
+ drivers/mfd/menelaus.c | 2 +-
+ drivers/mtd/onenand/omap2.c | 2 +-
+ drivers/pcmcia/bfin_cf_pcmcia.c | 2 +-
+ drivers/pcmcia/pxa2xx_vpac270.c | 1 -
+ drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 33 +-
+ drivers/pinctrl/sirf/pinctrl-atlas7.c | 18 -
+ drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 +-
+ drivers/soc/fsl/qe/gpio.c | 2 +-
+ drivers/usb/gadget/udc/atmel_usba_udc.c | 2 -
+ drivers/usb/host/ohci-at91.c | 2 -
+ drivers/video/fbdev/atmel_lcdfb.c | 2 -
+ drivers/video/fbdev/omap/lcd_h3.c | 2 +-
+ drivers/video/fbdev/omap/lcd_osk.c | 3 +-
+ drivers/video/fbdev/omap/lcd_palmtt.c | 2 +-
+ include/asm-generic/gpio.h | 4 +
+ include/linux/gpio/driver.h | 35 +-
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/gpio.h | 58 ++
+ tools/Makefile | 7 +-
+ tools/gpio/Makefile | 12 +
+ tools/gpio/gpio-utils.c | 11 +
+ tools/gpio/gpio-utils.h | 27 +
+ tools/gpio/lsgpio.c | 195 ++++++
+ 99 files changed, 3358 insertions(+), 846 deletions(-)
+ rename Documentation/ABI/{testing => obsolete}/sysfs-gpio (88%)
+ create mode 100644 Documentation/ABI/testing/gpio-cdev
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ts4800.txt
+ delete mode 100644 arch/alpha/include/asm/gpio.h
+ delete mode 100644 arch/ia64/include/asm/gpio.h
+ delete mode 100644 arch/metag/include/asm/gpio.h
+ delete mode 100644 arch/microblaze/include/asm/gpio.h
+ delete mode 100644 arch/openrisc/include/asm/gpio.h
+ delete mode 100644 arch/powerpc/include/asm/gpio.h
+ delete mode 100644 arch/sparc/include/asm/gpio.h
+ delete mode 100644 arch/x86/include/asm/gpio.h
+ delete mode 100644 arch/xtensa/include/asm/gpio.h
+ create mode 100644 drivers/gpio/gpio-104-dio-48e.c
+ create mode 100644 drivers/gpio/gpio-pisosr.c
+ create mode 100644 drivers/gpio/gpio-tpic2810.c
+ create mode 100644 drivers/gpio/gpio-tps65218.c
+ create mode 100644 drivers/gpio/gpio-ts4800.c
+ create mode 100644 drivers/gpio/gpio-ws16c48.c
+ create mode 100644 include/uapi/linux/gpio.h
+ create mode 100644 tools/gpio/Makefile
+ create mode 100644 tools/gpio/gpio-utils.c
+ create mode 100644 tools/gpio/gpio-utils.h
+ create mode 100644 tools/gpio/lsgpio.c
+Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (116e5575805d pwm: brcmstb: Fix check of devm_ioremap_resource() return code)
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pwm/Kconfig | 2 +-
+ drivers/pwm/pwm-brcmstb.c | 4 ++--
+ drivers/pwm/pwm-img.c | 5 +++++
+ drivers/pwm/pwm-lpc18xx-sct.c | 5 +++++
+ 4 files changed, 13 insertions(+), 3 deletions(-)
+Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
+$ git merge dma-buf/for-next
+Auto-merging include/linux/fence.h
+Merge made by the 'recursive' strategy.
+ include/linux/fence.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (b953c0d234bc Linux 4.1)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging clk/clk-next (d3781a74bcc9 clk: fixed-rate: Remove CLK_IS_ROOT)
+$ git merge clk/clk-next
+Resolved 'drivers/clk/at91/clk-main.c' using previous resolution.
+Auto-merging include/linux/device.h
+Auto-merging drivers/clk/renesas/renesas-cpg-mssr.h
+Auto-merging drivers/clk/renesas/renesas-cpg-mssr.c
+Auto-merging drivers/clk/renesas/r8a7795-cpg-mssr.c
+Auto-merging drivers/clk/renesas/clk-div6.c
+Auto-merging drivers/clk/pxa/clk-pxa3xx.c
+Auto-merging drivers/clk/pxa/clk-pxa27x.c
+Auto-merging drivers/clk/pxa/clk-pxa25x.c
+Auto-merging drivers/clk/at91/clk-usb.c
+Auto-merging drivers/clk/at91/clk-smd.c
+Auto-merging drivers/clk/at91/clk-slow.c
+Auto-merging drivers/clk/at91/clk-programmable.c
+Auto-merging drivers/clk/at91/clk-master.c
+CONFLICT (content): Merge conflict in drivers/clk/at91/clk-master.c
+Auto-merging drivers/clk/at91/clk-main.c
+CONFLICT (content): Merge conflict in drivers/clk/at91/clk-main.c
+Auto-merging drivers/clk/at91/clk-generated.c
+Auto-merging drivers/clk/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/arm/mach-mvebu/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9934589ac599] Merge remote-tracking branch 'clk/clk-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/clock/axi-clkgen.txt | 5 +-
+ .../bindings/clock/brcm,iproc-clocks.txt | 6 +
+ .../devicetree/bindings/clock/lpc1850-creg-clk.txt | 52 +
+ .../devicetree/bindings/clock/qcom,gcc.txt | 1 +
+ .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 2 +-
+ arch/arm/mach-mvebu/Kconfig | 3 +
+ arch/mips/Kconfig | 2 -
+ arch/mips/pic32/Kconfig | 1 -
+ drivers/clk/Kconfig | 21 +-
+ drivers/clk/Makefile | 3 +-
+ drivers/clk/at91/clk-generated.c | 4 +-
+ drivers/clk/at91/clk-main.c | 6 +-
+ drivers/clk/at91/clk-master.c | 4 +-
+ drivers/clk/at91/clk-programmable.c | 4 +-
+ drivers/clk/at91/clk-slow.c | 8 +-
+ drivers/clk/at91/clk-smd.c | 4 +-
+ drivers/clk/at91/clk-usb.c | 4 +-
+ drivers/clk/bcm/clk-bcm2835.c | 47 +-
+ drivers/clk/bcm/clk-cygnus.c | 59 +
+ drivers/clk/bcm/clk-iproc-pll.c | 41 +-
+ drivers/clk/bcm/clk-iproc.h | 43 +-
+ drivers/clk/clk-axi-clkgen.c | 170 +--
+ drivers/clk/clk-divider.c | 5 +-
+ drivers/clk/clk-efm32gg.c | 2 +-
+ drivers/clk/clk-fixed-factor.c | 13 +
+ drivers/clk/clk-fixed-rate.c | 16 +-
+ drivers/clk/clk-gpio.c | 161 +--
+ drivers/clk/clk-mb86s7x.c | 4 +-
+ drivers/clk/clk-palmas.c | 16 +-
+ drivers/clk/clk-pwm.c | 2 +-
+ drivers/clk/clk-s2mps11.c | 3 -
+ drivers/clk/clk-scpi.c | 2 +-
+ drivers/clk/clk-si514.c | 2 +-
+ drivers/clk/clk-si5351.c | 2 +-
+ drivers/clk/clk-si570.c | 2 +-
+ drivers/clk/clk-vt8500.c | 100 +-
+ drivers/clk/clk-xgene.c | 4 +-
+ drivers/clk/clk.c | 221 ++--
+ drivers/clk/h8300/clk-div.c | 6 +-
+ drivers/clk/h8300/clk-h8s2678.c | 4 +-
+ drivers/clk/hisilicon/clk-hi3620.c | 18 +-
+ drivers/clk/hisilicon/clk-hi6220-stub.c | 2 +-
+ drivers/clk/hisilicon/clk-hi6220.c | 26 +-
+ drivers/clk/hisilicon/clk-hip04.c | 6 +-
+ drivers/clk/hisilicon/clk-hix5hd2.c | 60 +-
+ drivers/clk/imx/clk.h | 2 +-
+ drivers/clk/mediatek/clk-mtk.c | 4 +-
+ drivers/clk/meson/clkc.c | 2 +-
+ drivers/clk/mvebu/Kconfig | 2 -
+ drivers/clk/mvebu/common.c | 11 +-
+ drivers/clk/mvebu/dove-divider.c | 3 +-
+ drivers/clk/mxs/clk.h | 2 +-
+ drivers/clk/nxp/Makefile | 1 +
+ drivers/clk/nxp/clk-lpc18xx-cgu.c | 2 +-
+ drivers/clk/nxp/clk-lpc18xx-creg.c | 226 ++++
+ drivers/clk/nxp/clk-lpc32xx.c | 15 +-
+ drivers/clk/pxa/clk-pxa25x.c | 8 +-
+ drivers/clk/pxa/clk-pxa27x.c | 6 +-
+ drivers/clk/pxa/clk-pxa3xx.c | 8 +-
+ drivers/clk/qcom/Kconfig | 8 +
+ drivers/clk/qcom/Makefile | 1 +
+ drivers/clk/qcom/clk-rcg.c | 4 +-
+ drivers/clk/qcom/common.c | 30 +-
+ drivers/clk/qcom/gcc-ipq4019.c | 1354 ++++++++++++++++++++
+ drivers/clk/qcom/gcc-ipq806x.c | 37 -
+ drivers/clk/qcom/gcc-msm8660.c | 32 -
+ drivers/clk/qcom/gcc-msm8916.c | 18 +
+ drivers/clk/qcom/gcc-msm8960.c | 46 +-
+ drivers/clk/qcom/gcc-msm8974.c | 1 -
+ drivers/clk/qcom/gcc-msm8996.c | 98 +-
+ drivers/clk/qcom/gdsc.c | 89 +-
+ drivers/clk/qcom/gdsc.h | 34 +-
+ drivers/clk/qcom/mmcc-msm8960.c | 35 -
+ drivers/clk/qcom/mmcc-msm8974.c | 15 +-
+ drivers/clk/qcom/mmcc-msm8996.c | 157 +++
+ drivers/clk/{shmobile => renesas}/Makefile | 0
+ drivers/clk/{shmobile => renesas}/clk-div6.c | 3 +-
+ drivers/clk/{shmobile => renesas}/clk-div6.h | 0
+ drivers/clk/{shmobile => renesas}/clk-emev2.c | 0
+ drivers/clk/{shmobile => renesas}/clk-mstp.c | 0
+ drivers/clk/{shmobile => renesas}/clk-r8a73a4.c | 0
+ drivers/clk/{shmobile => renesas}/clk-r8a7740.c | 0
+ drivers/clk/{shmobile => renesas}/clk-r8a7778.c | 0
+ drivers/clk/{shmobile => renesas}/clk-r8a7779.c | 0
+ drivers/clk/{shmobile => renesas}/clk-rcar-gen2.c | 0
+ drivers/clk/{shmobile => renesas}/clk-rz.c | 0
+ drivers/clk/{shmobile => renesas}/clk-sh73a0.c | 0
+ .../clk/{shmobile => renesas}/r8a7795-cpg-mssr.c | 255 ++++
+ .../clk/{shmobile => renesas}/renesas-cpg-mssr.c | 7 +-
+ .../clk/{shmobile => renesas}/renesas-cpg-mssr.h | 2 +
+ drivers/clk/samsung/clk-exynos4.c | 12 +-
+ drivers/clk/samsung/clk-exynos4415.c | 2 +-
+ drivers/clk/samsung/clk-exynos5250.c | 10 +-
+ drivers/clk/samsung/clk-exynos5260.c | 36 +-
+ drivers/clk/samsung/clk-exynos5420.c | 12 +-
+ drivers/clk/samsung/clk-exynos5433.c | 208 +--
+ drivers/clk/samsung/clk-exynos5440.c | 12 +-
+ drivers/clk/samsung/clk-exynos7.c | 12 +-
+ drivers/clk/samsung/clk-s3c2410.c | 2 +-
+ drivers/clk/samsung/clk-s3c2412.c | 4 +-
+ drivers/clk/samsung/clk-s3c2443.c | 8 +-
+ drivers/clk/samsung/clk-s3c64xx.c | 8 +-
+ drivers/clk/samsung/clk-s5pv210.c | 10 +-
+ drivers/clk/socfpga/clk-gate-a10.c | 6 +-
+ drivers/clk/socfpga/clk-periph-a10.c | 7 +-
+ drivers/clk/socfpga/clk-pll-a10.c | 2 +-
+ drivers/clk/spear/spear1310_clock.c | 21 +-
+ drivers/clk/spear/spear1340_clock.c | 16 +-
+ drivers/clk/spear/spear3xx_clock.c | 8 +-
+ drivers/clk/spear/spear6xx_clock.c | 6 +-
+ drivers/clk/st/clk-flexgen.c | 4 +-
+ drivers/clk/st/clkgen-fsyn.c | 8 +-
+ drivers/clk/st/clkgen-mux.c | 4 +-
+ drivers/clk/tegra/clk-audio-sync.c | 2 +-
+ drivers/clk/tegra/clk-dfll.c | 1 -
+ drivers/clk/tegra/clk-tegra-fixed.c | 6 +-
+ drivers/clk/tegra/clk-tegra114.c | 3 +-
+ drivers/clk/tegra/clk-tegra20.c | 10 +-
+ drivers/clk/ti/apll.c | 20 +-
+ drivers/clk/ti/clk.c | 4 +-
+ drivers/clk/ti/clkt_dpll.c | 6 +-
+ drivers/clk/ti/clockdomain.c | 2 +-
+ drivers/clk/ti/composite.c | 8 +-
+ drivers/clk/ti/dpll.c | 27 +-
+ drivers/clk/ti/dpll3xxx.c | 17 +-
+ drivers/clk/ti/dpll44xx.c | 8 +-
+ drivers/clk/ti/mux.c | 4 +-
+ drivers/clk/ux500/abx500-clk.c | 5 +-
+ drivers/clk/ux500/u8500_of_clk.c | 74 +-
+ drivers/clk/ux500/u8540_clk.c | 80 +-
+ drivers/clk/versatile/clk-sp810.c | 4 +-
+ drivers/clk/x86/clk-lpt.c | 4 +-
+ drivers/clk/zynq/clkc.c | 3 +-
+ drivers/usb/dwc3/dwc3-of-simple.c | 9 +-
+ drivers/video/fbdev/simplefb.c | 4 +-
+ include/dt-bindings/clock/bcm-cygnus.h | 6 +
+ include/dt-bindings/clock/exynos5433.h | 9 +-
+ include/dt-bindings/clock/lpc32xx-clock.h | 1 +
+ include/dt-bindings/clock/qcom,gcc-ipq4019.h | 158 +++
+ include/dt-bindings/clock/qcom,gcc-msm8916.h | 1 +
+ include/dt-bindings/clock/qcom,gcc-msm8996.h | 11 +
+ include/dt-bindings/clock/qcom,mmcc-msm8996.h | 17 +
+ include/linux/clk-provider.h | 11 +-
+ include/linux/clk/ti.h | 8 +-
+ include/linux/device.h | 12 +
+ 145 files changed, 3390 insertions(+), 1248 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/lpc1850-creg-clk.txt
+ create mode 100644 drivers/clk/nxp/clk-lpc18xx-creg.c
+ create mode 100644 drivers/clk/qcom/gcc-ipq4019.c
+ rename drivers/clk/{shmobile => renesas}/Makefile (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-div6.c (98%)
+ rename drivers/clk/{shmobile => renesas}/clk-div6.h (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-emev2.c (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-mstp.c (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-r8a73a4.c (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-r8a7740.c (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-r8a7778.c (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-r8a7779.c (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-rcar-gen2.c (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-rz.c (100%)
+ rename drivers/clk/{shmobile => renesas}/clk-sh73a0.c (100%)
+ rename drivers/clk/{shmobile => renesas}/r8a7795-cpg-mssr.c (61%)
+ rename drivers/clk/{shmobile => renesas}/renesas-cpg-mssr.c (99%)
+ rename drivers/clk/{shmobile => renesas}/renesas-cpg-mssr.h (97%)
+ create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq4019.h
+Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
+$ git merge random/dev
+Already up-to-date.
+Merging aio/master (0964acffc614 aio: revert addition of io_send_sig() in generic_write_checks)
+$ git merge aio/master
+Auto-merging net/unix/af_unix.c
+Auto-merging net/sctp/socket.c
+Auto-merging net/core/stream.c
+Auto-merging net/atm/common.c
+Auto-merging mm/readahead.c
+Auto-merging mm/internal.h
+Auto-merging mm/filemap.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/auditsc.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/splice.c
+Auto-merging fs/read_write.c
+Auto-merging fs/pipe.c
+Auto-merging fs/namei.c
+Auto-merging fs/internal.h
+Auto-merging fs/attr.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_lock.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_lock.c | 6 +-
+ fs/aio.c | 729 ++++++++++++++++++++++++++++++++++++++---
+ fs/attr.c | 2 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/fuse/dev.c | 2 +-
+ fs/internal.h | 6 +
+ fs/namei.c | 2 +-
+ fs/pipe.c | 4 +-
+ fs/read_write.c | 5 +-
+ fs/splice.c | 8 +-
+ include/linux/aio.h | 9 +
+ include/linux/fs.h | 3 +
+ include/linux/sched.h | 6 +
+ include/uapi/linux/aio_abi.h | 15 +-
+ init/Kconfig | 13 +
+ kernel/auditsc.c | 6 +-
+ kernel/signal.c | 20 ++
+ kernel/sysctl.c | 9 +
+ mm/filemap.c | 2 +-
+ mm/internal.h | 4 +-
+ mm/readahead.c | 13 +-
+ net/atm/common.c | 4 +-
+ net/ax25/af_ax25.c | 2 +-
+ net/caif/caif_socket.c | 2 +-
+ net/core/stream.c | 2 +-
+ net/decnet/af_decnet.c | 2 +-
+ net/irda/af_irda.c | 4 +-
+ net/netrom/af_netrom.c | 2 +-
+ net/rose/af_rose.c | 2 +-
+ net/sctp/socket.c | 2 +-
+ net/unix/af_unix.c | 4 +-
+ net/x25/af_x25.c | 2 +-
+ 33 files changed, 816 insertions(+), 80 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 9934589ac599 Merge remote-tracking branch 'clk/clk-next'
+Merging next-20160111 version of aio
+$ git merge -m next-20160111/aio 6a81013efc4013555c5de34c01530b805f45c92c
+Auto-merging net/unix/af_unix.c
+Auto-merging net/sctp/socket.c
+Auto-merging net/core/stream.c
+Auto-merging net/atm/common.c
+Auto-merging mm/filemap.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/auditsc.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/fs.h
+Auto-merging fs/splice.c
+Auto-merging fs/read_write.c
+Auto-merging fs/pipe.c
+Auto-merging fs/internal.h
+Auto-merging fs/attr.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_lock.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_lock.c | 6 +-
+ fs/aio.c | 382 ++++++++++++++++++++++++++++++++++++++---
+ fs/attr.c | 2 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/fuse/dev.c | 2 +-
+ fs/internal.h | 6 +
+ fs/pipe.c | 4 +-
+ fs/read_write.c | 5 +-
+ fs/splice.c | 8 +-
+ include/linux/aio.h | 8 +
+ include/linux/fs.h | 2 +
+ include/linux/sched.h | 6 +
+ include/uapi/linux/aio_abi.h | 2 +-
+ init/Kconfig | 13 ++
+ kernel/auditsc.c | 6 +-
+ kernel/signal.c | 20 +++
+ kernel/sysctl.c | 9 +
+ mm/filemap.c | 6 +-
+ net/atm/common.c | 4 +-
+ net/ax25/af_ax25.c | 2 +-
+ net/caif/caif_socket.c | 2 +-
+ net/core/stream.c | 2 +-
+ net/decnet/af_decnet.c | 2 +-
+ net/irda/af_irda.c | 4 +-
+ net/netrom/af_netrom.c | 2 +-
+ net/rose/af_rose.c | 2 +-
+ net/sctp/socket.c | 2 +-
+ net/unix/af_unix.c | 4 +-
+ net/x25/af_x25.c | 2 +-
+ 30 files changed, 455 insertions(+), 64 deletions(-)
+Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
+$ git merge llvmlinux/for-next
+Merge made by the 'recursive' strategy.
+Merging kselftest/next (6accd8e9bf22 selftests: media_dcevice_test fix usage information)
+$ git merge kselftest/next
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 10 +
+ tools/testing/selftests/breakpoints/.gitignore | 1 +
+ tools/testing/selftests/breakpoints/Makefile | 4 +-
+ .../breakpoints/step_after_suspend_test.c | 218 +++++++++++++++++++++
+ tools/testing/selftests/cpu-hotplug/config | 2 +
+ tools/testing/selftests/firmware/config | 1 +
+ tools/testing/selftests/ftrace/config | 1 +
+ tools/testing/selftests/ipc/.gitignore | 1 +
+ tools/testing/selftests/ipc/config | 2 +
+ tools/testing/selftests/media_tests/.gitignore | 1 +
+ tools/testing/selftests/media_tests/Makefile | 7 +
+ .../selftests/media_tests/media_device_test.c | 95 +++++++++
+ tools/testing/selftests/memory-hotplug/config | 4 +
+ tools/testing/selftests/mount/config | 2 +
+ tools/testing/selftests/net/config | 3 +
+ tools/testing/selftests/pstore/config | 4 +
+ tools/testing/selftests/seccomp/config | 2 +
+ tools/testing/selftests/static_keys/config | 1 +
+ tools/testing/selftests/user/config | 1 +
+ tools/testing/selftests/vm/config | 1 +
+ tools/testing/selftests/zram/config | 2 +
+ 21 files changed, 362 insertions(+), 1 deletion(-)
+ create mode 100644 tools/testing/selftests/breakpoints/step_after_suspend_test.c
+ create mode 100644 tools/testing/selftests/cpu-hotplug/config
+ create mode 100644 tools/testing/selftests/firmware/config
+ create mode 100644 tools/testing/selftests/ftrace/config
+ create mode 100644 tools/testing/selftests/ipc/.gitignore
+ create mode 100644 tools/testing/selftests/ipc/config
+ create mode 100644 tools/testing/selftests/media_tests/.gitignore
+ create mode 100644 tools/testing/selftests/media_tests/Makefile
+ create mode 100644 tools/testing/selftests/media_tests/media_device_test.c
+ create mode 100644 tools/testing/selftests/memory-hotplug/config
+ create mode 100644 tools/testing/selftests/mount/config
+ create mode 100644 tools/testing/selftests/net/config
+ create mode 100644 tools/testing/selftests/pstore/config
+ create mode 100644 tools/testing/selftests/seccomp/config
+ create mode 100644 tools/testing/selftests/static_keys/config
+ create mode 100644 tools/testing/selftests/user/config
+ create mode 100644 tools/testing/selftests/vm/config
+ create mode 100644 tools/testing/selftests/zram/config
+Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
+$ git merge y2038/y2038
+Merge made by the 'recursive' strategy.
+ drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
+ fs/afs/main.c | 6 ++----
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
+$ git merge luto-misc/next
+Already up-to-date.
+Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
+$ git merge borntraeger/linux-next
+Already up-to-date.
+Merging livepatching/for-next (db6fc729a663 Merge branch 'for-4.6/upstream' into for-next)
+$ git merge livepatching/for-next
+Merge made by the 'recursive' strategy.
+ arch/s390/include/asm/livepatch.h | 4 ----
+ arch/x86/include/asm/livepatch.h | 4 ----
+ include/linux/livepatch.h | 4 ----
+ 3 files changed, 12 deletions(-)
+Merging coresight/next (f1e2c1b13dfa drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular)
+$ git merge coresight/next
+Resolved 'drivers/hwtracing/coresight/coresight-etm3x.c' using previous resolution.
+Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c
+CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master df75e4631e4f] Merge remote-tracking branch 'coresight/next'
+$ git diff -M --stat --summary HEAD^..
+Merging rtc/rtc-next (d6c66e83fddf rtc: rv3029: Add device tree property for trickle charger)
+$ git merge rtc/rtc-next
+Auto-merging drivers/rtc/rtc-rx8025.c
+Merge made by the 'recursive' strategy.
+ .../bindings/rtc/alphascale,asm9260-rtc.txt | 19 +
+ .../devicetree/bindings/rtc/epson,rx6110.txt | 39 ++
+ .../devicetree/bindings/rtc/maxim,ds3231.txt | 37 ++
+ .../bindings/rtc/microchip,pic32-rtc.txt | 21 +
+ Documentation/rtc.txt | 6 +
+ drivers/mfd/max77686.c | 86 +--
+ drivers/rtc/Kconfig | 168 +++---
+ drivers/rtc/Makefile | 3 +
+ drivers/rtc/class.c | 13 -
+ drivers/rtc/interface.c | 54 ++
+ drivers/rtc/rtc-as3722.c | 2 +-
+ drivers/rtc/rtc-asm9260.c | 355 ++++++++++++
+ drivers/rtc/rtc-ds1305.c | 4 +-
+ drivers/rtc/rtc-ds1307.c | 411 +++++++++++++-
+ drivers/rtc/rtc-ds1685.c | 8 +-
+ drivers/rtc/rtc-max77686.c | 257 +++++++--
+ drivers/rtc/rtc-mt6397.c | 1 -
+ drivers/rtc/rtc-palmas.c | 3 +-
+ drivers/rtc/rtc-pcf2123.c | 271 +++++++---
+ drivers/rtc/rtc-pcf85063.c | 162 +++---
+ drivers/rtc/rtc-pcf8523.c | 25 +-
+ drivers/rtc/rtc-pic32.c | 411 ++++++++++++++
+ drivers/rtc/rtc-rv3029c2.c | 592 +++++++++++++++------
+ drivers/rtc/rtc-rv8803.c | 39 +-
+ drivers/rtc/rtc-rx6110.c | 402 ++++++++++++++
+ drivers/rtc/rtc-rx8025.c | 25 +-
+ drivers/rtc/rtc-s5m.c | 8 +-
+ drivers/rtc/rtc-sysfs.c | 35 +-
+ drivers/rtc/rtc-tps6586x.c | 2 +-
+ drivers/rtc/rtc-tps65910.c | 2 +-
+ drivers/rtc/rtc-tps80031.c | 2 +-
+ drivers/rtc/rtc-vr41xx.c | 13 +-
+ include/linux/mfd/max77686-private.h | 3 -
+ include/linux/rtc.h | 4 +
+ 34 files changed, 2869 insertions(+), 614 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/epson,rx6110.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/maxim,ds3231.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/microchip,pic32-rtc.txt
+ create mode 100644 drivers/rtc/rtc-asm9260.c
+ create mode 100644 drivers/rtc/rtc-pic32.c
+ create mode 100644 drivers/rtc/rtc-rx6110.c
+Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
+$ git merge hwspinlock/for-next
+Already up-to-date.
+Merging nvdimm/libnvdimm-for-next (36f90b0a2ddd Linux 4.5-rc2)
+$ git merge nvdimm/libnvdimm-for-next
+Already up-to-date.
+Merging akpm-current/current (6b0b69f03576 ipc/msg.c: use freezable blocking call)
+$ git merge --no-ff akpm-current/current
+Resolved 'arch/mips/Kconfig' using previous resolution.
+Resolved 'arch/x86/boot/Makefile' using previous resolution.
+Resolved 'arch/x86/boot/compressed/Makefile' using previous resolution.
+Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution.
+Resolved 'arch/x86/entry/vdso/Makefile' using previous resolution.
+Resolved 'arch/x86/kernel/Makefile' using previous resolution.
+Resolved 'drivers/firmware/efi/libstub/Makefile' using previous resolution.
+Resolved 'drivers/gpu/drm/omapdrm/omap_gem.c' using previous resolution.
+Resolved 'fs/ocfs2/aops.c' using previous resolution.
+Resolved 'mm/huge_memory.c' using previous resolution.
+Resolved 'mm/mprotect.c' using previous resolution.
+Auto-merging tools/perf/builtin-kmem.c
+Auto-merging scripts/link-vmlinux.sh
+Auto-merging scripts/Makefile.lib
+Auto-merging net/sctp/socket.c
+Auto-merging mm/util.c
+Auto-merging mm/nommu.c
+Auto-merging mm/mprotect.c
+CONFLICT (content): Merge conflict in mm/mprotect.c
+Auto-merging mm/mmap.c
+Auto-merging mm/mempolicy.c
+Auto-merging mm/memory_hotplug.c
+Auto-merging mm/memory.c
+Auto-merging mm/ksm.c
+Auto-merging mm/huge_memory.c
+CONFLICT (content): Merge conflict in mm/huge_memory.c
+Auto-merging mm/filemap.c
+Auto-merging mm/Kconfig
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/signal.c
+Auto-merging kernel/sched/Makefile
+Auto-merging kernel/profile.c
+Auto-merging kernel/memremap.c
+Auto-merging kernel/kexec_file.c
+Auto-merging kernel/kexec_core.c
+Auto-merging kernel/fork.c
+Auto-merging kernel/auditsc.c
+Auto-merging kernel/Makefile
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/Kbuild
+Removing include/trace/events/gfpflags.h
+Auto-merging include/linux/trace_events.h
+Auto-merging include/linux/sched/sysctl.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/memory.h
+Auto-merging include/linux/kernel.h
+Auto-merging include/linux/dma-mapping.h
+Auto-merging include/asm-generic/bug.h
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging fs/ocfs2/quota_global.c
+Auto-merging fs/ocfs2/ocfs2_trace.h
+Auto-merging fs/ocfs2/aops.c
+CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/btrfs/tests/btrfs-tests.c
+Auto-merging drivers/xen/balloon.c
+Auto-merging drivers/virtio/virtio_balloon.c
+Auto-merging drivers/video/fbdev/atmel_lcdfb.c
+Auto-merging drivers/usb/common/common.c
+Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h
+Auto-merging drivers/rapidio/rio.c
+Auto-merging drivers/net/wireless/marvell/mwifiex/debugfs.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
+Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_main.c
+Auto-merging drivers/net/ethernet/freescale/gianfar.c
+Auto-merging drivers/media/platform/coda/coda-bit.c
+Auto-merging drivers/gpu/host1x/job.c
+Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/omap_gem.c
+Auto-merging drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+Auto-merging drivers/firmware/efi/libstub/Makefile
+CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile
+Auto-merging drivers/firmware/efi/efivars.c
+Auto-merging drivers/dma/qcom_bam_dma.c
+Auto-merging arch/x86/realmode/rm/Makefile
+CONFLICT (content): Merge conflict in arch/x86/realmode/rm/Makefile
+Auto-merging arch/x86/mm/pageattr.c
+Auto-merging arch/x86/mm/gup.c
+Auto-merging arch/x86/mm/Makefile
+Auto-merging arch/x86/kernel/process_64.c
+Auto-merging arch/x86/kernel/dumpstack.c
+Auto-merging arch/x86/kernel/cpu/Makefile
+Auto-merging arch/x86/kernel/Makefile
+CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
+Auto-merging arch/x86/include/asm/ftrace.h
+Auto-merging arch/x86/entry/vdso/Makefile
+CONFLICT (content): Merge conflict in arch/x86/entry/vdso/Makefile
+Auto-merging arch/x86/entry/syscalls/syscall_64.tbl
+CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
+Auto-merging arch/x86/boot/compressed/Makefile
+CONFLICT (content): Merge conflict in arch/x86/boot/compressed/Makefile
+Auto-merging arch/x86/boot/Makefile
+CONFLICT (content): Merge conflict in arch/x86/boot/Makefile
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/kernel/time.c
+Auto-merging arch/s390/kernel/dumpstack.c
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/sysdev/fsl_rmu.c
+Auto-merging arch/powerpc/mm/pgtable_64.c
+Auto-merging arch/powerpc/mm/hash_utils_64.c
+Auto-merging arch/powerpc/kernel/traps.c
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/mips/mm/gup.c
+Auto-merging arch/mips/Kconfig
+CONFLICT (content): Merge conflict in arch/mips/Kconfig
+Auto-merging arch/arm/mach-lpc32xx/phy3250.c
+Auto-merging arch/arm/kernel/smp.c
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/Kconfig
+Auto-merging Makefile
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/cgroup-v2.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 490f211ea23e] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/blockdev/zram.txt | 10 +
+ Documentation/cgroup-v2.txt | 19 +
+ .../filesystems/ocfs2-online-filecheck.txt | 94 +
+ Documentation/filesystems/proc.txt | 18 +
+ Documentation/kcov.txt | 111 +
+ Documentation/kernel-parameters.txt | 17 +-
+ Documentation/memory-hotplug.txt | 23 +-
+ Documentation/printk-formats.txt | 18 +
+ Documentation/rapidio/mport_cdev.txt | 104 +
+ Documentation/rapidio/tsi721.txt | 9 +
+ Documentation/sysctl/vm.txt | 18 +
+ Documentation/vm/ksm.txt | 63 +
+ Documentation/vm/page_owner.txt | 9 +-
+ Documentation/vm/slub.txt | 4 +-
+ Documentation/vm/transhuge.txt | 5 +
+ Makefile | 11 +-
+ arch/Kconfig | 4 +
+ arch/arc/include/asm/hugepage.h | 3 -
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/page.h | 2 +
+ arch/arm/kernel/smp.c | 2 +
+ arch/arm/mach-lpc32xx/phy3250.c | 13 +-
+ arch/arm/mach-netx/fb.c | 14 +-
+ arch/arm/mach-nspire/clcd.c | 13 +-
+ arch/arm/mm/pgd.c | 2 +-
+ arch/avr32/Kconfig | 1 +
+ arch/blackfin/Kconfig | 1 +
+ arch/blackfin/include/asm/pgtable.h | 2 +
+ arch/cris/Kconfig | 1 +
+ arch/ia64/mm/hugetlbpage.c | 2 +-
+ arch/m32r/mm/init.c | 27 +-
+ arch/metag/mm/hugetlbpage.c | 2 +-
+ arch/mips/Kconfig | 1 +
+ arch/mips/mm/gup.c | 2 +-
+ arch/parisc/mm/hugetlbpage.c | 2 +-
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/kernel/rtasd.c | 9 +-
+ arch/powerpc/kernel/traps.c | 5 +-
+ arch/powerpc/mm/hash_utils_64.c | 36 +-
+ arch/powerpc/mm/init_32.c | 8 +-
+ arch/powerpc/mm/mmu_context_hash64.c | 3 +-
+ arch/powerpc/mm/pgtable_64.c | 2 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 10 +-
+ arch/powerpc/sysdev/fsl_rio.c | 19 +-
+ arch/powerpc/sysdev/fsl_rio.h | 1 +
+ arch/powerpc/sysdev/fsl_rmu.c | 16 +-
+ arch/s390/Kconfig | 1 +
+ arch/s390/kernel/dumpstack.c | 6 +-
+ arch/s390/kernel/time.c | 8 +-
+ arch/s390/kernel/topology.c | 7 +-
+ arch/s390/mm/vmem.c | 10 +-
+ arch/sh/Kconfig | 1 +
+ arch/sh/mm/hugetlbpage.c | 2 +-
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/compat.h | 7 +
+ arch/sparc/include/asm/syscall.h | 9 +-
+ arch/sparc/mm/hugetlbpage.c | 2 +-
+ arch/tile/Kconfig | 1 +
+ arch/tile/mm/hugetlbpage.c | 2 +-
+ arch/tile/mm/init.c | 11 +-
+ arch/um/kernel/skas/mmu.c | 2 +-
+ arch/unicore32/mm/pgd.c | 2 +-
+ arch/x86/Kconfig | 8 +-
+ arch/x86/boot/Makefile | 6 +
+ arch/x86/boot/compressed/Makefile | 2 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 2 +
+ arch/x86/entry/vdso/Makefile | 2 +
+ arch/x86/include/asm/compat.h | 3 +-
+ arch/x86/include/asm/ftrace.h | 2 +-
+ arch/x86/kernel/Makefile | 5 +
+ arch/x86/kernel/aperture_64.c | 12 +-
+ arch/x86/kernel/apic/Makefile | 4 +
+ arch/x86/kernel/apic/hw_nmi.c | 1 -
+ arch/x86/kernel/cpu/Makefile | 4 +
+ arch/x86/kernel/dumpstack.c | 5 +-
+ arch/x86/kernel/machine_kexec_64.c | 46 +
+ arch/x86/kernel/process_64.c | 2 +-
+ arch/x86/kernel/tboot.c | 2 +-
+ arch/x86/lib/Makefile | 3 +
+ arch/x86/mm/Makefile | 3 +
+ arch/x86/mm/gup.c | 2 +-
+ arch/x86/mm/init.c | 36 +-
+ arch/x86/mm/pageattr.c | 14 +-
+ arch/x86/realmode/rm/Makefile | 2 +
+ block/genhd.c | 2 +-
+ block/partition-generic.c | 11 +
+ drivers/ata/pata_hpt366.c | 13 +-
+ drivers/base/memory.c | 34 +-
+ drivers/base/property.c | 12 +-
+ drivers/block/aoe/aoecmd.c | 4 +-
+ drivers/block/zram/zcomp.c | 24 +
+ drivers/block/zram/zcomp.h | 2 +
+ drivers/block/zram/zram_drv.c | 7 +-
+ drivers/dma/iop-adma.c | 8 +-
+ drivers/dma/mv_xor.c | 4 +-
+ drivers/dma/qcom_bam_dma.c | 14 +-
+ drivers/firewire/core-cdev.c | 4 +-
+ drivers/firmware/efi/efivars.c | 2 +-
+ drivers/firmware/efi/libstub/Makefile | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +-
+ drivers/gpu/drm/drm_edid_load.c | 17 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 13 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 +-
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 13 +-
+ drivers/gpu/drm/omapdrm/omap_gem.c | 4 +-
+ drivers/gpu/drm/sti/sti_cursor.c | 20 +-
+ drivers/gpu/drm/sti/sti_gdp.c | 3 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c | 6 +-
+ drivers/gpu/drm/tegra/gem.c | 11 +-
+ drivers/gpu/drm/vc4/vc4_bo.c | 5 +-
+ drivers/gpu/host1x/cdma.c | 8 +-
+ drivers/gpu/host1x/job.c | 10 +-
+ drivers/hid/uhid.c | 2 +-
+ drivers/ide/hpt366.c | 9 +-
+ drivers/input/input-compat.h | 12 +-
+ drivers/media/platform/coda/coda-bit.c | 10 +-
+ drivers/net/ethernet/freescale/gianfar.c | 2 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 7 +-
+ drivers/net/ethernet/sun/niu.c | 2 +-
+ drivers/net/rionet.c | 277 +-
+ drivers/net/wireless/marvell/mwifiex/debugfs.c | 10 +-
+ drivers/pinctrl/pinmux.c | 13 +-
+ drivers/power/ab8500_btemp.c | 15 +-
+ drivers/power/ab8500_charger.c | 16 +-
+ drivers/power/ab8500_fg.c | 15 +-
+ drivers/power/abx500_chargalg.c | 14 +-
+ drivers/power/charger-manager.c | 27 +-
+ drivers/rapidio/Kconfig | 8 +
+ drivers/rapidio/devices/Makefile | 1 +
+ drivers/rapidio/devices/rio_mport_cdev.c | 2714 ++++++++++++++++++++
+ drivers/rapidio/devices/tsi721.c | 1034 +++++---
+ drivers/rapidio/devices/tsi721.h | 87 +-
+ drivers/rapidio/devices/tsi721_dma.c | 397 ++-
+ drivers/rapidio/rio-driver.c | 12 +
+ drivers/rapidio/rio-scan.c | 135 +-
+ drivers/rapidio/rio.c | 433 +++-
+ drivers/rapidio/rio.h | 5 +
+ .../staging/lustre/lustre/llite/llite_internal.h | 2 +-
+ drivers/usb/common/common.c | 22 +-
+ drivers/video/fbdev/acornfb.c | 4 +-
+ drivers/video/fbdev/amba-clcd-versatile.c | 14 +-
+ drivers/video/fbdev/amba-clcd.c | 4 +-
+ drivers/video/fbdev/atmel_lcdfb.c | 9 +-
+ drivers/video/fbdev/ep93xx-fb.c | 8 +-
+ drivers/video/fbdev/gbefb.c | 8 +-
+ drivers/video/fbdev/imxfb.c | 12 +-
+ drivers/video/fbdev/mx3fb.c | 9 +-
+ drivers/video/fbdev/nuc900fb.c | 8 +-
+ drivers/video/fbdev/omap/lcdc.c | 16 +-
+ drivers/video/fbdev/pxa168fb.c | 8 +-
+ drivers/video/fbdev/pxafb.c | 4 +-
+ drivers/video/fbdev/s3c-fb.c | 7 +-
+ drivers/video/fbdev/s3c2410fb.c | 8 +-
+ drivers/video/fbdev/sa1100fb.c | 8 +-
+ drivers/virtio/virtio_balloon.c | 6 +
+ drivers/xen/Kconfig | 23 +-
+ drivers/xen/balloon.c | 11 +-
+ fs/autofs4/autofs_i.h | 72 +-
+ fs/autofs4/dev-ioctl.c | 57 +-
+ fs/autofs4/expire.c | 84 +-
+ fs/autofs4/init.c | 10 +-
+ fs/autofs4/inode.c | 52 +-
+ fs/autofs4/root.c | 163 +-
+ fs/autofs4/symlink.c | 11 +-
+ fs/autofs4/waitq.c | 78 +-
+ fs/btrfs/tests/btrfs-tests.c | 3 +-
+ fs/buffer.c | 24 +-
+ fs/cifs/cifs_debug.c | 56 +-
+ fs/cifs/cifs_debug.h | 2 +-
+ fs/cifs/cifsfs.c | 6 +-
+ fs/cifs/cifsglob.h | 4 +-
+ fs/eventpoll.c | 2 +-
+ fs/ext4/dir.c | 2 +-
+ fs/ext4/fsync.c | 5 +-
+ fs/mpage.c | 3 +-
+ fs/ocfs2/Makefile | 3 +-
+ fs/ocfs2/alloc.c | 105 +-
+ fs/ocfs2/aops.c | 1147 ++++-----
+ fs/ocfs2/aops.h | 19 +-
+ fs/ocfs2/cluster/heartbeat.c | 191 +-
+ fs/ocfs2/dlm/dlmcommon.h | 21 +-
+ fs/ocfs2/dlm/dlmconvert.c | 30 +-
+ fs/ocfs2/dlm/dlmdomain.c | 11 +-
+ fs/ocfs2/dlm/dlmmaster.c | 124 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 33 +-
+ fs/ocfs2/dlm/dlmthread.c | 7 +
+ fs/ocfs2/file.c | 165 +-
+ fs/ocfs2/filecheck.c | 605 +++++
+ fs/ocfs2/filecheck.h | 48 +
+ fs/ocfs2/inode.c | 203 +-
+ fs/ocfs2/inode.h | 9 +-
+ fs/ocfs2/journal.c | 8 +-
+ fs/ocfs2/localalloc.c | 4 +-
+ fs/ocfs2/mmap.c | 4 +-
+ fs/ocfs2/ocfs2.h | 8 +
+ fs/ocfs2/ocfs2_trace.h | 18 +-
+ fs/ocfs2/quota_global.c | 2 +-
+ fs/ocfs2/resize.c | 2 +-
+ fs/ocfs2/stackglue.c | 3 +-
+ fs/ocfs2/stackglue.h | 2 +
+ fs/ocfs2/super.c | 49 +-
+ fs/ocfs2/super.h | 2 -
+ fs/proc/base.c | 67 +
+ fs/proc/meminfo.c | 31 +-
+ fs/proc/page.c | 8 +-
+ fs/select.c | 8 +-
+ fs/xfs/xfs_aops.c | 11 +-
+ include/asm-generic/atomic-long.h | 6 +-
+ include/asm-generic/bug.h | 6 +
+ include/asm-generic/pgtable.h | 17 +
+ include/linux/auto_dev-ioctl.h | 6 -
+ include/linux/auto_fs.h | 10 +-
+ include/linux/buffer_head.h | 10 +-
+ include/linux/compaction.h | 16 +
+ include/linux/compat.h | 18 +
+ include/linux/cpumask.h | 2 -
+ include/linux/crc64_ecma.h | 56 +
+ include/linux/dma-mapping.h | 25 +-
+ include/linux/fault-inject.h | 5 +-
+ include/linux/freezer.h | 2 +-
+ include/linux/gfp.h | 47 +-
+ include/linux/hardirq.h | 2 +
+ include/linux/hrtimer.h | 12 +-
+ include/linux/kcov.h | 29 +
+ include/linux/kernel.h | 2 +
+ include/linux/kexec.h | 4 +
+ include/linux/kfifo.h | 2 +-
+ include/linux/list_bl.h | 4 +-
+ include/linux/memcontrol.h | 147 +-
+ include/linux/memory.h | 3 +
+ include/linux/memory_hotplug.h | 7 +-
+ include/linux/migrate.h | 6 +-
+ include/linux/mm.h | 103 +-
+ include/linux/mmdebug.h | 3 +-
+ include/linux/mmzone.h | 26 +-
+ include/linux/oom.h | 2 +-
+ include/linux/page-flags-layout.h | 2 +
+ include/linux/page-flags.h | 32 +-
+ include/linux/page_ext.h | 1 +
+ include/linux/page_owner.h | 50 +-
+ include/linux/page_ref.h | 164 ++
+ include/linux/pagemap.h | 22 +-
+ include/linux/percpu.h | 3 -
+ include/linux/poison.h | 4 +
+ include/linux/poll.h | 2 +-
+ include/linux/printk.h | 12 +-
+ include/linux/radix-tree.h | 27 +-
+ include/linux/rio.h | 98 +-
+ include/linux/rio_drv.h | 15 +-
+ include/linux/rio_mport_cdev.h | 271 ++
+ include/linux/rio_regs.h | 3 +
+ include/linux/sched.h | 21 +-
+ include/linux/sched/sysctl.h | 21 -
+ include/linux/sem.h | 1 +
+ include/linux/slab.h | 13 +-
+ include/linux/slab_def.h | 3 +
+ include/linux/slub_def.h | 1 +
+ include/linux/string.h | 9 +-
+ include/linux/swap.h | 1 +
+ include/linux/syscalls.h | 3 +
+ include/linux/tick.h | 2 +-
+ include/linux/trace_events.h | 10 -
+ include/linux/tracepoint-defs.h | 14 +-
+ include/linux/unaligned/access_ok.h | 24 +-
+ include/linux/vm_event_item.h | 2 +
+ include/trace/events/btrfs.h | 2 +-
+ include/trace/events/compaction.h | 57 +-
+ include/trace/events/gfpflags.h | 43 -
+ include/trace/events/huge_memory.h | 40 +-
+ include/trace/events/kmem.h | 2 +-
+ include/trace/events/mmflags.h | 174 ++
+ include/trace/events/page_ref.h | 133 +
+ include/trace/events/vmscan.h | 2 +-
+ include/uapi/asm-generic/unistd.h | 4 +-
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/auto_fs.h | 21 +-
+ include/uapi/linux/auto_fs4.h | 17 +-
+ include/uapi/linux/byteorder/big_endian.h | 24 +-
+ include/uapi/linux/byteorder/little_endian.h | 24 +-
+ include/uapi/linux/kcov.h | 10 +
+ include/uapi/linux/swab.h | 10 +-
+ include/uapi/linux/virtio_balloon.h | 3 +-
+ init/Kconfig | 49 +
+ init/main.c | 5 +-
+ ipc/msg.c | 5 +-
+ ipc/sem.c | 124 +-
+ kernel/Makefile | 12 +
+ kernel/auditsc.c | 4 +-
+ kernel/exit.c | 4 +-
+ kernel/fork.c | 13 +-
+ kernel/hung_task.c | 21 +-
+ kernel/kallsyms.c | 42 +-
+ kernel/kcov.c | 273 ++
+ kernel/kexec.c | 9 +-
+ kernel/kexec_core.c | 6 +
+ kernel/kexec_file.c | 8 +-
+ kernel/locking/Makefile | 3 +
+ kernel/memremap.c | 4 +-
+ kernel/panic.c | 41 +-
+ kernel/printk/Makefile | 1 +
+ kernel/printk/internal.h | 55 +
+ kernel/printk/nmi.c | 222 ++
+ kernel/printk/printk.c | 150 +-
+ kernel/profile.c | 4 +-
+ kernel/ptrace.c | 2 +-
+ kernel/rcu/Makefile | 4 +
+ kernel/sched/Makefile | 4 +
+ kernel/seccomp.c | 4 +-
+ kernel/signal.c | 4 +
+ kernel/sys.c | 5 +-
+ kernel/sys_ni.c | 2 +
+ kernel/sysctl.c | 10 +
+ kernel/time/hrtimer.c | 18 +-
+ kernel/time/tick-sched.c | 10 +-
+ kernel/time/timer.c | 15 +-
+ lib/Kconfig | 7 +
+ lib/Kconfig.debug | 21 +
+ lib/Kconfig.ubsan | 5 +
+ lib/Makefile | 13 +
+ lib/bug.c | 15 +-
+ lib/crc64_ecma.c | 341 +++
+ lib/kstrtox.c | 64 +
+ lib/nmi_backtrace.c | 89 +-
+ lib/radix-tree.c | 182 +-
+ lib/string.c | 45 +-
+ lib/test_printf.c | 53 +
+ lib/vsprintf.c | 75 +
+ mm/Kconfig | 8 +-
+ mm/Kconfig.debug | 65 +-
+ mm/Makefile | 21 +-
+ mm/backing-dev.c | 20 +-
+ mm/compaction.c | 322 ++-
+ mm/debug-pagealloc.c | 127 +-
+ mm/debug.c | 165 +-
+ mm/debug_page_ref.c | 53 +
+ mm/failslab.c | 12 +-
+ mm/filemap.c | 168 +-
+ mm/huge_memory.c | 112 +-
+ mm/internal.h | 34 +-
+ mm/kasan/Makefile | 1 +
+ mm/kmemcheck.c | 3 +
+ mm/ksm.c | 733 +++++-
+ mm/madvise.c | 298 ++-
+ mm/memblock.c | 11 +-
+ mm/memcontrol.c | 223 +-
+ mm/memory-failure.c | 2 -
+ mm/memory.c | 34 +-
+ mm/memory_hotplug.c | 49 +-
+ mm/mempolicy.c | 4 +-
+ mm/mempool.c | 20 +-
+ mm/migrate.c | 41 +-
+ mm/mmap.c | 125 -
+ mm/mprotect.c | 12 +-
+ mm/mremap.c | 4 +-
+ mm/nommu.c | 117 -
+ mm/oom_kill.c | 214 +-
+ mm/page-writeback.c | 62 +-
+ mm/page_alloc.c | 504 +++-
+ mm/page_owner.c | 100 +-
+ mm/page_poison.c | 158 ++
+ mm/pgtable-generic.c | 14 -
+ mm/rmap.c | 16 +-
+ mm/shmem.c | 37 +-
+ mm/slab.c | 1030 ++++----
+ mm/slab.h | 99 +-
+ mm/slab_common.c | 10 +-
+ mm/slub.c | 389 +--
+ mm/truncate.c | 6 +-
+ mm/userfaultfd.c | 3 +-
+ mm/util.c | 154 ++
+ mm/vmalloc.c | 25 +-
+ mm/vmscan.c | 240 +-
+ mm/vmstat.c | 17 +-
+ mm/workingset.c | 170 +-
+ mm/zsmalloc.c | 9 +-
+ net/sctp/socket.c | 2 +-
+ net/xfrm/xfrm_user.c | 2 +-
+ scripts/Makefile.lib | 6 +
+ scripts/Makefile.ubsan | 4 +
+ scripts/gdb/linux/proc.py | 41 +
+ scripts/gdb/vmlinux-gdb.py | 1 +
+ scripts/kallsyms.c | 93 +-
+ scripts/link-vmlinux.sh | 6 +-
+ scripts/namespace.pl | 2 +
+ sound/arm/pxa2xx-pcm-lib.c | 12 +-
+ sound/drivers/pcsp/pcsp.c | 9 +-
+ sound/soc/fsl/imx-pcm-fiq.c | 10 +-
+ sound/soc/nuc900/nuc900-pcm.c | 6 +-
+ sound/soc/omap/omap-pcm.c | 12 +-
+ tools/perf/builtin-kmem.c | 49 +-
+ tools/testing/radix-tree/.gitignore | 2 +
+ tools/testing/radix-tree/Makefile | 20 +
+ tools/testing/radix-tree/find_next_bit.c | 57 +
+ tools/testing/radix-tree/linux.c | 60 +
+ tools/testing/radix-tree/linux/bitops.h | 150 ++
+ tools/testing/radix-tree/linux/bitops/__ffs.h | 43 +
+ tools/testing/radix-tree/linux/bitops/ffs.h | 41 +
+ tools/testing/radix-tree/linux/bitops/ffz.h | 12 +
+ tools/testing/radix-tree/linux/bitops/find.h | 13 +
+ tools/testing/radix-tree/linux/bitops/fls.h | 41 +
+ tools/testing/radix-tree/linux/bitops/fls64.h | 14 +
+ tools/testing/radix-tree/linux/bitops/hweight.h | 11 +
+ tools/testing/radix-tree/linux/bitops/le.h | 53 +
+ tools/testing/radix-tree/linux/bitops/non-atomic.h | 111 +
+ tools/testing/radix-tree/linux/bug.h | 1 +
+ tools/testing/radix-tree/linux/cpu.h | 35 +
+ tools/testing/radix-tree/linux/export.h | 2 +
+ tools/testing/radix-tree/linux/gfp.h | 8 +
+ tools/testing/radix-tree/linux/kernel.h | 35 +
+ tools/testing/radix-tree/linux/kmemleak.h | 1 +
+ tools/testing/radix-tree/linux/mempool.h | 17 +
+ tools/testing/radix-tree/linux/notifier.h | 8 +
+ tools/testing/radix-tree/linux/percpu.h | 7 +
+ tools/testing/radix-tree/linux/preempt.h | 5 +
+ tools/testing/radix-tree/linux/radix-tree.h | 1 +
+ tools/testing/radix-tree/linux/rcupdate.h | 9 +
+ tools/testing/radix-tree/linux/slab.h | 28 +
+ tools/testing/radix-tree/linux/types.h | 28 +
+ tools/testing/radix-tree/main.c | 272 ++
+ tools/testing/radix-tree/rcupdate.c | 86 +
+ tools/testing/radix-tree/regression.h | 8 +
+ tools/testing/radix-tree/regression1.c | 221 ++
+ tools/testing/radix-tree/regression2.c | 126 +
+ tools/testing/radix-tree/regression3.c | 86 +
+ tools/testing/radix-tree/tag_check.c | 332 +++
+ tools/testing/radix-tree/test.c | 219 ++
+ tools/testing/radix-tree/test.h | 40 +
+ tools/vm/page-types.c | 125 +-
+ tools/vm/slabinfo.c | 2 +-
+ 435 files changed, 17692 insertions(+), 5233 deletions(-)
+ create mode 100644 Documentation/filesystems/ocfs2-online-filecheck.txt
+ create mode 100644 Documentation/kcov.txt
+ create mode 100644 Documentation/rapidio/mport_cdev.txt
+ create mode 100644 drivers/rapidio/devices/rio_mport_cdev.c
+ create mode 100644 fs/ocfs2/filecheck.c
+ create mode 100644 fs/ocfs2/filecheck.h
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 include/linux/kcov.h
+ create mode 100644 include/linux/page_ref.h
+ create mode 100644 include/linux/rio_mport_cdev.h
+ delete mode 100644 include/trace/events/gfpflags.h
+ create mode 100644 include/trace/events/mmflags.h
+ create mode 100644 include/trace/events/page_ref.h
+ create mode 100644 include/uapi/linux/kcov.h
+ create mode 100644 kernel/kcov.c
+ create mode 100644 kernel/printk/internal.h
+ create mode 100644 kernel/printk/nmi.c
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 mm/debug_page_ref.c
+ create mode 100644 mm/page_poison.c
+ create mode 100644 scripts/gdb/linux/proc.py
+ create mode 100644 tools/testing/radix-tree/.gitignore
+ create mode 100644 tools/testing/radix-tree/Makefile
+ create mode 100644 tools/testing/radix-tree/find_next_bit.c
+ create mode 100644 tools/testing/radix-tree/linux.c
+ create mode 100644 tools/testing/radix-tree/linux/bitops.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/__ffs.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/ffs.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/ffz.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/find.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/fls.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/fls64.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/hweight.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/le.h
+ create mode 100644 tools/testing/radix-tree/linux/bitops/non-atomic.h
+ create mode 100644 tools/testing/radix-tree/linux/bug.h
+ create mode 100644 tools/testing/radix-tree/linux/cpu.h
+ create mode 100644 tools/testing/radix-tree/linux/export.h
+ create mode 100644 tools/testing/radix-tree/linux/gfp.h
+ create mode 100644 tools/testing/radix-tree/linux/kernel.h
+ create mode 100644 tools/testing/radix-tree/linux/kmemleak.h
+ create mode 100644 tools/testing/radix-tree/linux/mempool.h
+ create mode 100644 tools/testing/radix-tree/linux/notifier.h
+ create mode 100644 tools/testing/radix-tree/linux/percpu.h
+ create mode 100644 tools/testing/radix-tree/linux/preempt.h
+ create mode 100644 tools/testing/radix-tree/linux/radix-tree.h
+ create mode 100644 tools/testing/radix-tree/linux/rcupdate.h
+ create mode 100644 tools/testing/radix-tree/linux/slab.h
+ create mode 100644 tools/testing/radix-tree/linux/types.h
+ create mode 100644 tools/testing/radix-tree/main.c
+ create mode 100644 tools/testing/radix-tree/rcupdate.c
+ create mode 100644 tools/testing/radix-tree/regression.h
+ create mode 100644 tools/testing/radix-tree/regression1.c
+ create mode 100644 tools/testing/radix-tree/regression2.c
+ create mode 100644 tools/testing/radix-tree/regression3.c
+ create mode 100644 tools/testing/radix-tree/tag_check.c
+ create mode 100644 tools/testing/radix-tree/test.c
+ create mode 100644 tools/testing/radix-tree/test.h
+$ git am -3 ../patches/0001-mm-cleanup-pte_alloc-interfaces-fix.patch
+Applying: mm: cleanup *pte_alloc* interfaces fix
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm/mm/mmu.c
+$ git add -A .
+$ git commit -v -a --amend
+[master c42588f278a4] Merge branch 'akpm-current/current'
+ Date: Tue Mar 8 16:22:17 2016 +1100
+$ git am -3 ../patches/0001-mm-cleanup-pte_alloc-interfaces-fix-2.patch
+Applying: mm: cleanup *pte_alloc* interfaces fix 2
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm64/mm/hugetlbpage.c
+$ git add -A .
+$ git commit -v -a --amend
+[master c1e65bfe33c0] Merge branch 'akpm-current/current'
+ Date: Tue Mar 8 16:22:17 2016 +1100
+$ 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/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 873e6d888e25...f627510ed937 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (f627510ed937 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
projects / karo-tx-linux.git / commitdiff