diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 3931 |
1 files changed, 3931 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..9862ccfd58f9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3931 @@ +$ date -R +Tue, 10 Nov 2015 08:54:13 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ce5c2d2c256a arm64: fixup for mm renames +Merging origin/master (ce5c2d2c256a arm64: fixup for mm renames) +$ git merge origin/master +Already up-to-date. +Merging fixes/master (25cb62b76430 Linux 4.3-rc5) +$ 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 (049e6dde7e57 Linux 4.3-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (38850d786a79 ARM: 8449/1: fix bug in vdsomunge swab32 macro) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (95bc06ef049b m68k/defconfig: Update defconfigs for v4.3-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 (977bf062bba3 powerpc/dma: dma_set_coherent_mask() should not be GPL only) +$ 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 (2c302e7e4105 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc/master +Already up-to-date. +Merging net/master (821b414405a7 net: Documentation: Fix default value tcp_limit_output_bytes) +$ git merge net/master +Auto-merging security/selinux/hooks.c +Auto-merging include/linux/netdevice.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/cpsw.txt | 5 + + Documentation/networking/filter.txt | 6 +- + Documentation/networking/ip-sysctl.txt | 2 +- + drivers/bluetooth/btusb.c | 6 +- + drivers/net/bonding/bond_main.c | 1 + + drivers/net/caif/caif_spi.c | 7 +- + drivers/net/dsa/mv88e6171.c | 2 + + drivers/net/dsa/mv88e6352.c | 2 + + drivers/net/dsa/mv88e6xxx.c | 42 +++++++ + drivers/net/dsa/mv88e6xxx.h | 2 + + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 49 +++++++- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 1 - + drivers/net/ethernet/broadcom/Kconfig | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 28 +++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 26 +++-- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 40 ++++--- + drivers/net/ethernet/hisilicon/Kconfig | 3 +- + drivers/net/ethernet/marvell/Kconfig | 1 + + drivers/net/ethernet/qlogic/qed/qed_dev.c | 14 ++- + drivers/net/ethernet/qlogic/qed/qed_int.c | 5 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 3 +- + drivers/net/ethernet/renesas/sh_eth.c | 84 +++++--------- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 +- + drivers/net/ethernet/synopsys/dwc_eth_qos.c | 3 +- + drivers/net/ethernet/ti/cpsw.c | 13 +++ + drivers/net/fjes/fjes_hw.c | 4 +- + drivers/net/macvtap.c | 5 +- + drivers/net/usb/qmi_wwan.c | 21 ++++ + drivers/nfc/nfcmrvl/Kconfig | 2 +- + drivers/nfc/nfcmrvl/fw_dnld.c | 12 +- + drivers/nfc/nfcmrvl/main.c | 15 +-- + drivers/nfc/nfcmrvl/uart.c | 26 ++--- + include/linux/netdevice.h | 1 + + include/linux/tcp.h | 7 ++ + include/net/bluetooth/l2cap.h | 2 + + include/net/dst_metadata.h | 3 +- + include/net/inet_sock.h | 12 ++ + lib/test_bpf.c | 30 +++++ + net/bluetooth/hci_core.c | 17 ++- + net/bluetooth/l2cap_core.c | 20 +++- + net/core/dev.c | 7 +- + net/ipv4/fib_semantics.c | 13 ++- + net/ipv4/igmp.c | 12 +- + net/ipv4/ip_sockglue.c | 45 +++++--- + net/ipv4/netfilter/nf_defrag_ipv4.c | 5 +- + net/ipv4/sysctl_net_ipv4.c | 4 +- + net/ipv4/tcp_ipv4.c | 2 + + net/ipv4/tcp_minisocks.c | 3 - + net/ipv6/addrconf.c | 1 + + net/ipv6/tcp_ipv6.c | 20 ++-- + net/netfilter/nf_nat_redirect.c | 2 +- + net/netfilter/nfnetlink.c | 2 +- + net/netfilter/nft_meta.c | 36 +++--- + net/netfilter/xt_TEE.c | 6 +- + net/netfilter/xt_owner.c | 6 +- + net/packet/af_packet.c | 80 ++++++++----- + net/sched/cls_flow.c | 15 ++- + net/sched/em_meta.c | 138 +++++++++++++++-------- + net/vmw_vsock/vmci_transport.c | 2 +- + security/selinux/hooks.c | 6 +- + security/selinux/netlabel.c | 2 +- + security/smack/smack_netfilter.c | 11 +- + 63 files changed, 629 insertions(+), 315 deletions(-) +Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv4/xfrm4_policy.c +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_policy.c | 46 +++++++++++++++++++++++++++++++++--------- + net/ipv6/xfrm6_policy.c | 53 +++++++++++++++++++++++++++++++++++-------------- + net/xfrm/xfrm_policy.c | 38 ----------------------------------- + 3 files changed, 75 insertions(+), 62 deletions(-) +Merging ipvs/master (6ece90f9a13e netfilter: fix Kconfig dependencies for nf_dup_ipv{4,6}) +$ git merge ipvs/master +Already up-to-date. +Merging sound-current/for-linus (16771c7c7047 ALSA: usb: Add native DSD support for Aune X1S) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/firewire/Kconfig | 1 + + sound/sound_core.c | 2 +- + sound/usb/quirks.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (1266963170f5 PCI: Prevent out of bounds access in numa_node override) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-drivers/master (761d4be5cf66 drivers: net: xgene: fix RGMII 10/100Mb mode) +$ git merge wireless-drivers/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (9ffecb102835 Linux 4.3-rc3) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (f235f664a8af fbcon: initialize blink interval before calling fb_set_par) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (32b88194f71d Linux 4.3-rc7) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (ce5c2d2c256a arm64: fixup for mm renames) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (32b88194f71d Linux 4.3-rc7) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (f256896afdb6 usb: chipidea: otg: gadget module load and unload support) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx27.dtsi | 16 +++-- + drivers/usb/chipidea/ci_hdrc_imx.c | 131 ++++++++++++++++++++++++++++++++----- + drivers/usb/chipidea/debug.c | 2 + + drivers/usb/chipidea/udc.c | 17 +++++ + 4 files changed, 144 insertions(+), 22 deletions(-) +Merging staging.current/staging-linus (7c623cac4939 Merge tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (25cb62b76430 Linux 4.3-rc5) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (e60e063c14b1 HID: hid-gfrm: avoid warning for input_configured API change) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (4afa5f961792 crypto: algif_hash - Only export and import on sockets with data) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/algif_hash.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ 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 (275d7d44d802 module: Fix locking in symbol_put_addr()) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule) +$ 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 (6a13feb9c828 Linux 4.3) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (4008cb3ad223 asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (7c5ae3eb16b1 ARC: cpu_relax() to be compiler barrier even for UP) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/include/asm/processor.h | 4 ---- + arch/arc/kernel/entry-arcv2.S | 19 +++++++++++++++ + arch/arc/kernel/entry-compact.S | 29 ++++++++++++++++++---- + arch/arc/kernel/entry.S | 17 ------------- + arch/arc/lib/memcpy-archs.S | 52 ++++++++++++++++++++-------------------- + arch/arc/mm/tlbex.S | 6 ++--- + arch/arc/plat-axs10x/axs10x.c | 1 - + arch/arc/plat-sim/platform.c | 1 - + 8 files changed, 73 insertions(+), 56 deletions(-) +Merging arm/for-next (4f96dfc97367 Merge branches 'drm-dwhdmi-devel', 'drm-tda998x-devel2' and 'drm-armada-devel' into for-next) +$ git merge arm/for-next +Removing drivers/gpu/drm/armada/armada_slave.h +Removing drivers/gpu/drm/armada/armada_slave.c +Removing drivers/gpu/drm/armada/armada_output.h +Removing drivers/gpu/drm/armada/armada_output.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/armada/Kconfig | 9 - + drivers/gpu/drm/armada/Makefile | 3 +- + drivers/gpu/drm/armada/armada_crtc.c | 258 ++++++++---- + drivers/gpu/drm/armada/armada_crtc.h | 34 +- + drivers/gpu/drm/armada/armada_drm.h | 16 - + drivers/gpu/drm/armada/armada_drv.c | 148 +------ + drivers/gpu/drm/armada/armada_output.c | 142 ------- + drivers/gpu/drm/armada/armada_output.h | 33 -- + drivers/gpu/drm/armada/armada_overlay.c | 147 +++---- + drivers/gpu/drm/armada/armada_slave.c | 139 ------ + drivers/gpu/drm/armada/armada_slave.h | 26 -- + drivers/gpu/drm/bridge/Kconfig | 12 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.c | 653 +++++++++++++++++++++++++++++ + drivers/gpu/drm/bridge/dw_hdmi-audio.h | 14 + + drivers/gpu/drm/bridge/dw_hdmi.c | 391 ++++++++++------- + drivers/gpu/drm/bridge/dw_hdmi.h | 3 + + drivers/gpu/drm/i2c/tda998x_drv.c | 487 ++++++++------------- + drivers/gpu/ipu-v3/ipu-dc.c | 15 +- + drivers/gpu/ipu-v3/ipu-di.c | 129 +++--- + 20 files changed, 1482 insertions(+), 1178 deletions(-) + delete mode 100644 drivers/gpu/drm/armada/armada_output.c + delete mode 100644 drivers/gpu/drm/armada/armada_output.h + delete mode 100644 drivers/gpu/drm/armada/armada_slave.c + delete mode 100644 drivers/gpu/drm/armada/armada_slave.h + create mode 100644 drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.c + create mode 100644 drivers/gpu/drm/bridge/dw_hdmi-audio.h +Merging arm-perf/for-next/perf (6ff33f3902c3 Linux 4.3-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (b6f3dc41232d Merge branch 'next/cleanup' into for-next) +$ git merge arm-soc/for-next +Resolved 'Documentation/devicetree/bindings/mfd/s2mps11.txt' using previous resolution. +Resolved 'arch/arm/boot/dts/sama5d2.dtsi' using previous resolution. +Resolved 'arch/arm/mach-omap2/timer.c' using previous resolution. +Auto-merging include/linux/platform_data/atmel.h +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/cpufreq/Makefile +Auto-merging drivers/cpufreq/Kconfig.arm +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging drivers/clk/shmobile/clk-mstp.c +Auto-merging drivers/clk/berlin/bg2q.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging drivers/base/power/clock_ops.c +Auto-merging arch/arm64/configs/defconfig +Removing arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts +Auto-merging arch/arm64/boot/dts/arm/juno.dts +Auto-merging arch/arm64/boot/dts/arm/juno-r1.dts +Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi +Auto-merging arch/arm64/boot/dts/Makefile +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/mach-sunxi/sunxi.c +Removing arch/arm/mach-shmobile/sh-gpio.h +Removing arch/arm/mach-shmobile/r8a7778.h +Removing arch/arm/mach-shmobile/intc.h +Removing arch/arm/mach-shmobile/console.c +Removing arch/arm/mach-shmobile/clock.h +Removing arch/arm/mach-shmobile/clock.c +Removing arch/arm/mach-shmobile/clock-r8a7778.c +Removing arch/arm/mach-shmobile/board-bockw.c +Removing arch/arm/mach-shmobile/board-bockw-reference.c +Removing arch/arm/mach-shmobile/Makefile.boot +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +Auto-merging arch/arm/mach-s3c64xx/mach-smartq.c +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c +Auto-merging arch/arm/mach-omap2/timer.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/timer.c +Removing arch/arm/mach-omap2/sram34xx.S +Auto-merging arch/arm/mach-omap2/omap-wakeupgen.c +Removing arch/arm/mach-omap2/devices.h +Removing arch/arm/mach-omap2/clkt34xx_dpll3m2.c +Removing arch/arm/mach-omap1/include/mach/board-voiceblue.h +Removing arch/arm/mach-omap1/board-voiceblue.c +Auto-merging arch/arm/mach-imx/gpc.c +Auto-merging arch/arm/mach-exynos/suspend.c +Auto-merging arch/arm/mach-bcm/Kconfig +Auto-merging arch/arm/configs/lpc18xx_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Removing arch/arm/configs/bockw_defconfig +Auto-merging arch/arm/boot/dts/stih407-family.dtsi +Auto-merging arch/arm/boot/dts/sama5d2.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sama5d2.dtsi +Auto-merging arch/arm/boot/dts/rk3288.dtsi +Auto-merging arch/arm/boot/dts/rk3288-veyron.dtsi +Removing arch/arm/boot/dts/r8a7778-bockw-reference.dts +Auto-merging arch/arm/boot/dts/dra7.dtsi +Auto-merging arch/arm/boot/dts/am437x-sk-evm.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/usb/dwc3.txt +Auto-merging Documentation/devicetree/bindings/power/pd-samsung.txt +Auto-merging Documentation/devicetree/bindings/mfd/s2mps11.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/s2mps11.txt +Auto-merging Documentation/devicetree/bindings/board/fsl-board.txt +Removing Documentation/devicetree/bindings/arm/samsung-boards.txt +Auto-merging Documentation/devicetree/bindings/arm/pmu.txt +Auto-merging Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9aacd3958e97] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/Samsung/Bootloader-interface.txt | 5 +- + Documentation/arm/keystone/knav-qmss.txt | 56 ++ + Documentation/arm/sunxi/README | 2 +- + Documentation/devicetree/bindings/arm/amlogic.txt | 10 +- + Documentation/devicetree/bindings/arm/apm/scu.txt | 17 + + Documentation/devicetree/bindings/arm/arm,scpi.txt | 188 +++++ + .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 162 +++- + .../devicetree/bindings/arm/bcm/brcm,nsp.txt | 34 + + .../devicetree/bindings/arm/coherency-fabric.txt | 5 + + Documentation/devicetree/bindings/arm/cpus.txt | 2 + + Documentation/devicetree/bindings/arm/fsl.txt | 16 +- + .../bindings/arm/hisilicon/hisilicon.txt | 4 + + .../devicetree/bindings/arm/keystone/keystone.txt | 20 +- + .../devicetree/bindings/arm/mvebu-cpu-config.txt | 20 + + Documentation/devicetree/bindings/arm/pmu.txt | 1 + + Documentation/devicetree/bindings/arm/psci.txt | 6 + + Documentation/devicetree/bindings/arm/rockchip.txt | 11 + + .../devicetree/bindings/arm/samsung-boards.txt | 27 - + .../bindings/arm/samsung/samsung-boards.txt | 69 ++ + Documentation/devicetree/bindings/arm/shmobile.txt | 10 +- + Documentation/devicetree/bindings/arm/sunxi.txt | 1 + + .../bindings/arm/uniphier/cache-uniphier.txt | 60 ++ + .../{powerpc/fsl/board.txt => board/fsl-board.txt} | 14 +- + .../devicetree/bindings/bus/sunxi-rsb.txt | 47 ++ + .../devicetree/bindings/clock/qcom,gcc.txt | 4 + + .../devicetree/bindings/clock/qcom,mmcc.txt | 4 + + .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 4 +- + .../devicetree/bindings/hwmon/pwm-fan.txt | 29 +- + .../devicetree/bindings/iommu/samsung,sysmmu.txt | 2 +- + .../bindings/memory-controllers/arm,pl172.txt | 8 +- + .../renesas-memory-controllers.txt | 6 +- + Documentation/devicetree/bindings/mfd/s2mps11.txt | 4 + + .../devicetree/bindings/pci/arm,juno-r1-pcie.txt | 10 + + .../bindings/pci/plda,xpressrich3-axi.txt | 12 + + .../power_domain.txt => power/pd-samsung.txt} | 5 +- + .../devicetree/bindings/soc/mediatek/scpsys.txt | 10 +- + .../devicetree/bindings/soc/qcom/qcom,smem.txt | 57 ++ + .../bindings/soc/rockchip/power_domain.txt | 46 ++ + .../bindings/soc/ti/keystone-navigator-qmss.txt | 1 - + .../bindings/timer/mediatek,mtk-timer.txt | 8 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 3 +- + .../devicetree/bindings/vendor-prefixes.txt | 3 + + Documentation/hwmon/scpi-hwmon | 33 + + Documentation/spi/pxa2xx | 6 - + MAINTAINERS | 44 +- + arch/arm/Kconfig | 26 +- + arch/arm/Kconfig.debug | 44 +- + arch/arm/arm-soc-for-next-contents.txt | 287 +++++++ + arch/arm/boot/dts/Makefile | 57 +- + arch/arm/boot/dts/am335x-base0033.dts | 48 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 3 +- + arch/arm/boot/dts/am335x-bonegreen.dts | 53 ++ + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-igep0033.dtsi | 40 +- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 36 +- + arch/arm/boot/dts/am335x-wega.dtsi | 13 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 31 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 2 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 117 ++- + arch/arm/boot/dts/armada-370-db.dts | 3 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 3 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 7 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 9 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 9 +- + arch/arm/boot/dts/armada-370-rd.dts | 3 +- + arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts | 36 + + arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts | 133 ++++ + arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 231 ++++++ + .../dts/armada-370-seagate-personal-cloud-2bay.dts | 51 ++ + .../boot/dts/armada-370-seagate-personal-cloud.dts | 37 + + .../dts/armada-370-seagate-personal-cloud.dtsi | 178 +++++ + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 3 +- + arch/arm/boot/dts/armada-370.dtsi | 37 + + arch/arm/boot/dts/armada-375-db.dts | 4 +- + arch/arm/boot/dts/armada-375.dtsi | 33 + + arch/arm/boot/dts/armada-385-db-ap.dts | 4 +- + arch/arm/boot/dts/armada-385-linksys.dtsi | 4 +- + arch/arm/boot/dts/armada-388-db.dts | 4 +- + arch/arm/boot/dts/armada-388-gp.dts | 19 +- + arch/arm/boot/dts/armada-388-rd.dts | 4 +- + arch/arm/boot/dts/armada-38x.dtsi | 33 + + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 4 +- + arch/arm/boot/dts/armada-xp-db.dts | 4 +- + arch/arm/boot/dts/armada-xp-gp.dts | 4 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 4 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 +- + arch/arm/boot/dts/armada-xp-matrix.dts | 4 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 90 ++- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 4 +- + arch/arm/boot/dts/armada-xp.dtsi | 35 + + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 118 +++ + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 27 + + arch/arm/boot/dts/at91rm9200.dtsi | 8 +- + arch/arm/boot/dts/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 + + arch/arm/boot/dts/at91sam9n12.dtsi | 2 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 8 +- + arch/arm/boot/dts/at91sam9rl.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5.dtsi | 5 +- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 8 + + arch/arm/boot/dts/axp209.dtsi | 5 + + arch/arm/boot/dts/axp22x.dtsi | 143 ++++ + arch/arm/boot/dts/bcm-cygnus.dtsi | 334 ++++---- + arch/arm/boot/dts/bcm-nsp.dtsi | 119 +++ + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 30 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 23 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 8 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 + + arch/arm/boot/dts/bcm2835.dtsi | 64 +- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 11 + + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 1 + + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 106 +++ + arch/arm/boot/dts/bcm7445.dtsi | 84 ++ + arch/arm/boot/dts/bcm911360_entphn.dts | 28 +- + arch/arm/boot/dts/bcm911360k.dts | 9 +- + arch/arm/boot/dts/bcm958300k.dts | 44 +- + arch/arm/boot/dts/bcm958305k.dts | 40 +- + arch/arm/boot/dts/bcm958625k.dts | 57 ++ + arch/arm/boot/dts/bcm9hmidc.dtsi | 42 + + arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 3 +- + arch/arm/boot/dts/berlin2.dtsi | 23 + + arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 3 +- + arch/arm/boot/dts/berlin2cd.dtsi | 20 + + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 3 +- + arch/arm/boot/dts/berlin2q.dtsi | 23 + + arch/arm/boot/dts/cx92755.dtsi | 7 + + arch/arm/boot/dts/cx92755_equinox.dts | 9 + + arch/arm/boot/dts/dove.dtsi | 17 +- + arch/arm/boot/dts/dra7-evm.dts | 222 +++++- + arch/arm/boot/dts/dra7.dtsi | 60 ++ + arch/arm/boot/dts/dra72-evm.dts | 162 +++- + arch/arm/boot/dts/dra72x.dtsi | 21 + + arch/arm/boot/dts/dra74x.dtsi | 51 ++ + arch/arm/boot/dts/efm32gg-dk3750.dts | 8 +- + arch/arm/boot/dts/efm32gg.dtsi | 32 +- + arch/arm/boot/dts/exynos3250-monk.dts | 9 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 11 +- + arch/arm/boot/dts/exynos3250.dtsi | 4 +- + arch/arm/boot/dts/exynos4.dtsi | 8 + + arch/arm/boot/dts/exynos4210-origen.dts | 15 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 3 +- + arch/arm/boot/dts/exynos4210-trats.dts | 31 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 44 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 27 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 45 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 8 +- + arch/arm/boot/dts/exynos4412-origen.dts | 15 +- + arch/arm/boot/dts/exynos4412-tiny4412.dts | 9 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 140 ++-- + arch/arm/boot/dts/exynos5250-arndale.dts | 8 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 684 ++++++++++++++++ + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 47 ++ + arch/arm/boot/dts/exynos5250-snow.dts | 671 +--------------- + arch/arm/boot/dts/exynos5250.dtsi | 4 + + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 3 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 9 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 14 +- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 61 ++ + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 102 +-- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 51 ++ + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 51 ++ + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 48 ++ + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 5 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 9 +- + arch/arm/boot/dts/hi3620-hi4511.dts | 3 +- + arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 2 +- + arch/arm/boot/dts/imx23.dtsi | 6 +- + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-m28evk.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 6 +- + arch/arm/boot/dts/imx31.dtsi | 2 +- + arch/arm/boot/dts/imx35.dtsi | 2 +- + arch/arm/boot/dts/imx50-evk.dts | 2 +- + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx6dl-nit6xlite.dts | 49 ++ + arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 44 +- + arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +- + arch/arm/boot/dts/imx6dl-sabrelite.dts | 40 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-nitrogen6_max.dts | 53 ++ + arch/arm/boot/dts/imx6q-nitrogen6x.dts | 44 +- + arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +- + arch/arm/boot/dts/imx6q-sabrelite.dts | 40 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 630 +++++++++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 873 ++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 189 ++++- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 118 ++- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 12 +- + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 21 +- + arch/arm/boot/dts/imx6sx-sdb-reva.dts | 4 +- + arch/arm/boot/dts/imx6sx-sdb.dts | 4 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 22 + + arch/arm/boot/dts/imx6ul.dtsi | 29 + + arch/arm/boot/dts/imx7d-pinfunc.h | 122 ++- + arch/arm/boot/dts/imx7d-sdb.dts | 100 ++- + arch/arm/boot/dts/imx7d.dtsi | 165 ++++ + arch/arm/boot/dts/k2e-evm.dts | 2 +- + arch/arm/boot/dts/k2e-netcp.dtsi | 23 + + arch/arm/boot/dts/k2e.dtsi | 3 + + arch/arm/boot/dts/k2hk-evm.dts | 2 +- + arch/arm/boot/dts/k2hk-netcp.dtsi | 24 + + arch/arm/boot/dts/k2hk.dtsi | 3 + + arch/arm/boot/dts/k2l-evm.dts | 2 +- + arch/arm/boot/dts/k2l-netcp.dtsi | 23 + + arch/arm/boot/dts/k2l.dtsi | 3 + + arch/arm/boot/dts/keystone.dtsi | 7 +- + arch/arm/boot/dts/kirkwood.dtsi | 29 +- + arch/arm/boot/dts/lpc18xx.dtsi | 134 ++++ + arch/arm/boot/dts/lpc4350-hitex-eval.dts | 175 ++++ + arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 95 +++ + arch/arm/boot/dts/ls1021a-twr.dts | 13 + + arch/arm/boot/dts/ls1021a.dtsi | 44 ++ + arch/arm/boot/dts/meson8b-mxq.dts | 67 ++ + arch/arm/boot/dts/meson8b-odroidc1.dts | 67 ++ + arch/arm/boot/dts/meson8b.dtsi | 186 +++++ + arch/arm/boot/dts/mt8127.dtsi | 27 + + arch/arm/boot/dts/mt8135-evbp1.dts | 23 - + arch/arm/boot/dts/mt8135.dtsi | 27 + + arch/arm/boot/dts/nspire.dtsi | 2 +- + arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 6 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +- + arch/arm/boot/dts/omap3-beagle.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-evm-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 10 +- + arch/arm/boot/dts/omap3-gta04a5.dts | 2 +- + arch/arm/boot/dts/omap3-igep.dtsi | 70 +- + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 60 +- + arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 2 +- + arch/arm/boot/dts/omap3-igep0020.dts | 11 +- + arch/arm/boot/dts/omap3-igep0030-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 2 +- + arch/arm/boot/dts/omap3-igep0030.dts | 2 +- + arch/arm/boot/dts/omap3-ldp.dts | 2 +- + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 4 +- + arch/arm/boot/dts/omap3-lilly-dbb056.dts | 4 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-base.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +- + arch/arm/boot/dts/omap3-pandora-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-tao3530.dtsi | 4 +- + arch/arm/boot/dts/omap3-zoom3.dts | 2 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 4 +- + arch/arm/boot/dts/omap4-sdp.dts | 6 +- + arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 2 +- + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +- + arch/arm/boot/dts/omap4460.dtsi | 2 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 655 +++++++++++++++ + arch/arm/boot/dts/omap5-cm-t54.dts | 2 +- + arch/arm/boot/dts/omap5-igep0050.dts | 54 ++ + arch/arm/boot/dts/omap5-uevm.dts | 618 +-------------- + arch/arm/boot/dts/orion5x.dtsi | 22 +- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 48 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 60 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 43 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 95 ++- + arch/arm/boot/dts/qcom-pm8941.dtsi | 24 +- + arch/arm/boot/dts/r8a7778-bockw-reference.dts | 139 ---- + arch/arm/boot/dts/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 6 +- + arch/arm/boot/dts/r8a7790-lager.dts | 16 +- + arch/arm/boot/dts/r8a7790.dtsi | 2 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 9 +- + arch/arm/boot/dts/r8a7791-porter.dts | 282 +++++++ + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7794-silk.dts | 114 +++ + arch/arm/boot/dts/r8a7794.dtsi | 326 +++++++- + arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi | 41 + + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 + + arch/arm/boot/dts/rk3066a-marsboard.dts | 8 + + arch/arm/boot/dts/rk3066a-rayeager.dts | 2 + + arch/arm/boot/dts/rk3188-radxarock.dts | 21 + + arch/arm/boot/dts/rk3188.dtsi | 20 + + arch/arm/boot/dts/rk3288-firefly.dtsi | 55 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 85 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 277 +++++++ + arch/arm/boot/dts/rk3288-rock2-square.dts | 167 ++++ + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 176 +++++ + arch/arm/boot/dts/rk3288-veyron.dtsi | 12 - + arch/arm/boot/dts/rk3288.dtsi | 134 +++- + arch/arm/boot/dts/s3c2416.dtsi | 2 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 2 +- + arch/arm/boot/dts/s5pv210-goni.dts | 4 +- + arch/arm/boot/dts/sama5d2-pinfunc.h | 880 +++++++++++++++++++++ + arch/arm/boot/dts/sama5d2.dtsi | 154 +++- + arch/arm/boot/dts/sama5d3.dtsi | 5 +- + arch/arm/boot/dts/sama5d3_mci2.dtsi | 6 +- + arch/arm/boot/dts/sama5d3xmb.dtsi | 2 + + arch/arm/boot/dts/sama5d4.dtsi | 49 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/socfpga.dtsi | 135 ++-- + arch/arm/boot/dts/socfpga_arria10.dtsi | 8 + + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 27 + + arch/arm/boot/dts/stih407-b2120.dts | 1 + + arch/arm/boot/dts/stih407-family.dtsi | 74 +- + arch/arm/boot/dts/stih407-pinctrl.dtsi | 390 ++++++++- + arch/arm/boot/dts/stih407.dtsi | 13 - + arch/arm/boot/dts/stih410-b2120.dts | 25 + + arch/arm/boot/dts/stih410.dtsi | 23 +- + arch/arm/boot/dts/stih418-b2199.dts | 8 + + arch/arm/boot/dts/stih418-clock.dtsi | 2 +- + arch/arm/boot/dts/stih418.dtsi | 6 + + arch/arm/boot/dts/stihxxx-b2120.dtsi | 14 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 + + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 12 + + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 4 + + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 11 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 226 ++++++ + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 117 ++- + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 227 ++++++ + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 15 + + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 23 + + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 12 + + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 58 +- + arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 78 ++ + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 199 +++++ + arch/arm/boot/dts/sun4i-a10.dtsi | 31 + + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 159 ++++ + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 2 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 224 ++++++ + arch/arm/boot/dts/sun5i-a10s.dtsi | 35 +- + arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts | 227 ++++++ + arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 60 ++ + arch/arm/boot/dts/sun5i-a13.dtsi | 10 + + arch/arm/boot/dts/sun5i-q8-common.dtsi | 180 +++++ + arch/arm/boot/dts/sun5i-r8-chip.dts | 218 +++++ + arch/arm/boot/dts/sun5i-r8.dtsi | 59 ++ + arch/arm/boot/dts/sun5i.dtsi | 52 ++ + arch/arm/boot/dts/sun6i-a31-colombus.dts | 36 + + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 132 ++-- + arch/arm/boot/dts/sun6i-a31.dtsi | 31 +- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 255 ++++++ + arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 140 ++++ + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 153 ++++ + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 194 +++++ + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 134 ++++ + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 74 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 23 + + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 4 + + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 198 +++++ + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 12 + + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 47 ++ + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 + + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 29 + + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 29 + + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 65 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 54 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 33 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 226 ++++++ + arch/arm/boot/dts/sun7i-a20.dtsi | 39 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 70 +- + arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 145 ++++ + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts | 55 +- + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 137 +--- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 65 ++ + arch/arm/boot/dts/sun8i-a23.dtsi | 25 + + arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts | 89 +-- + arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts | 134 +--- + arch/arm/boot/dts/sun8i-a33-q8-tablet.dts | 65 ++ + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 4 + + arch/arm/boot/dts/sun8i-a33.dtsi | 45 ++ + arch/arm/boot/dts/sun8i-q8-common.dtsi | 101 +++ + arch/arm/boot/dts/sun9i-a80.dtsi | 2 +- + arch/arm/boot/dts/sunxi-q8-common.dtsi | 83 ++ + arch/arm/boot/dts/tegra124-nyan.dtsi | 15 +- + arch/arm/boot/dts/tegra124.dtsi | 20 +- + arch/arm/boot/dts/tegra20.dtsi | 4 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 13 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 214 +++-- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 9 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 196 +++-- + arch/arm/boot/dts/tegra30.dtsi | 10 +- + arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 8 +- + arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 20 +- + arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts | 8 +- + arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 8 +- + arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 21 +- + arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 34 +- + arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 8 +- + arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 21 +- + arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 8 +- + arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 20 +- + arch/arm/boot/dts/uniphier-proxstream2-gentil.dts | 78 ++ + arch/arm/boot/dts/uniphier-proxstream2-vodka.dts | 78 ++ + arch/arm/boot/dts/uniphier-proxstream2.dtsi | 23 +- + arch/arm/boot/dts/vf-colibri.dtsi | 39 + + arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 5 + + arch/arm/boot/dts/vf500-colibri.dtsi | 47 ++ + arch/arm/boot/dts/vf610-twr.dts | 47 ++ + arch/arm/boot/dts/vfxxx.dtsi | 11 + + arch/arm/boot/dts/wm8750.dtsi | 2 +- + arch/arm/configs/at91_dt_defconfig | 15 - + arch/arm/configs/bockw_defconfig | 133 ---- + arch/arm/configs/exynos_defconfig | 18 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/keystone_defconfig | 54 +- + arch/arm/configs/lpc18xx_defconfig | 26 +- + arch/arm/configs/multi_v7_defconfig | 48 +- + arch/arm/configs/mvebu_v7_defconfig | 9 +- + arch/arm/configs/qcom_defconfig | 8 +- + arch/arm/configs/sama5_defconfig | 16 +- + arch/arm/configs/shmobile_defconfig | 4 +- + arch/arm/configs/socfpga_defconfig | 2 + + arch/arm/configs/sunxi_defconfig | 4 + + arch/arm/configs/tegra_defconfig | 10 +- + arch/arm/include/asm/hardware/cache-uniphier.h | 46 ++ + arch/arm/include/debug/at91.S | 18 +- + arch/arm/kernel/irq.c | 3 + + arch/arm/kernel/psci_smp.c | 4 +- + arch/arm/mach-at91/pm_suspend.S | 2 + + arch/arm/mach-bcm/Kconfig | 15 + + arch/arm/mach-bcm/Makefile | 5 +- + arch/arm/mach-bcm/bcm_nsp.c | 25 + + arch/arm/mach-bcm/brcmstb.c | 9 + + arch/arm/mach-berlin/berlin.c | 6 + + arch/arm/mach-berlin/platsmp.c | 38 +- + arch/arm/mach-cns3xxx/pcie.c | 71 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 4 +- + arch/arm/mach-davinci/clock.c | 16 +- + arch/arm/mach-digicolor/Kconfig | 3 + + arch/arm/mach-exynos/suspend.c | 3 +- + arch/arm/mach-imx/common.h | 1 + + arch/arm/mach-imx/gpc.c | 8 +- + arch/arm/mach-imx/mach-imx6ul.c | 9 + + arch/arm/mach-imx/mach-imx7d.c | 74 ++ + arch/arm/mach-imx/pm-imx6.c | 46 +- + arch/arm/mach-imx/suspend-imx6.S | 3 + + arch/arm/mach-keystone/keystone.c | 3 + + arch/arm/mach-mediatek/Makefile | 3 + + arch/arm/mach-mediatek/mediatek.c | 27 + + arch/arm/mach-mediatek/platsmp.c | 141 ++++ + arch/arm/mach-meson/Kconfig | 5 + + arch/arm/mach-meson/meson.c | 1 + + arch/arm/mach-mvebu/board-v7.c | 35 - + arch/arm/mach-mvebu/coherency.c | 60 ++ + arch/arm/mach-mvebu/pmsu.c | 33 +- + arch/arm/mach-omap1/Kconfig | 7 - + arch/arm/mach-omap1/Makefile | 1 - + arch/arm/mach-omap1/board-voiceblue.c | 296 ------- + arch/arm/mach-omap1/include/mach/board-voiceblue.h | 19 - + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/Makefile | 3 - + arch/arm/mach-omap2/board-generic.c | 12 +- + arch/arm/mach-omap2/board-ldp.c | 2 +- + arch/arm/mach-omap2/board-rx51.c | 2 +- + arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 122 --- + arch/arm/mach-omap2/common.h | 3 +- + arch/arm/mach-omap2/devices.c | 53 -- + arch/arm/mach-omap2/devices.h | 19 - + arch/arm/mach-omap2/id.c | 30 +- + arch/arm/mach-omap2/omap-hotplug.c | 2 +- + arch/arm/mach-omap2/omap-wakeupgen.c | 10 +- + .../omap_hwmod_33xx_43xx_interconnect_data.c | 20 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 29 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 10 - + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 3 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 30 - + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/powerdomains3xxx_data.c | 2 +- + arch/arm/mach-omap2/soc.h | 195 ++--- + arch/arm/mach-omap2/sram.c | 25 - + arch/arm/mach-omap2/sram.h | 14 - + arch/arm/mach-omap2/sram34xx.S | 346 -------- + arch/arm/mach-omap2/timer.c | 162 ++-- + arch/arm/mach-omap2/vc.c | 4 - + arch/arm/mach-orion5x/Kconfig | 3 + + arch/arm/mach-orion5x/dns323-setup.c | 53 +- + arch/arm/mach-orion5x/tsx09-common.c | 49 +- + arch/arm/mach-prima2/hotplug.c | 2 +- + arch/arm/mach-pxa/cm-x300.c | 9 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 9 +- + arch/arm/mach-pxa/devices.c | 20 + + arch/arm/mach-pxa/ezx.c | 9 +- + arch/arm/mach-pxa/hx4700.c | 3 - + arch/arm/mach-pxa/icontrol.c | 2 - + arch/arm/mach-pxa/include/mach/magician.h | 70 +- + arch/arm/mach-pxa/include/mach/pxa27x.h | 2 +- + arch/arm/mach-pxa/lpd270.c | 9 +- + arch/arm/mach-pxa/magician.c | 680 ++++++++++------ + arch/arm/mach-pxa/mainstone.c | 19 +- + arch/arm/mach-pxa/mioa701.c | 11 +- + arch/arm/mach-pxa/palm27x.c | 9 +- + arch/arm/mach-pxa/palmtc.c | 9 +- + arch/arm/mach-pxa/palmte2.c | 9 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 9 +- + arch/arm/mach-pxa/pxa27x.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 21 +- + arch/arm/mach-pxa/tavorevb.c | 13 +- + arch/arm/mach-pxa/viper.c | 9 +- + arch/arm/mach-pxa/z2.c | 15 +- + arch/arm/mach-pxa/zylonite.c | 9 +- + arch/arm/mach-qcom/platsmp.c | 2 +- + arch/arm/mach-realview/hotplug.c | 2 +- + arch/arm/mach-s3c24xx/mach-h1940.c | 10 +- + arch/arm/mach-s3c24xx/mach-rx1950.c | 8 +- + arch/arm/mach-s3c64xx/dev-backlight.c | 4 - + arch/arm/mach-s3c64xx/mach-crag6410.c | 9 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 9 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 9 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 8 +- + arch/arm/mach-shmobile/Kconfig | 73 -- + arch/arm/mach-shmobile/Makefile | 14 +- + arch/arm/mach-shmobile/Makefile.boot | 12 - + arch/arm/mach-shmobile/board-bockw-reference.c | 86 -- + arch/arm/mach-shmobile/board-bockw.c | 737 ----------------- + arch/arm/mach-shmobile/clock-r8a7778.c | 342 -------- + arch/arm/mach-shmobile/clock.c | 47 -- + arch/arm/mach-shmobile/clock.h | 42 - + arch/arm/mach-shmobile/common.h | 5 - + arch/arm/mach-shmobile/console.c | 27 - + arch/arm/mach-shmobile/intc.h | 295 ------- + arch/arm/mach-shmobile/platsmp-apmu.c | 4 +- + arch/arm/mach-shmobile/pm-r8a7779.c | 99 --- + arch/arm/mach-shmobile/pm-rmobile.c | 39 +- + arch/arm/mach-shmobile/pm-rmobile.h | 9 - + arch/arm/mach-shmobile/r8a7778.h | 78 -- + arch/arm/mach-shmobile/r8a7779.h | 8 - + arch/arm/mach-shmobile/setup-r8a7778.c | 563 +------------ + arch/arm/mach-shmobile/sh-gpio.h | 29 - + arch/arm/mach-shmobile/timer.c | 21 - + arch/arm/mach-spear/hotplug.c | 2 +- + arch/arm/mach-sunxi/sunxi.c | 3 +- + arch/arm/mach-tegra/board-paz00.c | 4 +- + arch/arm/mach-tegra/hotplug.c | 2 +- + arch/arm/mach-uniphier/Makefile | 2 +- + arch/arm/mach-uniphier/headsmp.S | 43 + + arch/arm/mach-uniphier/platsmp.c | 185 ++++- + arch/arm/mach-ux500/hotplug.c | 2 +- + arch/arm/mach-vexpress/hotplug.c | 2 +- + arch/arm/mm/Kconfig | 10 + + arch/arm/mm/Makefile | 1 + + arch/arm/mm/cache-uniphier.c | 555 +++++++++++++ + arch/arm64/Kconfig.platforms | 12 +- + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/altera/Makefile | 5 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 358 +++++++++ + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 39 + + arch/arm64/boot/dts/apm/Makefile | 1 + + arch/arm64/boot/dts/apm/apm-merlin.dts | 72 ++ + arch/arm64/boot/dts/apm/apm-mustang.dts | 12 + + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 271 +++++++ + arch/arm64/boot/dts/apm/apm-storm.dtsi | 17 + + arch/arm64/boot/dts/arm/juno-base.dtsi | 59 ++ + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 15 + + arch/arm64/boot/dts/arm/juno-r1.dts | 52 ++ + arch/arm64/boot/dts/arm/juno.dts | 32 + + .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 2 +- + arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi | 1 + + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 103 +++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 7 + + arch/arm64/boot/dts/freescale/Makefile | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 204 +++++ + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 166 ++++ + .../{fsl-ls2085a-simu.dts => fsl-ls2080a-simu.dts} | 25 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 515 ++++++++++++ + arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi | 163 ---- + arch/arm64/boot/dts/hisilicon/Makefile | 2 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 43 +- + arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 36 + + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 271 +++++++ + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/berlin4ct-stb.dts | 66 ++ + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 120 +++ + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 18 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 62 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 30 + + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 76 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 47 ++ + arch/arm64/configs/defconfig | 14 +- + arch/arm64/kernel/psci.c | 14 - + drivers/base/power/clock_ops.c | 6 +- + drivers/bus/Kconfig | 11 + + drivers/bus/Makefile | 1 + + drivers/bus/sunxi-rsb.c | 783 ++++++++++++++++++ + drivers/clk/Kconfig | 10 + + drivers/clk/Makefile | 1 + + drivers/clk/berlin/bg2q.c | 14 +- + drivers/clk/clk-scpi.c | 325 ++++++++ + drivers/clk/samsung/clk-exynos5250.c | 14 +- + drivers/clk/shmobile/clk-mstp.c | 4 + + drivers/clk/sunxi/clk-sunxi.c | 1 + + drivers/clocksource/Kconfig | 8 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/tcb_clksrc.c | 12 +- + drivers/clocksource/timer-atmel-st.c | 31 +- + drivers/clocksource/timer-ti-32k.c | 126 +++ + drivers/cpufreq/Kconfig.arm | 10 + + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/scpi-cpufreq.c | 124 +++ + drivers/firmware/Kconfig | 26 + + drivers/firmware/Makefile | 4 +- + drivers/firmware/arm_scpi.c | 771 ++++++++++++++++++ + drivers/firmware/psci.c | 108 ++- + drivers/firmware/qcom_scm-32.c | 6 +- + drivers/firmware/raspberrypi.c | 260 ++++++ + drivers/hwmon/Kconfig | 8 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/scpi-hwmon.c | 288 +++++++ + drivers/memory/pl172.c | 26 +- + drivers/misc/atmel_tclib.c | 4 + + drivers/pwm/pwm-atmel-tcb.c | 26 +- + drivers/soc/Kconfig | 2 + + drivers/soc/Makefile | 2 + + drivers/soc/brcmstb/Kconfig | 9 + + drivers/soc/brcmstb/Makefile | 1 + + drivers/soc/brcmstb/biuctrl.c | 116 +++ + drivers/soc/brcmstb/common.c | 33 + + drivers/soc/mediatek/mtk-pmic-wrap.c | 10 +- + drivers/soc/mediatek/mtk-scpsys.c | 83 +- + drivers/soc/qcom/Kconfig | 17 +- + drivers/soc/qcom/smd-rpm.c | 68 +- + drivers/soc/qcom/smd.c | 296 ++++--- + drivers/soc/qcom/smem.c | 368 +++++---- + drivers/soc/rockchip/Kconfig | 18 + + drivers/soc/rockchip/Makefile | 4 + + drivers/soc/rockchip/pm_domains.c | 490 ++++++++++++ + drivers/soc/ti/knav_qmss.h | 3 +- + drivers/soc/ti/knav_qmss_acc.c | 14 +- + drivers/soc/ti/knav_qmss_queue.c | 67 +- + include/dt-bindings/clock/berlin2q.h | 1 + + include/dt-bindings/clock/exynos5250.h | 4 +- + include/dt-bindings/power/rk3288-power.h | 31 + + include/linux/atmel_tc.h | 1 + + include/linux/mfd/syscon/imx7-iomuxc-gpr.h | 47 ++ + include/linux/platform_data/atmel.h | 8 - + include/linux/psci.h | 2 + + include/linux/qcom_scm.h | 2 + + include/linux/scpi_protocol.h | 78 ++ + include/linux/soc/brcmstb/brcmstb.h | 10 + + include/linux/soc/qcom/smd.h | 11 + + include/linux/soc/qcom/smem.h | 2 +- + include/linux/spi/pxa2xx_spi.h | 1 - + include/linux/sunxi-rsb.h | 105 +++ + include/soc/bcm2835/raspberrypi-firmware.h | 120 +++ + include/soc/brcmstb/common.h | 15 + + include/uapi/linux/psci.h | 18 + + 660 files changed, 28619 insertions(+), 8670 deletions(-) + create mode 100644 Documentation/arm/keystone/knav-qmss.txt + create mode 100644 Documentation/devicetree/bindings/arm/apm/scu.txt + create mode 100644 Documentation/devicetree/bindings/arm/arm,scpi.txt + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt + create mode 100644 Documentation/devicetree/bindings/arm/mvebu-cpu-config.txt + delete mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/uniphier/cache-uniphier.txt + rename Documentation/devicetree/bindings/{powerpc/fsl/board.txt => board/fsl-board.txt} (90%) + create mode 100644 Documentation/devicetree/bindings/bus/sunxi-rsb.txt + create mode 100644 Documentation/devicetree/bindings/pci/arm,juno-r1-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/plda,xpressrich3-axi.txt + rename Documentation/devicetree/bindings/{arm/exynos/power_domain.txt => power/pd-samsung.txt} (93%) + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt + create mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt + create mode 100644 Documentation/hwmon/scpi-hwmon + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-bonegreen.dts + create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts + create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts + create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi + create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dts + create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud.dts + create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi + create mode 100644 arch/arm/boot/dts/axp22x.dtsi + create mode 100644 arch/arm/boot/dts/bcm-nsp.dtsi + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts + create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r7000.dts + create mode 100644 arch/arm/boot/dts/bcm958625k.dts + create mode 100644 arch/arm/boot/dts/bcm9hmidc.dtsi + create mode 100644 arch/arm/boot/dts/exynos5250-snow-common.dtsi + create mode 100644 arch/arm/boot/dts/exynos5250-snow-rev5.dts + create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi + create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu4.dts + create mode 100644 arch/arm/boot/dts/imx6dl-nit6xlite.dts + create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_max.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi + create mode 100644 arch/arm/boot/dts/meson8b-mxq.dts + create mode 100644 arch/arm/boot/dts/meson8b-odroidc1.dts + create mode 100644 arch/arm/boot/dts/meson8b.dtsi + create mode 100644 arch/arm/boot/dts/omap5-board-common.dtsi + create mode 100644 arch/arm/boot/dts/omap5-igep0050.dts + delete mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts + create mode 100644 arch/arm/boot/dts/r8a7791-porter.dts + create mode 100644 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-rock2-som.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-rock2-square.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-jaq.dts + create mode 100644 arch/arm/boot/dts/sama5d2-pinfunc.h + create mode 100644 arch/arm/boot/dts/sun4i-a10-inet1.dts + create mode 100644 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts + create mode 100644 arch/arm/boot/dts/sun4i-a10-pcduino2.dts + create mode 100644 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts + create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts + create mode 100644 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts + create mode 100644 arch/arm/boot/dts/sun5i-q8-common.dtsi + create mode 100644 arch/arm/boot/dts/sun5i-r8-chip.dts + create mode 100644 arch/arm/boot/dts/sun5i-r8.dtsi + create mode 100644 arch/arm/boot/dts/sun6i-a31s-primo81.dts + create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi + create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s.dts + create mode 100644 arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts + create mode 100644 arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts + mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts + mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts + mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts + mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts + create mode 100644 arch/arm/boot/dts/sun8i-a33-q8-tablet.dts + create mode 100644 arch/arm/boot/dts/sun8i-q8-common.dtsi + create mode 100644 arch/arm/boot/dts/sunxi-q8-common.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-proxstream2-gentil.dts + create mode 100644 arch/arm/boot/dts/uniphier-proxstream2-vodka.dts + delete mode 100644 arch/arm/configs/bockw_defconfig + create mode 100644 arch/arm/include/asm/hardware/cache-uniphier.h + create mode 100644 arch/arm/mach-bcm/bcm_nsp.c + create mode 100644 arch/arm/mach-mediatek/platsmp.c + delete mode 100644 arch/arm/mach-omap1/board-voiceblue.c + delete mode 100644 arch/arm/mach-omap1/include/mach/board-voiceblue.h + delete mode 100644 arch/arm/mach-omap2/clkt34xx_dpll3m2.c + delete mode 100644 arch/arm/mach-omap2/devices.h + delete mode 100644 arch/arm/mach-omap2/sram34xx.S + delete mode 100644 arch/arm/mach-shmobile/Makefile.boot + delete mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-bockw.c + delete mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c + delete mode 100644 arch/arm/mach-shmobile/clock.c + delete mode 100644 arch/arm/mach-shmobile/clock.h + delete mode 100644 arch/arm/mach-shmobile/console.c + delete mode 100644 arch/arm/mach-shmobile/intc.h + delete mode 100644 arch/arm/mach-shmobile/r8a7778.h + delete mode 100644 arch/arm/mach-shmobile/sh-gpio.h + create mode 100644 arch/arm/mach-uniphier/headsmp.S + create mode 100644 arch/arm/mm/cache-uniphier.c + create mode 100644 arch/arm64/boot/dts/altera/Makefile + create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi + create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts + create mode 100644 arch/arm64/boot/dts/apm/apm-merlin.dts + create mode 100644 arch/arm64/boot/dts/apm/apm-shadowcat.dtsi + create mode 120000 arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts + rename arch/arm64/boot/dts/freescale/{fsl-ls2085a-simu.dts => fsl-ls2080a-simu.dts} (81%) + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi + delete mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi + create mode 100644 arch/arm64/boot/dts/hisilicon/hip05-d02.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hip05.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts + create mode 100644 drivers/bus/sunxi-rsb.c + create mode 100644 drivers/clk/clk-scpi.c + create mode 100644 drivers/clocksource/timer-ti-32k.c + create mode 100644 drivers/cpufreq/scpi-cpufreq.c + create mode 100644 drivers/firmware/arm_scpi.c + create mode 100644 drivers/firmware/raspberrypi.c + create mode 100644 drivers/hwmon/scpi-hwmon.c + create mode 100644 drivers/soc/brcmstb/Kconfig + create mode 100644 drivers/soc/brcmstb/Makefile + create mode 100644 drivers/soc/brcmstb/biuctrl.c + create mode 100644 drivers/soc/brcmstb/common.c + create mode 100644 drivers/soc/rockchip/Kconfig + create mode 100644 drivers/soc/rockchip/Makefile + create mode 100644 drivers/soc/rockchip/pm_domains.c + create mode 100644 include/dt-bindings/power/rk3288-power.h + create mode 100644 include/linux/mfd/syscon/imx7-iomuxc-gpr.h + create mode 100644 include/linux/scpi_protocol.h + create mode 100644 include/linux/soc/brcmstb/brcmstb.h + create mode 100644 include/linux/sunxi-rsb.h + create mode 100644 include/soc/bcm2835/raspberrypi-firmware.h + create mode 100644 include/soc/brcmstb/common.h +$ git am -3 ../patches/0001-ARM-mediatek-fixup-for-clocksource_of_init-API-chang.patch +Applying: ARM: mediatek: fixup for clocksource_of_init API change +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/mach-mediatek/mediatek.c +$ git add -A . +$ git commit -v -a --amend +[master 2bbad694c611] Merge remote-tracking branch 'arm-soc/for-next' + Date: Tue Nov 10 09:04:51 2015 +1100 +Merging at91/at91-next (c544ee640869 Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/mach-at91/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/mach-at91/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (27527ea5f2fd Merge branch 'berlin/soc' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-berlin/Kconfig | 3 --- + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 ++++++++++++++++++++++ + 2 files changed, 22 insertions(+), 3 deletions(-) +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 (f843df81257a 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 (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + drivers/soc/ti/knav_qmss_queue.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging mvebu/for-next (2a9e275d2fbf Merge branch 'mvebu/config' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (f2a148747f11 Merge branch 'omap-for-v4.3/fixes' into for-next) +$ git merge omap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 79f8835e83ef] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging qcom/qcom/for-next (fcbba086b456 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/qcom/for-next +Resolved 'drivers/soc/qcom/Kconfig' using previous resolution. +Resolved 'drivers/soc/qcom/smd-rpm.c' using previous resolution. +Auto-merging include/linux/qcom_scm.h +Auto-merging drivers/soc/qcom/smd-rpm.c +CONFLICT (content): Merge conflict in drivers/soc/qcom/smd-rpm.c +Auto-merging drivers/soc/qcom/Kconfig +CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig +Auto-merging drivers/firmware/qcom_scm-32.c +Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 676c06632ffc] Merge remote-tracking branch 'qcom/qcom/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + 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 + + include/linux/qcom_scm.h | 6 + + 7 files changed, 424 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt +Merging renesas/next (c7aba848d39f Merge branches 'heads/defconfig-for-v4.4' and 'heads/dt-for-v4.4' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (55e899c44d10 Merge branch 'v4.4-armsoc/drivers' into for-next) +$ git merge rockchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (4ccfae394061 Merge branch 'v4.4-samsung-defconfig' into for-next) +$ git merge samsung/for-next +Resolved 'drivers/soc/Kconfig' using previous resolution. +Resolved 'drivers/soc/Makefile' using previous resolution. +Auto-merging drivers/soc/Makefile +CONFLICT (content): Merge conflict in drivers/soc/Makefile +Auto-merging drivers/soc/Kconfig +CONFLICT (content): Merge conflict in drivers/soc/Kconfig +Auto-merging arch/arm/mach-exynos/suspend.c +Removing arch/arm/mach-exynos/regs-srom.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 722ea3307fe5] Merge remote-tracking branch 'samsung/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/samsung/exynos-srom.txt | 12 ++ + MAINTAINERS | 1 + + arch/arm/boot/dts/exynos4.dtsi | 5 + + arch/arm/boot/dts/exynos5.dtsi | 5 + + arch/arm/mach-exynos/Kconfig | 2 + + arch/arm/mach-exynos/exynos.c | 22 --- + arch/arm/mach-exynos/include/mach/map.h | 8 - + arch/arm/mach-exynos/regs-srom.h | 53 ------- + arch/arm/mach-exynos/suspend.c | 20 +-- + arch/arm/plat-samsung/include/plat/map-s5p.h | 1 - + drivers/cpufreq/s5pv210-cpufreq.c | 2 - + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/samsung/Kconfig | 13 ++ + drivers/soc/samsung/Makefile | 1 + + drivers/soc/samsung/exynos-srom.c | 175 +++++++++++++++++++++ + drivers/soc/samsung/exynos-srom.h | 51 ++++++ + 17 files changed, 269 insertions(+), 104 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-srom.txt + delete mode 100644 arch/arm/mach-exynos/regs-srom.h + create mode 100644 drivers/soc/samsung/Kconfig + create mode 100644 drivers/soc/samsung/Makefile + create mode 100644 drivers/soc/samsung/exynos-srom.c + create mode 100644 drivers/soc/samsung/exynos-srom.h +Merging samsung-krzk/for-next (6ff33f3902c3 Linux 4.3-rc1) +$ git merge samsung-krzk/for-next +Already up-to-date. +Merging sunxi/sunxi/for-next (7022e5f74246 Merge branch 'sunxi/dt-for-4.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (2d37df587e3c Merge branch for-4.4/defconfig into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (fb226c3d7c77 arm64: fix R/O permissions of FDT mapping) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/atomic_ll_sc.h | 2 +- + arch/arm64/include/asm/atomic_lse.h | 2 +- + arch/arm64/include/asm/pgtable.h | 1 + + arch/arm64/mm/mmu.c | 4 +-- + arch/arm64/net/bpf_jit.h | 3 +- + arch/arm64/net/bpf_jit_comp.c | 54 +++++++++++++++++++++++------------ + 7 files changed, 44 insertions(+), 23 deletions(-) +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 +Removing arch/c6x/include/asm/clkdev.h +Auto-merging arch/c6x/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/c6x/include/asm/Kbuild | 1 + + arch/c6x/include/asm/clkdev.h | 22 ---------------------- + 2 files changed, 1 insertion(+), 22 deletions(-) + delete mode 100644 arch/c6x/include/asm/clkdev.h +Merging cris/for-next (918fc2ee791e cris: Drop reference to get_cmos_time()) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. +Merging h8300/h8300-next (3bc27cdfe989 h8300: Don't set CROSS_COMPILE unconditionally) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/Makefile | 2 ++ + arch/h8300/boot/compressed/Makefile | 5 +++-- + arch/h8300/boot/compressed/head.S | 4 ++-- + arch/h8300/boot/compressed/misc.c | 7 +------ + arch/h8300/boot/compressed/vmlinux.lds | 2 +- + arch/h8300/boot/dts/edosk2674.dts | 6 +++--- + arch/h8300/include/asm/io.h | 12 ++++++------ + arch/h8300/include/asm/thread_info.h | 14 ++++++-------- + arch/h8300/kernel/vmlinux.lds.S | 4 ++-- + drivers/clk/h8300/clk-div.c | 6 +++++- + include/asm-generic/uaccess.h | 10 ++++++---- + 11 files changed, 37 insertions(+), 35 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 (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (4ac313111018 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + fs/binfmt_elf_fdpic.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) +Merging metag/for-next (3dce23eb8878 metag: Turn irq_ctx_* macros into static inlines) +$ git merge metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/include/asm/irq.h | 8 ++++++-- + arch/metag/kernel/smp.c | 2 ++ + 2 files changed, 8 insertions(+), 2 deletions(-) +Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (2536f4b7100c Merge branch '4.3-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/include/asm/atomic.h +Merge made by the 'recursive' strategy. + arch/mips/Kbuild | 1 + + arch/mips/Kconfig | 30 +- + arch/mips/Kconfig.debug | 72 +++++ + arch/mips/Makefile | 4 + + arch/mips/bcm47xx/setup.c | 19 +- + arch/mips/bcm47xx/sprom.c | 46 ++-- + arch/mips/boot/dts/brcm/bcm7346.dtsi | 114 +++++++- + arch/mips/boot/dts/brcm/bcm7358.dtsi | 62 ++++- + arch/mips/boot/dts/brcm/bcm7360.dtsi | 62 ++++- + arch/mips/boot/dts/brcm/bcm7362.dtsi | 94 ++++++- + arch/mips/boot/dts/brcm/bcm7425.dtsi | 42 +++ + arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 28 ++ + arch/mips/boot/dts/brcm/bcm97358svmb.dts | 16 ++ + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 16 ++ + arch/mips/boot/dts/brcm/bcm97362svmb.dts | 20 ++ + arch/mips/boot/dts/mti/malta.dts | 4 + + arch/mips/configs/bigsur_defconfig | 12 +- + arch/mips/configs/capcella_defconfig | 6 +- + arch/mips/configs/e55_defconfig | 6 +- + arch/mips/configs/fuloong2e_defconfig | 14 +- + arch/mips/configs/lasat_defconfig | 10 +- + arch/mips/configs/lemote2f_defconfig | 11 +- + arch/mips/configs/malta_defconfig | 6 +- + arch/mips/configs/malta_kvm_defconfig | 16 +- + arch/mips/configs/malta_kvm_guest_defconfig | 16 +- + arch/mips/configs/malta_qemu_32r6_defconfig | 11 +- + arch/mips/configs/maltaaprp_defconfig | 11 +- + arch/mips/configs/maltasmvp_eva_defconfig | 11 +- + arch/mips/configs/maltaup_defconfig | 11 +- + arch/mips/configs/maltaup_xpa_defconfig | 16 +- + arch/mips/configs/mpc30x_defconfig | 6 +- + arch/mips/include/asm/abi.h | 5 +- + arch/mips/include/asm/atomic.h | 2 +- + arch/mips/include/asm/bcache.h | 27 ++ + arch/mips/include/asm/cdmm.h | 11 + + arch/mips/include/asm/clocksource.h | 29 ++ + arch/mips/include/asm/cpu-features.h | 6 +- + arch/mips/include/asm/debug.h | 22 ++ + arch/mips/include/asm/elf.h | 7 + + arch/mips/include/asm/fw/fw.h | 16 -- + arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 5 - + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 14 + + arch/mips/include/asm/mach-malta/malta-dtshim.h | 29 ++ + arch/mips/include/asm/mach-ralink/mt7620.h | 8 +- + arch/mips/include/asm/mach-ralink/ralink_regs.h | 17 ++ + arch/mips/include/asm/mach-ralink/rt305x.h | 21 +- + arch/mips/include/asm/mips-cm.h | 78 +++++- + arch/mips/include/asm/mips-cpc.h | 3 +- + arch/mips/include/asm/mipsregs.h | 15 +- + arch/mips/include/asm/processor.h | 8 +- + arch/mips/include/asm/vdso.h | 139 ++++++++-- + arch/mips/include/uapi/asm/Kbuild | 2 +- + arch/mips/include/uapi/asm/auxvec.h | 17 ++ + arch/mips/jz4740/board-qi_lb60.c | 13 +- + arch/mips/kernel/Makefile | 1 + + arch/mips/kernel/cps-vec-ns16550.S | 202 ++++++++++++++ + arch/mips/kernel/cps-vec.S | 44 ++- + arch/mips/kernel/cpu-probe.c | 3 +- + arch/mips/kernel/csrc-r4k.c | 44 +++ + arch/mips/kernel/idle.c | 16 +- + arch/mips/kernel/mips-cm.c | 114 +++++--- + arch/mips/kernel/mips-cpc.c | 6 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 2 +- + arch/mips/kernel/segment.c | 2 +- + arch/mips/kernel/setup.c | 1 + + arch/mips/kernel/signal.c | 12 +- + arch/mips/kernel/signal32.c | 7 +- + arch/mips/kernel/signal_n32.c | 5 +- + arch/mips/kernel/smp-cps.c | 35 ++- + arch/mips/kernel/smp-gic.c | 2 + + arch/mips/kernel/spinlock_test.c | 4 +- + arch/mips/kernel/stacktrace.c | 27 +- + arch/mips/kernel/traps.c | 11 +- + arch/mips/kernel/unaligned.c | 2 +- + arch/mips/kernel/vdso.c | 207 ++++++++------ + arch/mips/lantiq/clk.c | 17 ++ + arch/mips/lantiq/clk.h | 13 + + arch/mips/lantiq/irq.c | 8 +- + arch/mips/lantiq/xway/clk.c | 180 +++++++++++- + arch/mips/lantiq/xway/prom.c | 35 ++- + arch/mips/lantiq/xway/reset.c | 196 ++++++++++++-- + arch/mips/lantiq/xway/sysctrl.c | 301 ++++++++++++++++++--- + arch/mips/lib/Makefile | 2 +- + arch/mips/lib/bswapdi.c | 15 + + arch/mips/lib/bswapsi.c | 11 + + arch/mips/math-emu/me-debugfs.c | 2 +- + arch/mips/mm/Makefile | 1 + + arch/mips/mm/sc-debugfs.c | 81 ++++++ + arch/mips/mm/sc-mips.c | 65 ++++- + arch/mips/mm/tlbex.c | 97 ++++--- + arch/mips/mti-malta/Makefile | 15 +- + arch/mips/mti-malta/malta-dtshim.c | 162 +++++++++++ + arch/mips/mti-malta/malta-init.c | 1 + + arch/mips/mti-malta/malta-memory.c | 131 +-------- + arch/mips/mti-malta/malta-setup.c | 5 +- + arch/mips/pci/pci-rt3883.c | 6 +- + arch/mips/ralink/cevt-rt3352.c | 2 +- + arch/mips/ralink/early_printk.c | 26 ++ + arch/mips/ralink/mt7620.c | 63 ++++- + arch/mips/ralink/prom.c | 5 + + arch/mips/ralink/reset.c | 13 +- + arch/mips/ralink/rt288x.c | 1 + + arch/mips/ralink/rt305x.c | 13 +- + arch/mips/ralink/rt3883.c | 2 + + arch/mips/vdso/.gitignore | 4 + + arch/mips/vdso/Makefile | 160 +++++++++++ + arch/mips/vdso/elf.S | 68 +++++ + arch/mips/vdso/genvdso.c | 293 ++++++++++++++++++++ + arch/mips/vdso/genvdso.h | 187 +++++++++++++ + arch/mips/vdso/gettimeofday.c | 232 ++++++++++++++++ + arch/mips/vdso/sigreturn.S | 49 ++++ + arch/mips/vdso/vdso.h | 89 ++++++ + arch/mips/vdso/vdso.lds.S | 105 +++++++ + drivers/clocksource/mips-gic-timer.c | 7 +- + drivers/irqchip/irq-mips-gic.c | 14 + + include/linux/irqchip/mips-gic.h | 17 ++ + 116 files changed, 4063 insertions(+), 665 deletions(-) + create mode 100644 arch/mips/include/asm/clocksource.h + create mode 100644 arch/mips/include/asm/debug.h + create mode 100644 arch/mips/include/asm/mach-malta/malta-dtshim.h + create mode 100644 arch/mips/include/uapi/asm/auxvec.h + create mode 100644 arch/mips/kernel/cps-vec-ns16550.S + create mode 100644 arch/mips/lib/bswapdi.c + create mode 100644 arch/mips/lib/bswapsi.c + create mode 100644 arch/mips/mm/sc-debugfs.c + create mode 100644 arch/mips/mti-malta/malta-dtshim.c + create mode 100644 arch/mips/vdso/.gitignore + create mode 100644 arch/mips/vdso/Makefile + create mode 100644 arch/mips/vdso/elf.S + create mode 100644 arch/mips/vdso/genvdso.c + create mode 100644 arch/mips/vdso/genvdso.h + create mode 100644 arch/mips/vdso/gettimeofday.c + create mode 100644 arch/mips/vdso/sigreturn.S + create mode 100644 arch/mips/vdso/vdso.h + create mode 100644 arch/mips/vdso/vdso.lds.S +Merging nios2/for-next (bb3fc5ddef93 nios2: Remove unnecessary #ifdef guards) +$ git merge nios2/for-next +Merge made by the 'recursive' strategy. + arch/nios2/include/asm/cmpxchg.h | 47 ---------------------------------------- + arch/nios2/kernel/setup.c | 2 +- + arch/nios2/lib/memmove.c | 2 -- + arch/nios2/lib/memset.c | 2 -- + 4 files changed, 1 insertion(+), 52 deletions(-) +Merging parisc-hd/for-next (d0cf62fb63f7 parisc: Fixes and cleanups in kernel uapi header files) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/compat.h | 4 ++-- + arch/parisc/include/uapi/asm/ipcbuf.h | 19 +++++++++++------- + arch/parisc/include/uapi/asm/msgbuf.h | 10 +++++----- + arch/parisc/include/uapi/asm/posix_types.h | 2 ++ + arch/parisc/include/uapi/asm/sembuf.h | 6 +++--- + arch/parisc/include/uapi/asm/shmbuf.h | 8 ++++---- + arch/parisc/include/uapi/asm/stat.h | 31 ------------------------------ + arch/parisc/mm/init.c | 16 +++++++++++++++ + 8 files changed, 44 insertions(+), 52 deletions(-) +Merging powerpc/next (8bdf2023e238 Merge branch 'next' of git://git.denx.de/linux-denx-agust into next) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry) +$ git merge fsl/next +Already up-to-date. +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 (a262ec8adb41 s390/head: fix error message on unsupported hardware) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/kernel/head.S | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (09745f38a74e arch/tile: turn off timer tick for oneshot_stopped state) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 1 + + arch/tile/include/asm/insn.h | 59 +++++++++++++++++++++++++++ + arch/tile/include/asm/jump_label.h | 58 +++++++++++++++++++++++++++ + arch/tile/include/asm/page.h | 10 +++++ + arch/tile/include/asm/processor.h | 2 +- + arch/tile/include/asm/thread_info.h | 8 +++- + arch/tile/kernel/Makefile | 1 + + arch/tile/kernel/ftrace.c | 13 +----- + arch/tile/kernel/intvec_32.S | 46 +++++++-------------- + arch/tile/kernel/intvec_64.S | 49 +++++++---------------- + arch/tile/kernel/jump_label.c | 64 ++++++++++++++++++++++++++++++ + arch/tile/kernel/kgdb.c | 2 +- + arch/tile/kernel/kprobes.c | 4 +- + arch/tile/kernel/process.c | 79 +++++++++++++++++++------------------ + arch/tile/kernel/time.c | 1 + + 15 files changed, 276 insertions(+), 121 deletions(-) + create mode 100644 arch/tile/include/asm/insn.h + create mode 100644 arch/tile/include/asm/jump_label.h + create mode 100644 arch/tile/kernel/jump_label.c +Merging uml/linux-next (2eb5f31bc4ea um: Switch clocksource to hrtimers) +$ git merge uml/linux-next +Removing arch/um/os-Linux/internal.h +Merge made by the 'recursive' strategy. + arch/um/Makefile | 2 +- + arch/um/drivers/net_kern.c | 17 ++- + arch/um/include/asm/ptrace-generic.h | 2 + + arch/um/include/shared/os.h | 19 ++- + arch/um/include/shared/skas/stub-data.h | 7 +- + arch/um/include/shared/timer-internal.h | 13 ++ + arch/um/kernel/process.c | 8 +- + arch/um/kernel/skas/clone.c | 6 +- + arch/um/kernel/skas/mmu.c | 3 + + arch/um/kernel/skas/syscall.c | 21 +-- + arch/um/kernel/time.c | 73 ++++++---- + arch/um/kernel/tlb.c | 16 +- + arch/um/os-Linux/internal.h | 1 - + arch/um/os-Linux/main.c | 7 +- + arch/um/os-Linux/process.c | 6 + + arch/um/os-Linux/signal.c | 41 +++--- + arch/um/os-Linux/skas/process.c | 55 +++---- + arch/um/os-Linux/time.c | 249 ++++++++++++++++---------------- + arch/x86/um/stub_32.S | 1 - + arch/x86/um/stub_64.S | 18 +-- + 20 files changed, 296 insertions(+), 269 deletions(-) + create mode 100644 arch/um/include/shared/timer-internal.h + delete mode 100644 arch/um/os-Linux/internal.h +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (583d0fef756a libceph: clear msg->con in ceph_msg_release() only) +$ git merge ceph/master +Auto-merging net/ceph/ceph_common.c +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 109 ++++++++++++++++++++--------------------- + fs/ceph/cache.c | 2 +- + fs/ceph/caps.c | 76 ++++++++++++++-------------- + fs/ceph/file.c | 87 ++++++++++++++++++++++++++++---- + fs/ceph/inode.c | 1 + + fs/ceph/mds_client.c | 57 +++++++++++++++------ + fs/ceph/mds_client.h | 3 ++ + fs/ceph/super.h | 1 + + include/linux/ceph/libceph.h | 4 +- + include/linux/ceph/messenger.h | 16 ++---- + net/ceph/auth_x.c | 36 +++++++++----- + net/ceph/ceph_common.c | 18 +++++-- + net/ceph/crypto.h | 4 +- + net/ceph/messenger.c | 88 ++++++++++++++------------------- + net/ceph/osd_client.c | 34 ++++++------- + 15 files changed, 314 insertions(+), 222 deletions(-) +Merging cifs/for-next (7b52e2793a58 Allow copy offload (CopyChunk) across shares) +$ git merge cifs/for-next +Auto-merging fs/cifs/smb2pdu.c +Auto-merging fs/cifs/connect.c +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 16 ++----- + fs/cifs/cifsglob.h | 8 +++- + fs/cifs/connect.c | 78 +++++++++++++++++++++++++++++++++ + fs/cifs/ioctl.c | 11 +++-- + fs/cifs/smb2file.c | 19 +++++++++ + fs/cifs/smb2ops.c | 10 ++--- + fs/cifs/smb2pdu.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++- + fs/cifs/smb2pdu.h | 45 ++++++++++++++++++++ + fs/cifs/smbfsctl.h | 2 +- + 9 files changed, 287 insertions(+), 25 deletions(-) +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (d4eb6dee4712 ext4: Update EXT4_USE_FOR_EXT2 description) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (be69e1c19f0e fs/ext4: remove unnecessary new_valid_dev check) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (beaa57dd986d f2fs: fix to skip shrinking extent nodes) +$ git merge f2fs/dev +Already up-to-date. +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. + fs/fscache/netfs.c | 38 ++++++++++++++++++-------------------- + 1 file changed, 18 insertions(+), 20 deletions(-) +Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (31dddd9eb9eb GFS2: Fix rgrp end rounding problem for bsize < page size) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/file.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/gfs2-glocks.txt | 6 +-- + fs/gfs2/dir.c | 7 ++- + fs/gfs2/file.c | 2 +- + fs/gfs2/glock.c | 84 +++++++++++++++---------------- + fs/gfs2/glock.h | 4 +- + fs/gfs2/glops.c | 10 ++-- + fs/gfs2/incore.h | 3 +- + fs/gfs2/main.c | 2 +- + fs/gfs2/ops_fstype.c | 4 +- + fs/gfs2/rgrp.c | 9 ++-- + fs/gfs2/trans.c | 4 ++ + 11 files changed, 73 insertions(+), 62 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 (941c3ff3102c Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Auto-merging net/sunrpc/xprtrdma/frwr_ops.c +Auto-merging include/linux/sunrpc/svc_rdma.h +Auto-merging fs/nfs/nfs4proc.c +Merge made by the 'recursive' strategy. + fs/nfs/blocklayout/blocklayout.c | 7 +- + fs/nfs/callback.c | 40 +-- + fs/nfs/callback.h | 12 - + fs/nfs/callback_proc.c | 2 - + fs/nfs/callback_xdr.c | 39 ++- + fs/nfs/client.c | 1 + + fs/nfs/delegation.c | 6 +- + fs/nfs/dir.c | 3 - + fs/nfs/flexfilelayout/flexfilelayout.c | 40 ++- + fs/nfs/flexfilelayout/flexfilelayout.h | 7 + + fs/nfs/mount_clnt.c | 4 +- + fs/nfs/nfs42.h | 1 + + fs/nfs/nfs42proc.c | 71 +++++ + fs/nfs/nfs42xdr.c | 97 ++++++- + fs/nfs/nfs4_fs.h | 6 +- + fs/nfs/nfs4file.c | 136 +++++++++ + fs/nfs/nfs4proc.c | 182 ++++++------ + fs/nfs/nfs4xdr.c | 53 +++- + fs/nfs/nfsroot.c | 2 +- + fs/nfs/pnfs.c | 12 +- + fs/nfs/read.c | 9 +- + fs/nfs/super.c | 2 - + fs/nfs/write.c | 7 + + include/linux/nfs4.h | 3 + + include/linux/nfs_fs_sb.h | 2 + + include/linux/nfs_xdr.h | 28 +- + include/linux/sunrpc/bc_xprt.h | 5 + + include/linux/sunrpc/svc_rdma.h | 6 +- + include/linux/sunrpc/xprt.h | 9 + + include/linux/sunrpc/xprtsock.h | 2 + + include/uapi/linux/nfs.h | 13 + + net/sunrpc/backchannel_rqst.c | 24 +- + net/sunrpc/svc.c | 5 - + net/sunrpc/sysctl.c | 23 +- + net/sunrpc/xprtrdma/Makefile | 1 + + net/sunrpc/xprtrdma/backchannel.c | 394 +++++++++++++++++++++++++ + net/sunrpc/xprtrdma/frwr_ops.c | 7 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 148 +++++++--- + net/sunrpc/xprtrdma/svc_rdma.c | 6 + + net/sunrpc/xprtrdma/svc_rdma_transport.c | 58 ++++ + net/sunrpc/xprtrdma/transport.c | 18 +- + net/sunrpc/xprtrdma/verbs.c | 479 ++++++++++++++++--------------- + net/sunrpc/xprtrdma/xprt_rdma.h | 54 +++- + net/sunrpc/xprtsock.c | 260 ++++++++++++----- + 44 files changed, 1687 insertions(+), 597 deletions(-) + create mode 100644 net/sunrpc/xprtrdma/backchannel.c +Merging nfsd/nfsd-next (1bc483f959c8 SUNRPC: drop stale comment in svc_setup_socket()) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/fs.h +Auto-merging fs/namei.c +Auto-merging fs/locks.c +Merge made by the 'recursive' strategy. + fs/file_table.c | 94 ++++-- + fs/lockd/host.c | 8 +- + fs/lockd/mon.c | 125 ++----- + fs/lockd/netns.h | 4 +- + fs/lockd/svc.c | 2 +- + fs/lockd/svc4proc.c | 2 +- + fs/lockd/svcproc.c | 2 +- + fs/locks.c | 37 ++ + fs/namei.c | 74 ++++ + fs/nfsd/Kconfig | 2 + + fs/nfsd/Makefile | 3 +- + fs/nfsd/export.c | 14 + + fs/nfsd/filecache.c | 712 +++++++++++++++++++++++++++++++++++++++ + fs/nfsd/filecache.h | 44 +++ + fs/nfsd/nfs3proc.c | 2 +- + fs/nfsd/nfs3xdr.c | 6 +- + fs/nfsd/nfs4layouts.c | 46 ++- + fs/nfsd/nfs4proc.c | 36 +- + fs/nfsd/nfs4state.c | 267 ++++++++------- + fs/nfsd/nfs4xdr.c | 24 +- + fs/nfsd/nfscache.c | 6 +- + fs/nfsd/nfsctl.c | 10 + + fs/nfsd/nfsfh.c | 5 +- + fs/nfsd/nfsfh.h | 20 +- + fs/nfsd/nfsproc.c | 2 +- + fs/nfsd/nfssvc.c | 16 +- + fs/nfsd/state.h | 53 ++- + fs/nfsd/trace.c | 2 - + fs/nfsd/trace.h | 137 ++++++++ + fs/nfsd/vfs.c | 296 +++++----------- + fs/nfsd/vfs.h | 15 +- + fs/nfsd/xdr4.h | 17 +- + fs/notify/group.c | 2 + + fs/notify/inode_mark.c | 1 + + fs/notify/mark.c | 70 +--- + include/linux/file.h | 3 +- + include/linux/fs.h | 1 + + include/linux/fsnotify_backend.h | 5 +- + include/linux/lockd/lockd.h | 10 +- + include/linux/namei.h | 1 + + include/linux/sunrpc/cache.h | 17 +- + init/main.c | 2 +- + net/sunrpc/auth_gss/auth_gss.c | 13 +- + net/sunrpc/cache.c | 56 ++- + net/sunrpc/svcsock.c | 40 ++- + 45 files changed, 1629 insertions(+), 675 deletions(-) + create mode 100644 fs/nfsd/filecache.c + create mode 100644 fs/nfsd/filecache.h +Merging orangefs/for-next (548049495cb4 Orangefs: fix some checkpatch.pl complaints that had creeped in.) +$ git merge orangefs/for-next +Auto-merging fs/Makefile +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ + Documentation/filesystems/orangefs.txt | 137 +++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 +++ + fs/orangefs/dcache.c | 142 +++ + fs/orangefs/devpvfs2-req.c | 1004 ++++++++++++++++ + fs/orangefs/dir.c | 345 ++++++ + fs/orangefs/downcall.h | 138 +++ + fs/orangefs/file.c | 1002 ++++++++++++++++ + fs/orangefs/inode.c | 469 ++++++++ + fs/orangefs/namei.c | 469 ++++++++ + fs/orangefs/protocol.h | 443 +++++++ + fs/orangefs/pvfs2-bufmap.c | 566 +++++++++ + fs/orangefs/pvfs2-bufmap.h | 61 + + fs/orangefs/pvfs2-cache.c | 260 ++++ + fs/orangefs/pvfs2-debug.h | 292 +++++ + fs/orangefs/pvfs2-debugfs.c | 458 +++++++ + fs/orangefs/pvfs2-debugfs.h | 3 + + fs/orangefs/pvfs2-dev-proto.h | 102 ++ + fs/orangefs/pvfs2-kernel.h | 861 ++++++++++++++ + fs/orangefs/pvfs2-mod.c | 315 +++++ + fs/orangefs/pvfs2-sysfs.c | 1787 ++++++++++++++++++++++++++++ + fs/orangefs/pvfs2-sysfs.h | 2 + + fs/orangefs/pvfs2-utils.c | 1165 ++++++++++++++++++ + fs/orangefs/super.c | 553 +++++++++ + fs/orangefs/symlink.c | 31 + + fs/orangefs/upcall.h | 255 ++++ + fs/orangefs/waitqueue.c | 529 ++++++++ + fs/orangefs/xattr.c | 530 +++++++++ + 32 files changed, 12199 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/devpvfs2-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/protocol.h + create mode 100644 fs/orangefs/pvfs2-bufmap.c + create mode 100644 fs/orangefs/pvfs2-bufmap.h + create mode 100644 fs/orangefs/pvfs2-cache.c + create mode 100644 fs/orangefs/pvfs2-debug.h + create mode 100644 fs/orangefs/pvfs2-debugfs.c + create mode 100644 fs/orangefs/pvfs2-debugfs.h + create mode 100644 fs/orangefs/pvfs2-dev-proto.h + create mode 100644 fs/orangefs/pvfs2-kernel.h + create mode 100644 fs/orangefs/pvfs2-mod.c + create mode 100644 fs/orangefs/pvfs2-sysfs.c + create mode 100644 fs/orangefs/pvfs2-sysfs.h + create mode 100644 fs/orangefs/pvfs2-utils.c + 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 +Merging overlayfs/overlayfs-next (8d3095f4ad47 ovl: default permissions) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/super.c +Merge made by the 'recursive' strategy. + fs/overlayfs/inode.c | 23 +++++++++++++++++++++++ + fs/overlayfs/overlayfs.h | 3 +++ + fs/overlayfs/super.c | 28 ++++++++++++++++++++++++++++ + 3 files changed, 54 insertions(+) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (46cfbe8e037a 9p: trans_fd, bail out if recv fcall if missing) +$ git merge v9fs/for-next +Merge made by the 'recursive' strategy. + net/9p/trans_fd.c | 88 +++++++++++++++++++++++++++------------------------ + net/9p/trans_virtio.c | 2 +- + 2 files changed, 47 insertions(+), 43 deletions(-) +Merging ubifs/linux-next (8c1c5f263833 ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs) +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/xattr.c +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/attach.c | 4 +--- + drivers/mtd/ubi/cdev.c | 2 +- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/fastmap-wl.c | 29 +++++++++++++++++++++++++ + drivers/mtd/ubi/fastmap.c | 4 ++-- + drivers/mtd/ubi/ubi-media.h | 2 +- + fs/ubifs/Kconfig | 15 +++++++++++++ + fs/ubifs/debug.c | 8 +++---- + fs/ubifs/dir.c | 11 +++++----- + fs/ubifs/file.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ + fs/ubifs/lpt.c | 6 ++---- + fs/ubifs/misc.h | 9 ++------ + fs/ubifs/recovery.c | 8 +++---- + fs/ubifs/super.c | 12 +++++++++-- + fs/ubifs/tnc.c | 3 +-- + fs/ubifs/ubifs.h | 7 +++++-- + fs/ubifs/xattr.c | 12 ++++++++--- + 17 files changed, 142 insertions(+), 42 deletions(-) +Merging xfs/for-next (264e89ad3412 Merge branch 'xfs-dax-updates' into for-next) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/dax.c +Merge made by the 'recursive' strategy. + fs/dax.c | 5 + + fs/xfs/Makefile | 2 +- + fs/xfs/kmem.c | 10 +- + fs/xfs/libxfs/xfs_alloc.c | 30 ++++-- + fs/xfs/libxfs/xfs_alloc.h | 8 +- + fs/xfs/libxfs/xfs_attr.c | 6 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 3 + + fs/xfs/libxfs/xfs_attr_remote.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 65 +++++++++---- + fs/xfs/libxfs/xfs_bmap.h | 13 ++- + fs/xfs/libxfs/xfs_btree.c | 21 ++++- + fs/xfs/libxfs/xfs_btree.h | 39 ++++---- + fs/xfs/libxfs/xfs_da_btree.c | 4 + + fs/xfs/libxfs/xfs_dir2.c | 6 +- + fs/xfs/libxfs/xfs_dir2_block.c | 3 + + fs/xfs/libxfs/xfs_dir2_data.c | 3 + + fs/xfs/libxfs/xfs_dir2_leaf.c | 3 + + fs/xfs/libxfs/xfs_dir2_node.c | 3 + + fs/xfs/libxfs/xfs_format.h | 18 +++- + fs/xfs/libxfs/xfs_fs.h | 10 ++ + fs/xfs/libxfs/xfs_ialloc.c | 10 +- + fs/xfs/libxfs/xfs_sb.c | 10 ++ + fs/xfs/libxfs/xfs_symlink_remote.c | 7 ++ + fs/xfs/xfs_acl.c | 13 ++- + fs/xfs/xfs_acl.h | 3 + + fs/xfs/xfs_aops.c | 119 +++++++++++++----------- + fs/xfs/xfs_aops.h | 3 +- + fs/xfs/xfs_attr_list.c | 2 +- + fs/xfs/xfs_bmap_util.c | 38 +++++++- + fs/xfs/xfs_buf.c | 21 +++-- + fs/xfs/xfs_dir2_readdir.c | 2 +- + fs/xfs/xfs_dquot.c | 14 +-- + fs/xfs/xfs_file.c | 114 +++++++++++++++++------ + fs/xfs/xfs_icache.c | 18 ++-- + fs/xfs/xfs_inode.c | 8 +- + fs/xfs/xfs_inode_item.c | 1 + + fs/xfs/xfs_inode_item.h | 1 + + fs/xfs/xfs_ioctl.c | 23 +++-- + fs/xfs/xfs_ioctl32.c | 2 +- + fs/xfs/xfs_iomap.c | 70 ++++++++++---- + fs/xfs/xfs_iops.c | 4 +- + fs/xfs/xfs_linux.h | 7 ++ + fs/xfs/xfs_log.c | 93 +++++++++++++++---- + fs/xfs/xfs_log.h | 1 + + fs/xfs/xfs_log_priv.h | 51 ++++++++++ + fs/xfs/xfs_log_recover.c | 12 ++- + fs/xfs/xfs_message.c | 7 ++ + fs/xfs/xfs_mount.c | 21 ++++- + fs/xfs/xfs_mount.h | 5 + + fs/xfs/xfs_pnfs.c | 5 + + fs/xfs/xfs_qm.c | 14 +-- + fs/xfs/xfs_stats.c | 93 +++++++++---------- + fs/xfs/xfs_stats.h | 36 +++++--- + fs/xfs/xfs_super.c | 50 ++++++++-- + fs/xfs/xfs_sysctl.c | 15 +-- + fs/xfs/xfs_sysfs.c | 185 ++++++++++++++++++++++--------------- + fs/xfs/xfs_sysfs.h | 1 + + fs/xfs/xfs_trace.h | 2 + + fs/xfs/xfs_trans.c | 6 +- + fs/xfs/xfs_trans_ail.c | 13 +-- + fs/xfs/xfs_trans_inode.c | 9 ++ + fs/xfs/xfs_xattr.c | 31 ++++++- + 62 files changed, 988 insertions(+), 406 deletions(-) +Merging file-locks/linux-next (616fb38fa7a9 locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (7225107e1582 Merge branch 'pci/host-layerscape' into next) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (5c2fd5049bac Merge branch 'for-4.4/logitech' into for-next) +$ git merge hid/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (121c7794864c Merge branch 'i2c/for-4.4' into i2c/for-next) +$ git merge i2c/i2c/for-next +Resolved 'MAINTAINERS' using previous resolution. +Removing include/linux/i2c/i2c-rcar.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/i2c/busses/i2c-ismt.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 07a26a9794a3] Merge remote-tracking branch 'i2c/i2c/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/acpi/i2c-muxes.txt | 58 ++ + .../devicetree/bindings/i2c/i2c-davinci.txt | 6 +- + Documentation/devicetree/bindings/i2c/i2c-imx.txt | 9 + + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 1 + + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 1 + + .../devicetree/bindings/i2c/i2c-uniphier-f.txt | 25 + + .../devicetree/bindings/i2c/i2c-uniphier.txt | 25 + + Documentation/i2c/busses/i2c-i801 | 2 + + MAINTAINERS | 8 +- + drivers/i2c/busses/Kconfig | 24 +- + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-at91.c | 82 ++- + drivers/i2c/busses/i2c-au1550.c | 60 +-- + drivers/i2c/busses/i2c-davinci.c | 8 + + drivers/i2c/busses/i2c-designware-core.c | 74 ++- + drivers/i2c/busses/i2c-designware-core.h | 10 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 33 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 81 +-- + drivers/i2c/busses/i2c-i801.c | 16 +- + drivers/i2c/busses/i2c-ibm_iic.c | 1 + + drivers/i2c/busses/i2c-img-scb.c | 73 +-- + drivers/i2c/busses/i2c-imx.c | 73 ++- + drivers/i2c/busses/i2c-ismt.c | 80 +-- + drivers/i2c/busses/i2c-meson.c | 1 + + drivers/i2c/busses/i2c-mt65xx.c | 16 + + drivers/i2c/busses/i2c-ocores.c | 31 +- + drivers/i2c/busses/i2c-pnx.c | 7 +- + drivers/i2c/busses/i2c-pxa.c | 41 +- + drivers/i2c/busses/i2c-rcar.c | 24 +- + drivers/i2c/busses/i2c-rk3x.c | 1 + + drivers/i2c/busses/i2c-sh_mobile.c | 1 + + drivers/i2c/busses/i2c-sirf.c | 26 +- + drivers/i2c/busses/i2c-stu300.c | 1 + + drivers/i2c/busses/i2c-tegra.c | 1 - + drivers/i2c/busses/i2c-uniphier-f.c | 584 +++++++++++++++++++++ + drivers/i2c/busses/i2c-uniphier.c | 441 ++++++++++++++++ + drivers/i2c/i2c-core.c | 82 ++- + drivers/i2c/i2c-dev.c | 23 +- + drivers/i2c/i2c-mux.c | 8 + + fs/compat_ioctl.c | 2 +- + include/linux/acpi.h | 5 + + include/linux/i2c-ocores.h | 1 + + include/linux/i2c/i2c-rcar.h | 10 - + include/uapi/linux/i2c-dev.h | 4 +- + 44 files changed, 1683 insertions(+), 379 deletions(-) + create mode 100644 Documentation/acpi/i2c-muxes.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier-f.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier.txt + create mode 100644 drivers/i2c/busses/i2c-uniphier-f.c + create mode 100644 drivers/i2c/busses/i2c-uniphier.c + delete mode 100644 include/linux/i2c/i2c-rcar.h +Merging jdelvare-hwmon/master (69bb8a38c5a9 hwmon: (k10temp) Remove duplicate pci-id define) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + drivers/hwmon/k10temp.c | 1 - + 1 file changed, 1 deletion(-) +Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (3b5ea47dbff0 hwmon: (fam15h_power) Add max compute unit accumulated power) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (8132ccfb864a Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (674327f76bb1 Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging scripts/package/builddeb +Auto-merging scripts/kconfig/Makefile +Removing scripts/coccinelle/misc/simple_return.cocci +Auto-merging lib/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/Kconfig.recursion-issue-01 | 57 ++ + Documentation/kbuild/Kconfig.recursion-issue-02 | 63 ++ + Documentation/kbuild/Kconfig.select-break | 33 + + Documentation/kbuild/kconfig-language.txt | 161 +++++ + Documentation/lto-build | 173 ++++++ + Makefile | 23 +- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 +++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++ + scripts/Makefile.modpost | 7 +- + scripts/coccicheck | 2 +- + scripts/coccinelle/free/ifnullfree.cocci | 26 +- + .../iterators/device_node_continue.cocci | 100 +++ + scripts/coccinelle/misc/compare_const_fl.cocci | 171 +++++ + scripts/coccinelle/misc/of_table.cocci | 33 +- + scripts/coccinelle/misc/simple_return.cocci | 180 ------ + scripts/coccinelle/null/deref_null.cocci | 4 +- + scripts/coccinelle/tests/odd_ptr_err.cocci | 120 +++- + scripts/kconfig/Makefile | 56 +- + scripts/kconfig/expr.c | 2 +- + scripts/kconfig/merge_config.sh | 18 +- + scripts/kconfig/qconf.cc | 688 ++++++++++++--------- + scripts/kconfig/qconf.h | 150 +++-- + scripts/kconfig/symbol.c | 2 + + scripts/link-vmlinux.sh | 2 +- + scripts/package/builddeb | 11 +- + scripts/tags.sh | 2 + + 29 files changed, 1569 insertions(+), 678 deletions(-) + create mode 100644 Documentation/kbuild/Kconfig.recursion-issue-01 + create mode 100644 Documentation/kbuild/Kconfig.recursion-issue-02 + create mode 100644 Documentation/kbuild/Kconfig.select-break + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto + create mode 100644 scripts/coccinelle/iterators/device_node_continue.cocci + create mode 100644 scripts/coccinelle/misc/compare_const_fl.cocci + delete mode 100644 scripts/coccinelle/misc/simple_return.cocci +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (fca9051bec79 Merge branch 'for-4.4' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (bf27b188b1a9 Merge branches 'pm-domains' and 'pm-tools') +$ git merge pm/linux-next +Resolved 'drivers/of/of_pci.c' using previous resolution. +Resolved 'drivers/pci/probe.c' using previous resolution. +Resolved 'include/linux/of_pci.h' using previous resolution. +Auto-merging include/linux/of_pci.h +CONFLICT (content): Merge conflict in include/linux/of_pci.h +Auto-merging include/linux/acpi.h +Auto-merging drivers/pci/probe.c +CONFLICT (content): Merge conflict in drivers/pci/probe.c +Auto-merging drivers/of/of_pci.c +CONFLICT (content): Merge conflict in drivers/of/of_pci.c +Auto-merging drivers/cpufreq/s5pv210-cpufreq.c +Auto-merging drivers/base/power/domain.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 068dbcc40eb2] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 +- + drivers/acpi/acpi_platform.c | 7 +- + drivers/acpi/acpi_video.c | 78 ++++++++++++++++++---- + drivers/acpi/glue.c | 8 ++- + drivers/acpi/scan.c | 42 ++++++++++++ + drivers/acpi/video_detect.c | 9 +++ + drivers/base/power/domain.c | 21 +++--- + drivers/base/power/opp/core.c | 44 ++++++++---- + drivers/base/power/opp/cpu.c | 13 ++-- + drivers/base/power/opp/opp.h | 3 + + drivers/base/property.c | 32 ++++++--- + drivers/cpufreq/arm_big_little.c | 22 +++--- + drivers/cpufreq/cppc_cpufreq.c | 3 +- + drivers/cpufreq/cpufreq_governor.c | 33 ++++++--- + drivers/cpufreq/intel_pstate.c | 10 +-- + drivers/cpufreq/s5pv210-cpufreq.c | 4 +- + drivers/crypto/ccp/ccp-platform.c | 15 +++-- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 8 ++- + drivers/of/of_pci.c | 20 ------ + drivers/pci/probe.c | 32 ++++++++- + include/acpi/acpi_bus.h | 36 +--------- + include/linux/acpi.h | 7 +- + include/linux/of_pci.h | 3 - + include/linux/property.h | 10 ++- + tools/power/cpupower/debug/i386/dump_psb.c | 2 +- + tools/power/cpupower/man/cpupower-idle-set.1 | 4 +- + tools/power/cpupower/utils/cpufreq-info.c | 30 ++++----- + tools/power/cpupower/utils/cpufreq-set.c | 10 +-- + tools/power/cpupower/utils/cpuidle-info.c | 4 +- + tools/power/cpupower/utils/cpuidle-set.c | 33 ++++----- + tools/power/cpupower/utils/cpupower-info.c | 4 +- + tools/power/cpupower/utils/cpupower-set.c | 2 +- + tools/power/cpupower/utils/helpers/topology.c | 23 ++++--- + .../cpupower/utils/idle_monitor/cpupower-monitor.c | 9 ++- + 34 files changed, 387 insertions(+), 197 deletions(-) +Merging idle/next (f05bd12f0e9c Merge branch 'cpuidle' into release) +$ git merge idle/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (7c5b2759bf8c Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Auto-merging drivers/thermal/samsung/exynos_tmu.c +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/base/power/opp/core.c +Merge made by the 'recursive' strategy. + .../bindings/thermal/rockchip-thermal.txt | 11 +- + .../devicetree/bindings/thermal/ti_soc_thermal.txt | 14 + + drivers/acpi/thermal.c | 12 +- + drivers/base/power/opp/core.c | 4 +- + drivers/platform/x86/asus-wmi.c | 2 +- + drivers/platform/x86/intel_menlow.c | 8 +- + drivers/thermal/Kconfig | 17 + + drivers/thermal/Makefile | 3 + + drivers/thermal/armada_thermal.c | 6 +- + drivers/thermal/cpu_cooling.c | 8 +- + drivers/thermal/devfreq_cooling.c | 573 +++++++++++++++++++++ + drivers/thermal/imx_thermal.c | 21 +- + drivers/thermal/rockchip_thermal.c | 42 +- + drivers/thermal/samsung/exynos_tmu.c | 68 +-- + drivers/thermal/ti-soc-thermal/Kconfig | 15 + + drivers/thermal/ti-soc-thermal/Makefile | 1 + + .../thermal/ti-soc-thermal/omap3-thermal-data.c | 176 +++++++ + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 14 + + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 11 + + include/linux/devfreq_cooling.h | 81 +++ + include/linux/thermal.h | 8 +- + include/trace/events/thermal.h | 53 ++ + tools/thermal/tmon/Makefile | 3 + + 23 files changed, 1065 insertions(+), 86 deletions(-) + create mode 100644 drivers/thermal/devfreq_cooling.c + create mode 100644 drivers/thermal/ti-soc-thermal/omap3-thermal-data.c + create mode 100644 include/linux/devfreq_cooling.h +Merging thermal-soc/next (a4d9cd6ba3fd thermal: rockchip: fix compile error) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + drivers/thermal/rockchip_thermal.c | 1 + + 1 file changed, 1 insertion(+) +Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/ohci.c | 5 +++++ + 1 file changed, 5 insertions(+) +Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (fa3cd2a2b840 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/acpi-dma.c +Auto-merging arch/arm/mach-omap2/Kconfig +Removing arch/arm/common/edma.c +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/ti-dma-crossbar.txt | 15 +- + Documentation/devicetree/bindings/dma/ti-edma.txt | 117 +- + arch/arm/Kconfig | 1 - + arch/arm/common/Kconfig | 3 - + arch/arm/common/Makefile | 1 - + arch/arm/common/edma.c | 1876 -------------------- + arch/arm/mach-davinci/devices-da8xx.c | 122 +- + arch/arm/mach-davinci/dm355.c | 40 +- + arch/arm/mach-davinci/dm365.c | 25 +- + arch/arm/mach-davinci/dm644x.c | 40 +- + arch/arm/mach-davinci/dm646x.c | 44 +- + arch/arm/mach-omap2/Kconfig | 1 - + arch/avr32/mach-at32ap/at32ap700x.c | 9 +- + drivers/dma/Kconfig | 4 +- + drivers/dma/Makefile | 2 +- + drivers/dma/acpi-dma.c | 11 +- + drivers/dma/at_hdmac.c | 168 +- + drivers/dma/at_hdmac_regs.h | 2 +- + drivers/dma/at_xdmac.c | 106 +- + drivers/dma/dmaengine.c | 6 +- + drivers/dma/dw/core.c | 75 +- + drivers/dma/dw/pci.c | 20 +- + drivers/dma/dw/platform.c | 17 +- + drivers/dma/edma.c | 1858 ++++++++++++++++--- + drivers/dma/fsldma.c | 1 + + drivers/dma/idma64.c | 22 +- + drivers/dma/idma64.h | 14 +- + drivers/dma/imx-sdma.c | 5 +- + drivers/dma/ioat/dma.c | 3 +- + drivers/dma/ioat/dma.h | 6 +- + drivers/dma/ioat/init.c | 114 +- + drivers/dma/ioat/prep.c | 34 + + drivers/dma/moxart-dma.c | 1 + + drivers/dma/mpc512x_dma.c | 1 + + drivers/dma/omap-dma.c | 6 +- + drivers/dma/sh/usb-dmac.c | 11 +- + drivers/dma/sirf-dma.c | 1 + + drivers/dma/ste_dma40.c | 2 +- + drivers/dma/sun6i-dma.c | 1 + + drivers/dma/ti-dma-crossbar.c | 251 ++- + drivers/dma/virt-dma.h | 18 +- + drivers/dma/xgene-dma.c | 63 +- + drivers/dma/xilinx/xilinx_vdma.c | 1 + + drivers/dma/zx296702_dma.c | 2 +- + include/linux/of_dma.h | 2 +- + include/linux/platform_data/dma-dw.h | 2 + + include/linux/platform_data/edma.h | 104 +- + 47 files changed, 2541 insertions(+), 2687 deletions(-) + delete mode 100644 arch/arm/common/edma.c +Merging net-next/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge net-next/master +Already up-to-date. +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 (92240e8dc0d1 ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup}) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (8aaa878de83a Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (a9a86921837c Bluetooth: Add support for controller specific logging) +$ git merge bluetooth/master +Auto-merging net/bluetooth/hci_core.c +Auto-merging drivers/bluetooth/hci_qca.c +Auto-merging drivers/bluetooth/btusb.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/bfusb.c | 9 +- + drivers/bluetooth/bluecard_cs.c | 25 ++--- + drivers/bluetooth/bpa10x.c | 4 +- + drivers/bluetooth/bt3c_cs.c | 11 ++- + drivers/bluetooth/btmrvl_main.c | 8 +- + drivers/bluetooth/btmrvl_sdio.c | 4 +- + drivers/bluetooth/btsdio.c | 6 +- + drivers/bluetooth/btuart_cs.c | 11 ++- + drivers/bluetooth/btusb.c | 48 ++++----- + drivers/bluetooth/btwilink.c | 8 +- + drivers/bluetooth/dtl1_cs.c | 11 ++- + drivers/bluetooth/hci_ath.c | 6 +- + drivers/bluetooth/hci_bcm.c | 2 +- + drivers/bluetooth/hci_bcsp.c | 25 +++-- + drivers/bluetooth/hci_h4.c | 16 +-- + drivers/bluetooth/hci_h5.c | 14 +-- + drivers/bluetooth/hci_intel.c | 14 +-- + drivers/bluetooth/hci_ldisc.c | 5 +- + drivers/bluetooth/hci_ll.c | 4 +- + drivers/bluetooth/hci_qca.c | 4 +- + drivers/bluetooth/hci_vhci.c | 8 +- + include/net/bluetooth/bluetooth.h | 25 +++-- + include/net/bluetooth/hci_mon.h | 2 + + include/net/bluetooth/hci_sock.h | 1 + + net/bluetooth/af_bluetooth.c | 8 +- + net/bluetooth/hci_conn.c | 4 + + net/bluetooth/hci_core.c | 103 ++++++++++++++------ + net/bluetooth/hci_request.c | 14 ++- + net/bluetooth/hci_sock.c | 200 ++++++++++++++++++++++++++++++++------ + 29 files changed, 405 insertions(+), 195 deletions(-) +Merging rdma/for-next (db7489e07669 IB/core, cma: Make __attribute_const__ declarations sparse-friendly) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (f8479dd6a03c mtd: don't WARN about overloaded users of mtd->reboot_notifier.notifier_call) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (f8479dd6a03c mtd: don't WARN about overloaded users of mtd->reboot_notifier.notifier_call) +$ git merge l2-mtd/master +Already up-to-date. +Merging crypto/master (271817a3e92c crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params()) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (816d2206f0f9 Merge tag 'drm-intel-next-fixes-2015-11-06' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm/drm-next +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v10_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v11_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v8_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging include/linux/fb.h +Auto-merging include/drm/drmP.h +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_fence.c +Auto-merging drivers/gpu/drm/radeon/radeon_pm.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv46.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/i915_gem_shrinker.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Removing drivers/gpu/drm/exynos/exynos_mixer.h +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/display/renesas,du.txt +Auto-merging Documentation/devicetree/bindings/display/msm/mdp.txt +Auto-merging Documentation/devicetree/bindings/display/msm/hdmi.txt +Auto-merging Documentation/DocBook/gpu.tmpl +Auto-merging Documentation/DocBook/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 90dfe947c3db] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/{drm.tmpl => gpu.tmpl} | 209 +- + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 65 + + .../devicetree/bindings/display/msm/hdmi.txt | 3 + + .../devicetree/bindings/display/msm/mdp.txt | 3 +- + .../devicetree/bindings/display/renesas,du.txt | 14 +- + Documentation/kernel-parameters.txt | 15 +- + MAINTAINERS | 2 + + arch/arm/configs/exynos_defconfig | 1 + + drivers/dma-buf/fence.c | 98 + + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 104 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 397 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 74 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 53 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 2 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 149 +- + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 21 +- + drivers/gpu/drm/amd/amdgpu/cz_smc.c | 60 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 271 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 290 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 273 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 20 - + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 890 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 44 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 52 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 175 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 213 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 1 - + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 50 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../gpu/drm/amd/include/asic_reg/gca/gfx_8_1_d.h | 2791 +++ + .../drm/amd/include/asic_reg/gca/gfx_8_1_enum.h | 6808 ++++++ + .../drm/amd/include/asic_reg/gca/gfx_8_1_sh_mask.h | 21368 +++++++++++++++++++ + drivers/gpu/drm/amd/include/atombios.h | 2 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 52 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 7 +- + drivers/gpu/drm/armada/armada_drv.c | 87 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 8 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 6 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 - + drivers/gpu/drm/bridge/parade-ps8622.c | 1 - + drivers/gpu/drm/drm_agpsupport.c | 4 - + drivers/gpu/drm/drm_atomic.c | 28 +- + drivers/gpu/drm/drm_atomic_helper.c | 325 +- + drivers/gpu/drm/drm_bufs.c | 6 +- + drivers/gpu/drm/drm_crtc.c | 148 +- + drivers/gpu/drm/drm_dp_helper.c | 44 +- + drivers/gpu/drm/drm_drv.c | 67 +- + drivers/gpu/drm/drm_edid.c | 60 +- + drivers/gpu/drm/drm_edid_load.c | 43 +- + drivers/gpu/drm/drm_fb_helper.c | 212 +- + drivers/gpu/drm/drm_gem.c | 47 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 2 - + drivers/gpu/drm/drm_internal.h | 2 +- + drivers/gpu/drm/drm_ioc32.c | 6 +- + drivers/gpu/drm/drm_ioctl.c | 93 +- + drivers/gpu/drm/drm_irq.c | 367 +- + drivers/gpu/drm/drm_memory.c | 6 +- + drivers/gpu/drm/drm_mm.c | 6 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 + + drivers/gpu/drm/drm_of.c | 88 + + drivers/gpu/drm/drm_pci.c | 11 + + drivers/gpu/drm/drm_plane_helper.c | 6 +- + drivers/gpu/drm/drm_platform.c | 3 + + drivers/gpu/drm/drm_rect.c | 4 +- + drivers/gpu/drm/drm_sysfs.c | 49 +- + drivers/gpu/drm/drm_vm.c | 8 +- + drivers/gpu/drm/drm_vma_manager.c | 40 +- + drivers/gpu/drm/exynos/Kconfig | 75 +- + drivers/gpu/drm/exynos/Makefile | 3 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 324 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 16 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 4 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 28 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 5 + + drivers/gpu/drm/exynos/exynos_drm_fb.c | 45 +- + drivers/gpu/drm/exynos/exynos_drm_fb.h | 5 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 53 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 16 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 275 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 15 +- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 12 +- + drivers/gpu/drm/exynos/exynos_drm_iommu.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 20 +- + drivers/gpu/drm/exynos/exynos_drm_plane.h | 2 + + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 496 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 17 +- + drivers/gpu/drm/exynos/exynos_mixer.h | 20 - + drivers/gpu/drm/exynos/regs-hdmi.h | 33 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 7 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 - + drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 - + drivers/gpu/drm/gma500/psb_drv.h | 6 +- + drivers/gpu/drm/gma500/psb_irq.c | 8 +- + drivers/gpu/drm/gma500/psb_irq.h | 6 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 6 +- + drivers/gpu/drm/i2c/ch7006_mode.c | 26 +- + drivers/gpu/drm/i2c/ch7006_priv.h | 12 +- + drivers/gpu/drm/i915/Makefile | 4 + + drivers/gpu/drm/i915/dvo.h | 4 +- + drivers/gpu/drm/i915/dvo_ch7017.c | 4 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 4 +- + drivers/gpu/drm/i915/dvo_ivch.c | 12 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 4 +- + drivers/gpu/drm/i915/dvo_sil164.c | 4 +- + drivers/gpu/drm/i915/dvo_tfp410.c | 4 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 17 +- + drivers/gpu/drm/i915/i915_debugfs.c | 264 +- + drivers/gpu/drm/i915/i915_dma.c | 245 +- + drivers/gpu/drm/i915/i915_drv.c | 83 +- + drivers/gpu/drm/i915/i915_drv.h | 149 +- + drivers/gpu/drm/i915/i915_gem.c | 272 +- + drivers/gpu/drm/i915/i915_gem_context.c | 31 + + drivers/gpu/drm/i915/i915_gem_evict.c | 45 - + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 167 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 47 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 878 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 77 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 19 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 181 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 333 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 78 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 21 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 975 + + drivers/gpu/drm/i915/i915_irq.c | 686 +- + drivers/gpu/drm/i915/i915_params.c | 43 +- + drivers/gpu/drm/i915/i915_reg.h | 593 +- + drivers/gpu/drm/i915/i915_suspend.c | 45 +- + drivers/gpu/drm/i915/i915_sysfs.c | 34 +- + drivers/gpu/drm/i915/i915_trace.h | 78 +- + drivers/gpu/drm/i915/i915_vgpu.h | 34 +- + drivers/gpu/drm/i915/intel_acpi.c | 3 +- + drivers/gpu/drm/i915/intel_atomic.c | 13 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 6 +- + drivers/gpu/drm/i915/intel_audio.c | 47 +- + drivers/gpu/drm/i915/intel_bios.c | 43 +- + drivers/gpu/drm/i915/intel_bios.h | 3 - + drivers/gpu/drm/i915/intel_crt.c | 15 +- + drivers/gpu/drm/i915/intel_csr.c | 41 +- + drivers/gpu/drm/i915/intel_ddi.c | 182 +- + drivers/gpu/drm/i915/intel_display.c | 929 +- + drivers/gpu/drm/i915/intel_dp.c | 838 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 26 +- + drivers/gpu/drm/i915/intel_drv.h | 101 +- + drivers/gpu/drm/i915/intel_dsi.c | 323 +- + drivers/gpu/drm/i915/intel_dsi.h | 7 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 243 +- + drivers/gpu/drm/i915/intel_dvo.c | 64 +- + drivers/gpu/drm/i915/intel_fbc.c | 264 +- + drivers/gpu/drm/i915/intel_fbdev.c | 23 +- + drivers/gpu/drm/i915/intel_guc.h | 124 + + drivers/gpu/drm/i915/intel_guc_fwif.h | 31 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 608 + + drivers/gpu/drm/i915/intel_hdmi.c | 306 +- + drivers/gpu/drm/i915/intel_i2c.c | 54 +- + drivers/gpu/drm/i915/intel_lrc.c | 427 +- + drivers/gpu/drm/i915/intel_lrc.h | 18 +- + drivers/gpu/drm/i915/intel_lvds.c | 50 +- + drivers/gpu/drm/i915/intel_modes.c | 9 + + drivers/gpu/drm/i915/intel_opregion.c | 92 +- + drivers/gpu/drm/i915/intel_panel.c | 525 +- + drivers/gpu/drm/i915/intel_pm.c | 569 +- + drivers/gpu/drm/i915/intel_psr.c | 18 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 262 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 492 +- + drivers/gpu/drm/i915/intel_sdvo.c | 51 +- + drivers/gpu/drm/i915/intel_sprite.c | 59 +- + drivers/gpu/drm/i915/intel_tv.c | 14 +- + drivers/gpu/drm/i915/intel_uncore.c | 49 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 16 +- + drivers/gpu/drm/imx/imx-drm-core.c | 65 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 16 + + drivers/gpu/drm/mga/mga_dma.c | 4 +- + drivers/gpu/drm/mga/mga_drv.h | 6 +- + drivers/gpu/drm/mga/mga_irq.c | 20 +- + drivers/gpu/drm/msm/Kconfig | 14 - + drivers/gpu/drm/msm/Makefile | 2 +- + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 9 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 27 +- + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 15 +- + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 13 +- + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 9 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 238 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 8 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 6 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 21 +- + drivers/gpu/drm/msm/edp/edp.xml.h | 8 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 17 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 8 +- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 8 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 8 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 10 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 86 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 95 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 11 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 46 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 2 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 211 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 8 +- + drivers/gpu/drm/msm/mdp/mdp_common.xml.h | 15 +- + drivers/gpu/drm/msm/mdp/mdp_kms.h | 6 + + drivers/gpu/drm/msm/msm_atomic.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 36 +- + drivers/gpu/drm/msm/msm_fbdev.c | 5 - + drivers/gpu/drm/msm/msm_gem_prime.c | 2 - + drivers/gpu/drm/msm/msm_gpu.c | 8 + + drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.h | 2 +- + drivers/gpu/drm/nouveau/include/nvif/os.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | 13 +- + .../drm/nouveau/include/nvkm/subdev/bios/gpio.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/bios/pmu.h | 2 - + .../drm/nouveau/include/nvkm/subdev/bios/ramcfg.h | 2 +- + .../drm/nouveau/include/nvkm/subdev/bios/volt.h | 15 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/bus.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/ibus.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h | 4 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h | 5 +- + .../gpu/drm/nouveau/include/nvkm/subdev/timer.h | 10 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/volt.h | 1 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 84 +- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 30 +- + drivers/gpu/drm/nouveau/nouveau_chan.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 32 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 11 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 41 +- + drivers/gpu/drm/nouveau/nouveau_drm.h | 14 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_platform.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_sysfs.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 31 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 15 +- + drivers/gpu/drm/nouveau/nv50_display.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 83 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 13 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c | 13 - + drivers/gpu/drm/nouveau/nvkm/subdev/bios/rammap.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/volt.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.c | 32 + + drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h | 6 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/g84.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr5.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 141 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c | 123 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c | 121 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramseq.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr2.c | 6 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/sddr3.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/nv50.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf117.c | 51 + + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h | 7 + + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 371 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c | 14 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c | 32 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gk104.c | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h | 5 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 11 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/g84.c | 64 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c | 39 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf100.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/nv40.c | 2 +- + .../drm/nouveau/nvkm/subdev/pci/{nv50.c => nv46.c} | 14 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h | 6 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c | 4 + + drivers/gpu/drm/nouveau/nvkm/subdev/volt/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/volt/base.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c | 119 + + drivers/gpu/drm/nouveau/nvkm/subdev/volt/priv.h | 6 + + drivers/gpu/drm/omapdrm/omap_crtc.c | 3 - + drivers/gpu/drm/omapdrm/omap_drv.c | 18 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 4 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 - + drivers/gpu/drm/omapdrm/omap_irq.c | 16 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 12 +- + drivers/gpu/drm/qxl/qxl_drv.c | 7 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 14 +- + drivers/gpu/drm/r128/r128_cce.c | 12 +- + drivers/gpu/drm/r128/r128_drv.h | 6 +- + drivers/gpu/drm/r128/r128_irq.c | 16 +- + drivers/gpu/drm/radeon/atombios_dp.c | 1 + + drivers/gpu/drm/radeon/cayman_blit_shaders.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 32 +- + drivers/gpu/drm/radeon/evergreen_blit_shaders.c | 2 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 104 +- + drivers/gpu/drm/radeon/r600_blit_shaders.c | 2 +- + drivers/gpu/drm/radeon/r600_cp.c | 14 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 1 - + drivers/gpu/drm/radeon/radeon_agp.c | 8 +- + drivers/gpu/drm/radeon/radeon_asic.c | 1 - + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 4 +- + drivers/gpu/drm/radeon/radeon_bios.c | 1 - + drivers/gpu/drm/radeon/radeon_cp.c | 16 +- + drivers/gpu/drm/radeon/radeon_device.c | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 37 +- + drivers/gpu/drm/radeon/radeon_drv.c | 16 +- + drivers/gpu/drm/radeon/radeon_drv.h | 6 +- + drivers/gpu/drm/radeon/radeon_irq.c | 38 +- + drivers/gpu/drm/radeon/radeon_kms.c | 138 +- + drivers/gpu/drm/radeon/radeon_mode.h | 8 +- + drivers/gpu/drm/radeon/radeon_pm.c | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 10 +- + drivers/gpu/drm/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 48 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 45 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 89 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 3 - + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +- + drivers/gpu/drm/sis/sis_drv.h | 4 + + drivers/gpu/drm/sti/sti_crtc.c | 16 +- + drivers/gpu/drm/sti/sti_crtc.h | 4 +- + drivers/gpu/drm/sti/sti_drv.c | 4 +- + drivers/gpu/drm/tegra/dc.c | 16 +- + drivers/gpu/drm/tegra/dpaux.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 37 +- + drivers/gpu/drm/tegra/fb.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 +- + drivers/gpu/drm/vc4/Kconfig | 13 + + drivers/gpu/drm/vc4/Makefile | 17 + + drivers/gpu/drm/vc4/vc4_bo.c | 52 + + drivers/gpu/drm/vc4/vc4_crtc.c | 672 + + drivers/gpu/drm/vc4/vc4_debugfs.c | 39 + + drivers/gpu/drm/vc4/vc4_drv.c | 298 + + drivers/gpu/drm/vc4/vc4_drv.h | 145 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 590 + + drivers/gpu/drm/vc4/vc4_hvs.c | 163 + + drivers/gpu/drm/vc4/vc4_kms.c | 67 + + drivers/gpu/drm/vc4/vc4_plane.c | 320 + + drivers/gpu/drm/vc4/vc4_regs.h | 570 + + drivers/gpu/drm/vgem/vgem_drv.c | 55 +- + drivers/gpu/drm/via/via_drv.h | 10 +- + drivers/gpu/drm/via/via_irq.c | 17 +- + drivers/gpu/drm/virtio/Makefile | 3 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 57 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 28 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 72 + + drivers/gpu/drm/virtio/virtgpu_fence.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 41 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 573 + + drivers/gpu/drm/virtio/virtgpu_kms.c | 133 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 11 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 71 + + drivers/gpu/drm/virtio/virtgpu_ttm.c | 1 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 322 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 72 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 43 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 132 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 38 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 113 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 2 + + drivers/gpu/host1x/hw/debug_hw.c | 2 +- + drivers/gpu/host1x/hw/hw_host1x01_sync.h | 8 +- + drivers/gpu/host1x/hw/hw_host1x02_sync.h | 8 +- + drivers/gpu/host1x/hw/hw_host1x04_sync.h | 8 +- + drivers/gpu/ipu-v3/ipu-common.c | 5 + + drivers/gpu/ipu-v3/ipu-cpmem.c | 87 +- + drivers/gpu/ipu-v3/ipu-csi.c | 5 +- + drivers/gpu/vga/vga_switcheroo.c | 382 +- + drivers/gpu/vga/vgaarb.c | 4 +- + drivers/platform/x86/apple-gmux.c | 2 +- + include/drm/drmP.h | 48 +- + include/drm/drm_agpsupport.h | 57 +- + include/drm/drm_atomic_helper.h | 12 +- + include/drm/drm_crtc.h | 18 +- + include/drm/drm_dp_helper.h | 9 +- + include/drm/drm_edid.h | 5 +- + include/drm/drm_fb_helper.h | 31 +- + include/drm/drm_gem.h | 5 +- + include/drm/drm_modeset_lock.h | 10 +- + include/drm/drm_of.h | 13 + + include/drm/drm_plane_helper.h | 2 - + include/drm/drm_vma_manager.h | 24 +- + include/drm/i915_component.h | 65 +- + include/linux/fb.h | 2 +- + include/linux/fence.h | 25 +- + include/linux/vga_switcheroo.h | 100 +- + include/uapi/drm/Kbuild | 1 + + include/uapi/drm/amdgpu_drm.h | 2 +- + include/uapi/drm/drm_mode.h | 42 +- + include/uapi/drm/i810_drm.h | 2 + + include/uapi/drm/i915_drm.h | 3 +- + include/uapi/drm/nouveau_drm.h | 8 - + include/uapi/drm/r128_drm.h | 2 + + include/uapi/drm/savage_drm.h | 2 + + include/uapi/drm/sis_drm.h | 4 - + include/uapi/drm/via_drm.h | 4 - + include/uapi/drm/virtgpu_drm.h | 167 + + include/uapi/linux/virtio_gpu.h | 112 +- + include/video/exynos5433_decon.h | 29 + + sound/pci/hda/hda_controller.h | 2 +- + sound/pci/hda/hda_intel.c | 15 +- + sound/pci/hda/hda_intel.h | 2 +- + 449 files changed, 51900 insertions(+), 8728 deletions(-) + rename Documentation/DocBook/{drm.tmpl => gpu.tmpl} (97%) + create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_1_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_1_enum.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_8_1_sh_mask.h + delete mode 100644 drivers/gpu/drm/exynos/exynos_mixer.h + create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.c + create mode 100644 drivers/gpu/drm/i915/intel_guc.h + create mode 100644 drivers/gpu/drm/i915/intel_guc_loader.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf117.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ibus/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pci/g84.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c + rename drivers/gpu/drm/nouveau/nvkm/subdev/pci/{nv50.c => nv46.c} (83%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c + create mode 100644 drivers/gpu/drm/vc4/Kconfig + create mode 100644 drivers/gpu/drm/vc4/Makefile + create mode 100644 drivers/gpu/drm/vc4/vc4_bo.c + create mode 100644 drivers/gpu/drm/vc4/vc4_crtc.c + create mode 100644 drivers/gpu/drm/vc4/vc4_debugfs.c + create mode 100644 drivers/gpu/drm/vc4/vc4_drv.c + create mode 100644 drivers/gpu/drm/vc4/vc4_drv.h + create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi.c + create mode 100644 drivers/gpu/drm/vc4/vc4_hvs.c + create mode 100644 drivers/gpu/drm/vc4/vc4_kms.c + create mode 100644 drivers/gpu/drm/vc4/vc4_plane.c + create mode 100644 drivers/gpu/drm/vc4/vc4_regs.h + create mode 100644 drivers/gpu/drm/virtio/virtgpu_ioctl.c + create mode 100644 drivers/gpu/drm/virtio/virtgpu_prime.c + create mode 100644 include/uapi/drm/virtgpu_drm.h +Merging drm-panel/drm/panel/for-next (f1811a8a6413 drm/bridge: ptn3460: Fix coccinelle warnings) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (816d2206f0f9 Merge tag 'drm-intel-next-fixes-2015-11-06' of git://anongit.freedesktop.org/drm-intel into drm-next) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (2bcdcbfae289 drm/tegra: dc: Request/free syncpoint at init/exit) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (364b19868ecd drm/dp: add eDP DPCD backlight control bit definitions) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/tegra/fb.c +Auto-merging drivers/gpu/drm/drm_gem.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 48 +++++------------ + drivers/gpu/drm/drm_gem.c | 35 ++++++++++-- + drivers/gpu/drm/imx/Kconfig | 9 ---- + drivers/gpu/drm/imx/imx-drm-core.c | 12 ++--- + drivers/gpu/drm/sti/Kconfig | 6 --- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/tegra/Kconfig | 12 ----- + drivers/gpu/drm/tegra/drm.c | 4 +- + drivers/gpu/drm/tegra/drm.h | 6 +-- + drivers/gpu/drm/tegra/fb.c | 12 ++--- + include/drm/drm_dp_helper.h | 36 +++++++++++++ + include/drm/drm_gem.h | 106 ++++++++++++++++++++++++++++++++----- + 12 files changed, 187 insertions(+), 101 deletions(-) +Merging drm-exynos/exynos-drm/for-next (7d9071a09502 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (a9ee34b70e07 drm/msm: Remove local fbdev emulation Kconfig option) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging sound/for-next (16771c7c7047 ALSA: usb: Add native DSD support for Aune X1S) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (578049139e1c Merge remote-tracking branch 'asoc/fix/wm8960' into asoc-linus) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + sound/soc/codecs/arizona.c | 16 +++++----------- + sound/soc/codecs/rt5645.c | 38 +++++++++++++++++++++++++++++++++++--- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/fsl/fsl_sai.c | 3 ++- + sound/soc/sh/rcar/gen.c | 2 +- + sound/soc/sunxi/sun4i-codec.c | 27 ++++++++++++++------------- + 6 files changed, 58 insertions(+), 30 deletions(-) +Merging modules/modules-next (d1189c63ea5e scripts: [modpost] add new sections to white list) +$ git merge modules/modules-next +Resolved 'scripts/Makefile.modpost' using previous resolution. +Auto-merging scripts/Makefile.modpost +CONFLICT (content): Merge conflict in scripts/Makefile.modpost +Auto-merging lib/Kconfig.debug +Auto-merging kernel/params.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d64a656e9778] Merge remote-tracking branch 'modules/modules-next' +$ git diff -M --stat --summary HEAD^.. + kernel/params.c | 17 +++++++++-------- + lib/Kconfig.debug | 9 +++++++++ + scripts/Makefile.modpost | 1 + + scripts/mod/modpost.c | 37 ++++++++++++++++++++++++++++++------- + 4 files changed, 49 insertions(+), 15 deletions(-) +Merging input/next (5e0baca8b324 Input: parkbd - drop bogus __init from parkbd_allocate_serio()) +$ git merge input/next +Resolved 'drivers/input/touchscreen/tsc2005.c' using previous resolution. +Auto-merging drivers/input/touchscreen/tsc2005.c +CONFLICT (content): Merge conflict in drivers/input/touchscreen/tsc2005.c +Auto-merging drivers/input/touchscreen/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b26c6f98802c] Merge remote-tracking branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/input/touchscreen/tsc2005.txt | 34 +- + drivers/input/mouse/elantech.c | 7 + + drivers/input/serio/parkbd.c | 2 +- + drivers/input/touchscreen/Kconfig | 17 + + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/tsc2004.c | 83 +++ + drivers/input/touchscreen/tsc2005.c | 714 +-------------------- + drivers/input/touchscreen/tsc200x-core.c | 665 +++++++++++++++++++ + drivers/input/touchscreen/tsc200x-core.h | 78 +++ + 9 files changed, 899 insertions(+), 703 deletions(-) + create mode 100644 drivers/input/touchscreen/tsc2004.c + create mode 100644 drivers/input/touchscreen/tsc200x-core.c + create mode 100644 drivers/input/touchscreen/tsc200x-core.h +Merging block/for-next (4ef4e4105a25 Merge branch 'for-4.4/io-poll' into for-next) +$ git merge block/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/direct-io.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-core.c +Merge made by the 'recursive' strategy. + arch/m68k/emu/nfblock.c | 3 +- + arch/powerpc/sysdev/axonram.c | 5 ++- + arch/xtensa/platforms/iss/simdisk.c | 3 +- + block/blk-core.c | 67 ++++++++++++++++++++++++----- + block/blk-mq-sysfs.c | 10 +++++ + block/blk-mq.c | 59 +++++++++++++++---------- + block/blk-sysfs.c | 35 +++++++++++++++ + drivers/block/brd.c | 5 ++- + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_req.c | 3 +- + drivers/block/null_blk.c | 3 +- + drivers/block/pktcdvd.c | 9 ++-- + drivers/block/ps3vram.c | 6 ++- + drivers/block/rsxx/dev.c | 5 ++- + drivers/block/umem.c | 4 +- + drivers/block/zram/zram_drv.c | 5 ++- + drivers/lightnvm/rrpc.c | 9 ++-- + drivers/md/bcache/request.c | 11 +++-- + drivers/md/dm.c | 6 +-- + drivers/md/md.c | 8 ++-- + drivers/nvdimm/blk.c | 3 +- + drivers/nvdimm/btt.c | 3 +- + drivers/nvdimm/pmem.c | 3 +- + drivers/nvme/host/pci.c | 32 ++++++++++++-- + drivers/s390/block/dcssblk.c | 8 ++-- + drivers/s390/block/xpram.c | 5 ++- + drivers/staging/lustre/lustre/llite/lloop.c | 5 ++- + fs/direct-io.c | 14 ++++-- + include/linux/blk-mq.h | 10 +++++ + include/linux/blk_types.h | 24 +++++++++++ + include/linux/blkdev.h | 7 ++- + include/linux/fs.h | 2 +- + include/linux/lightnvm.h | 2 +- + 33 files changed, 286 insertions(+), 90 deletions(-) +Merging device-mapper/for-next (6823503119b9 dm thin metadata: speed up discard of partially mapped volumes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-thin-metadata.c | 66 +++++++++++++++++----------- + drivers/md/dm-thin.c | 1 + + drivers/md/persistent-data/dm-btree.c | 81 +++++++++++++++++++++++++++++++++++ + drivers/md/persistent-data/dm-btree.h | 7 +++ + 4 files changed, 130 insertions(+), 25 deletions(-) +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 (d3df0465db00 mmc: remove bondage between REQ_META and reliable write) +$ git merge mmc-uh/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/mmc/card/block.c | 11 ++---- + drivers/mmc/core/mmc.c | 93 +++++++++++++++++++++++++++++++++++------------ + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/pxamci.c | 2 +- + 6 files changed, 75 insertions(+), 35 deletions(-) +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (50ec7911e6f0 md/raid5: remove redundant check in stripe_add_to_batch_list()) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/Kconfig | 1 + + drivers/md/raid5.c | 2 -- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging mfd/for-mfd-next (271bb1773b1e bindings: mfd: s2mps11: Add documentation for s2mps15 PMIC) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (9d6c243502b7 backlight: pm8941-wled: Add default-brightness property) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (829a7da03fd5 Revert "ARM: dts: twl4030: Add iio properties for bci subnode") +$ git merge battery/master +Already up-to-date. +Merging omap_dss2/for-next (08bfb453f045 radeonfb: Deinline large functions) +$ git merge omap_dss2/for-next +Auto-merging drivers/video/fbdev/tridentfb.c +Auto-merging Documentation/devicetree/bindings/display/ssd1307fb.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/ssd1307fb.txt | 3 +- + drivers/video/fbdev/Kconfig | 7 +- + drivers/video/fbdev/aty/radeon_base.c | 133 ++++++++++++++- + drivers/video/fbdev/aty/radeonfb.h | 144 ++-------------- + drivers/video/fbdev/core/fb_ddc.c | 28 ++-- + drivers/video/fbdev/gxt4500.c | 25 ++- + drivers/video/fbdev/omap/omapfb_main.c | 5 - + drivers/video/fbdev/omap2/dss/hdmi.h | 9 +- + drivers/video/fbdev/omap2/dss/hdmi4.c | 66 ++++++-- + drivers/video/fbdev/omap2/dss/hdmi5.c | 75 +++++++-- + drivers/video/fbdev/ssd1307fb.c | 21 ++- + drivers/video/fbdev/tridentfb.c | 182 ++++++++++++++++++++- + 12 files changed, 506 insertions(+), 192 deletions(-) +Merging regulator/for-next (62e544b983a0 Merge remote-tracking branches 'regulator/topic/supply', 'regulator/topic/tps6105x' and 'regulator/topic/tps65023' into regulator-next) +$ git merge regulator/for-next +Already up-to-date. +Merging security/next (ba94c3ff20c9 Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (72e1eed8abb1 integrity: prevent loading untrusted certificates on the IMA trusted keyring) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (63205654c0e0 selinux: Use a kmem_cache for allocation struct file_security_struct) +$ git merge selinux/next +Already up-to-date. +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (760d280084f8 watchdog: include: add units for timeout values in kerneldoc) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + .../bindings/watchdog/brcm,bcm7038-wdt.txt | 19 ++ + drivers/watchdog/Kconfig | 8 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/bcm7038_wdt.c | 237 +++++++++++++++++++++ + drivers/watchdog/imx2_wdt.c | 6 +- + drivers/watchdog/intel-mid_wdt.c | 2 +- + drivers/watchdog/watchdog_core.c | 15 +- + drivers/watchdog/watchdog_dev.c | 163 +++++++------- + include/linux/watchdog.h | 23 +- + 9 files changed, 380 insertions(+), 94 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt + create mode 100644 drivers/watchdog/bcm7038_wdt.c +Merging iommu/next (b67ad2f7c751 Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (033291eccbdb vfio: Include No-IOMMU mode) +$ git merge vfio/next +Auto-merging drivers/vfio/Kconfig +Merge made by the 'recursive' strategy. + drivers/vfio/Kconfig | 15 ++ + drivers/vfio/pci/vfio_pci.c | 8 +- + drivers/vfio/pci/vfio_pci_config.c | 70 ++++++- + drivers/vfio/platform/Makefile | 6 +- + drivers/vfio/platform/reset/Kconfig | 8 + + drivers/vfio/platform/reset/Makefile | 2 + + .../vfio/platform/reset/vfio_platform_amdxgbe.c | 127 ++++++++++++ + .../platform/reset/vfio_platform_calxedaxgmac.c | 19 +- + drivers/vfio/platform/vfio_amba.c | 1 + + drivers/vfio/platform/vfio_platform.c | 1 + + drivers/vfio/platform/vfio_platform_common.c | 155 +++++++++----- + drivers/vfio/platform/vfio_platform_irq.c | 1 + + drivers/vfio/platform/vfio_platform_private.h | 40 +++- + drivers/vfio/vfio.c | 224 +++++++++++++++++++-- + drivers/vfio/vfio_iommu_type1.c | 15 +- + include/linux/vfio.h | 3 + + include/uapi/linux/vfio.h | 7 + + 17 files changed, 614 insertions(+), 88 deletions(-) + create mode 100644 drivers/vfio/platform/reset/vfio_platform_amdxgbe.c +Merging jc_docs/docs-next (3ce96239d482 Documentation: add new description of path-name lookup.) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (75021d28594d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (a4416687e957 audit: make audit_log_common_recv_msg() a void function) +$ git merge audit/next +Merge made by the 'recursive' strategy. +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 (2d799dde8e69 MAINTAINERS: update DT binding doc locations) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (cb1ca0b3bb66 mailbox: mailbox-test: avoid reading iomem twice) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (c70efb851531 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/ti-qspi' and 'spi/topic/txx9' into spi-next) +$ git merge spi/for-next +Already up-to-date. +Merging tip/auto-latest (ab441fc80aa8 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/kernel/cpu/intel.c | 1 + + 1 file changed, 1 insertion(+) +Merging clockevents/clockevents/next (53c573ecc2dc clocksource/drivers/h8300: Increase the compilation test coverage) +$ git merge clockevents/clockevents/next +Recorded preimage for 'arch/h8300/include/asm/io.h' +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/h8300/include/asm/io.h +CONFLICT (content): Merge conflict in arch/h8300/include/asm/io.h +Auto-merging arch/arm/mach-exynos/Kconfig +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/h8300/include/asm/io.h'. +[master fbad38404360] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 3 + + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-sti/Kconfig | 1 + + arch/arm/mach-ux500/Kconfig | 1 + + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/io.h | 39 +++--- + arch/h8300/kernel/setup.c | 8 +- + drivers/clocksource/Kconfig | 131 +++++++++++++----- + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/dw_apb_timer_of.c | 16 +++ + drivers/clocksource/h8300_timer16.c | 201 ++++++++++------------------ + drivers/clocksource/h8300_timer8.c | 243 ++++++++++++---------------------- + drivers/clocksource/h8300_tpu.c | 159 ++++++++-------------- + drivers/clocksource/mtk_timer.c | 20 +-- + drivers/clocksource/rockchip_timer.c | 23 ++-- + drivers/clocksource/tegra20_timer.c | 3 +- + drivers/clocksource/vt8500_timer.c | 1 - + drivers/irqchip/irq-renesas-h8300h.c | 8 +- + include/linux/sched_clock.h | 12 +- + 19 files changed, 390 insertions(+), 483 deletions(-) +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 (990995bad13c EDAC: Fix PAGES_TO_MiB macro misuse) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (29bade08fb07 irqchip: armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (03e88ae6b369 tracing: Remove unused ftrace_cpu_disabled per cpu variable) +$ git merge ftrace/for-next +Merge made by the 'recursive' strategy. + kernel/trace/trace.c | 10 +++------- + kernel/trace/trace.h | 1 - + kernel/trace/trace_functions_graph.c | 6 ------ + 3 files changed, 3 insertions(+), 14 deletions(-) +Merging rcu/rcu/next (39cd2dd39a8b Merge branches 'doc.2015.10.06a', 'percpu-rwsem.2015.10.06a' and 'torture.2015.10.06a' into HEAD) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next (a3eaa8649e4c KVM: VMX: Fix commit which broke PML) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (26caea7693cb KVM: arm/arm64: Merge vgic_set_lr() and vgic_sync_lr_elrsr()) +$ git merge kvm-arm/next +Already up-to-date. +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 (70aa3961a196 KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (46b708ea875f KVM: s390: use simple switch statement as multiplexer) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (abed7d0710e8 xen: fix the check of e_pfn in xen_find_pfn_range) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (5a928541585b kernel: Remove unneeded return from void function) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu-refcount.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging workqueues/for-next (4fcfc3013144 Merge branch 'for-4.4' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (d618651b0f11 thinkpad_acpi: Don't yell on unsupported brightness interfaces) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/thinkpad_acpi.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging chrome-platform/for-next (18800fc7a04e platform/chrome: Support reading/writing the vboot context) +$ git merge chrome-platform/for-next +Auto-merging include/linux/sysfs.h +Auto-merging fs/sysfs/group.c +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 5 +- + drivers/platform/chrome/Makefile | 3 +- + drivers/platform/chrome/cros_ec_dev.c | 7 ++ + drivers/platform/chrome/cros_ec_lightbar.c | 31 ++++--- + drivers/platform/chrome/cros_ec_lpc.c | 21 ++--- + drivers/platform/chrome/cros_ec_vbc.c | 137 +++++++++++++++++++++++++++++ + fs/sysfs/group.c | 17 +++- + include/linux/mfd/cros_ec.h | 1 + + include/linux/sysfs.h | 18 +++- + 9 files changed, 205 insertions(+), 35 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_vbc.c +Merging regmap/for-next (231e7cb81625 Merge remote-tracking branches 'regmap/topic/rbtree' and 'regmap/topic/update-offload' into regmap-next) +$ git merge regmap/for-next +Auto-merging arch/mips/boot/dts/brcm/bcm7425.dtsi +Auto-merging arch/mips/boot/dts/brcm/bcm7362.dtsi +Auto-merging arch/mips/boot/dts/brcm/bcm7360.dtsi +Auto-merging arch/mips/boot/dts/brcm/bcm7358.dtsi +Auto-merging arch/mips/boot/dts/brcm/bcm7346.dtsi +Merge made by the 'recursive' strategy. + arch/mips/boot/dts/brcm/bcm6328.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7125.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7346.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7358.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7360.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7362.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7420.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7425.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7435.dtsi | 1 - + drivers/base/regmap/regcache-rbtree.c | 9 +++++++-- + drivers/base/regmap/regmap-mmio.c | 16 ++++++++-------- + 11 files changed, 15 insertions(+), 19 deletions(-) +Merging hsi/for-next (16bd5865cdb3 hsi: controllers:remove redundant code) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (ffdc307d038f leds: 88pm860x: add missing of_node_put) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (d503e2fbbfea char: ipmi: ipmi_ssif: Replace timeval with timespec64) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 7 +++- + drivers/char/ipmi/ipmi_si_intf.c | 82 +++++++++++++++++++++++++-------------- + drivers/char/ipmi/ipmi_watchdog.c | 8 +++- + 3 files changed, 64 insertions(+), 33 deletions(-) +Merging driver-core/driver-core-next (c23fe83138ed debugfs: Add debugfs_create_ulong()) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (e052c6d15c61 tty: Use unbound workqueue for all input workers) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (0bbc367e21bf Merge 4.3-rc7 into usb-next) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (81e9d14a53eb usb: gadget: net2280: restore ep_cfg after defect7374 workaround) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (92944c4520ed USB: qcserial: update comment for Sierra Wireless MC7304/MC7354) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (2fb2884ed856 usb: chipidea: delete static debug support) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Removing drivers/usb/chipidea/debug.h +Auto-merging drivers/usb/chipidea/debug.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/Kconfig | 5 ----- + drivers/usb/chipidea/Makefile | 5 +---- + drivers/usb/chipidea/ci.h | 3 +++ + drivers/usb/chipidea/core.c | 1 - + drivers/usb/chipidea/debug.c | 1 - + drivers/usb/chipidea/debug.h | 30 ------------------------------ + drivers/usb/chipidea/udc.c | 28 ++++++++++++++++++++-------- + 7 files changed, 24 insertions(+), 49 deletions(-) + delete mode 100644 drivers/usb/chipidea/debug.h +Merging staging/staging-next (7c623cac4939 Merge tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply) +$ git merge staging/staging-next +Already up-to-date. +Merging char-misc/char-misc-next (e2d8680741ed fpga: socfpga: Fix check of return value of devm_request_irq) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (ce5c2d2c256a arm64: fixup for mm renames) +$ git merge extcon/extcon-next +Already up-to-date. +Merging cgroup/for-next (d57456753787 cgroup: fix race condition around termination check in css_task_iter_next()) +$ git merge cgroup/for-next +Already up-to-date. +Merging scsi/for-next (0cb9ad238b50 Merge branch 'mkp-scsi' into misc) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_sysfs.c +Merge made by the 'recursive' strategy. + drivers/scsi/megaraid/megaraid_sas.h | 61 +++- + drivers/scsi/megaraid/megaraid_sas_base.c | 444 +++++++++++++++++++--------- + drivers/scsi/megaraid/megaraid_sas_fp.c | 28 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 404 ++++++++++++++++--------- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 36 ++- + drivers/scsi/pm8001/pm8001_defs.h | 2 + + drivers/scsi/pm8001/pm8001_init.c | 213 ++++++++++++- + drivers/scsi/pm8001/pm8001_sas.h | 6 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 34 +++ + drivers/scsi/scsi_scan.c | 3 +- + drivers/scsi/scsi_sysfs.c | 16 +- + drivers/scsi/sg.c | 8 +- + 12 files changed, 920 insertions(+), 335 deletions(-) +Merging target-updates/for-next (517982229f78 configfs: remove old API) +$ git merge target-updates/for-next +Auto-merging samples/configfs/configfs_sample.c +Removing include/target/target_core_fabric_configfs.h +Auto-merging include/target/target_core_base.h +Removing include/target/configfs_macros.h +Auto-merging fs/ocfs2/cluster/heartbeat.c +Auto-merging drivers/vhost/scsi.c +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c +Auto-merging drivers/usb/gadget/function/f_uac2.c +Auto-merging drivers/usb/gadget/function/f_uac1.c +Auto-merging drivers/usb/gadget/function/f_subset.c +Auto-merging drivers/usb/gadget/function/f_sourcesink.c +Auto-merging drivers/usb/gadget/function/f_serial.c +Auto-merging drivers/usb/gadget/function/f_rndis.c +Auto-merging drivers/usb/gadget/function/f_printer.c +Auto-merging drivers/usb/gadget/function/f_phonet.c +Auto-merging drivers/usb/gadget/function/f_obex.c +Auto-merging drivers/usb/gadget/function/f_ncm.c +Auto-merging drivers/usb/gadget/function/f_midi.c +Auto-merging drivers/usb/gadget/function/f_mass_storage.c +Auto-merging drivers/usb/gadget/function/f_loopback.c +Auto-merging drivers/usb/gadget/function/f_hid.c +Auto-merging drivers/usb/gadget/function/f_eem.c +Auto-merging drivers/usb/gadget/function/f_ecm.c +Auto-merging drivers/usb/gadget/function/f_acm.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Removing Documentation/filesystems/configfs/configfs_example_explicit.c +Removing Documentation/filesystems/configfs/Makefile +Merge made by the 'recursive' strategy. + Documentation/filesystems/Makefile | 2 - + Documentation/filesystems/configfs/Makefile | 3 - + Documentation/filesystems/configfs/configfs.txt | 38 +- + .../configfs/configfs_example_explicit.c | 483 -------- + Documentation/target/tcm_mod_builder.py | 17 - + drivers/infiniband/ulp/srpt/ib_srpt.c | 78 +- + drivers/misc/spear13xx_pcie_gadget.c | 216 ++-- + drivers/net/netconsole.c | 271 +++-- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 153 +-- + drivers/target/iscsi/iscsi_target_configfs.c | 791 +++++-------- + drivers/target/iscsi/iscsi_target_stat.c | 666 +++++------ + drivers/target/loopback/tcm_loop.c | 60 +- + drivers/target/sbp/sbp_target.c | 87 +- + drivers/target/target_core_configfs.c | 1209 +++++++------------- + drivers/target/target_core_fabric_configfs.c | 275 ++--- + drivers/target/target_core_internal.h | 3 + + drivers/target/target_core_stat.c | 918 ++++++--------- + drivers/target/tcm_fc/tfc_cmd.c | 1 - + drivers/target/tcm_fc/tfc_conf.c | 44 +- + drivers/target/tcm_fc/tfc_io.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 1 - + drivers/usb/gadget/configfs.c | 295 ++--- + drivers/usb/gadget/function/f_acm.c | 26 +- + drivers/usb/gadget/function/f_ecm.c | 8 +- + drivers/usb/gadget/function/f_eem.c | 8 +- + drivers/usb/gadget/function/f_hid.c | 34 +- + drivers/usb/gadget/function/f_loopback.c | 31 +- + drivers/usb/gadget/function/f_mass_storage.c | 119 +- + drivers/usb/gadget/function/f_midi.c | 37 +- + drivers/usb/gadget/function/f_ncm.c | 8 +- + drivers/usb/gadget/function/f_obex.c | 26 +- + drivers/usb/gadget/function/f_phonet.c | 25 +- + drivers/usb/gadget/function/f_printer.c | 30 +- + drivers/usb/gadget/function/f_rndis.c | 8 +- + drivers/usb/gadget/function/f_serial.c | 26 +- + drivers/usb/gadget/function/f_sourcesink.c | 83 +- + drivers/usb/gadget/function/f_subset.c | 8 +- + drivers/usb/gadget/function/f_uac1.c | 39 +- + drivers/usb/gadget/function/f_uac2.c | 28 +- + drivers/usb/gadget/function/u_ether_configfs.h | 44 +- + drivers/usb/gadget/function/uvc_configfs.c | 387 +++---- + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 44 +- + drivers/vhost/scsi.c | 41 +- + drivers/xen/xen-scsiback.c | 32 +- + fs/configfs/file.c | 12 +- + fs/dlm/config.c | 288 ++--- + fs/ocfs2/cluster/heartbeat.c | 205 +--- + fs/ocfs2/cluster/nodemanager.c | 281 ++--- + include/linux/configfs.h | 97 +- + include/linux/usb/gadget_configfs.h | 19 +- + include/target/configfs_macros.h | 147 --- + include/target/target_core_base.h | 60 + + include/target/target_core_fabric_configfs.h | 122 -- + samples/Kconfig | 6 + + samples/Makefile | 3 +- + samples/configfs/Makefile | 2 + + .../configfs/configfs_sample.c | 140 +-- + 57 files changed, 2652 insertions(+), 5434 deletions(-) + delete mode 100644 Documentation/filesystems/configfs/Makefile + delete mode 100644 Documentation/filesystems/configfs/configfs_example_explicit.c + delete mode 100644 include/target/configfs_macros.h + delete mode 100644 include/target/target_core_fabric_configfs.h + create mode 100644 samples/configfs/Makefile + rename Documentation/filesystems/configfs/configfs_example_macros.c => samples/configfs/configfs_sample.c (74%) +$ git am -3 ../patches/stm-class--Use-per-attribute-show-and-store-methods-in-configfs-policy,patch +Applying: stm class: Use per-attribute show and store methods in configfs policy +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hwtracing/stm/policy.c +$ git add -A . +$ git commit -v -a --amend +[master 44d8129eab5a] Merge remote-tracking branch 'target-updates/for-next' + Date: Tue Nov 10 11:24:17 2015 +1100 +Merging target-merge/for-next-merge (8edb1554f7c2 mpt3sas: Fix unprotected list lookup in v4.3-rc0 changes) +$ git merge target-merge/for-next-merge +Merge made by the 'recursive' strategy. + drivers/scsi/mpt3sas/mpt3sas_base.h | 25 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 595 ++++++++++++++++++++++--------- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 18 +- + 3 files changed, 458 insertions(+), 180 deletions(-) +Merging pinctrl/for-next (d99c8053fc24 pinctrl: pinconf: remove needless loop) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_ring.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage) +$ git merge remoteproc/for-next +Already up-to-date. +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 (0963670aeaec gpio: fix up SPI submenu) +$ git merge gpio/for-next +Already up-to-date. +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 (f787670f9e6c pwm: sunxi: Fix whitespace issue) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/brcm,bcm7038-pwm.txt | 20 ++ + .../devicetree/bindings/pwm/pwm-berlin.txt | 17 + + .../devicetree/bindings/pwm/pwm-mtk-disp.txt | 42 +++ + .../devicetree/bindings/pwm/pwm-sun4i.txt | 2 + + .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 26 ++ + arch/unicore32/kernel/puv3-nb0916.c | 10 +- + drivers/pwm/Kconfig | 49 ++- + drivers/pwm/Makefile | 4 + + drivers/pwm/core.c | 37 ++- + drivers/pwm/pwm-atmel-hlcdc.c | 4 + + drivers/pwm/pwm-berlin.c | 219 +++++++++++++ + drivers/pwm/pwm-brcmstb.c | 343 +++++++++++++++++++++ + drivers/pwm/pwm-lpss-pci.c | 37 ++- + drivers/pwm/pwm-lpss-platform.c | 7 + + drivers/pwm/pwm-lpss.c | 62 ++-- + drivers/pwm/pwm-lpss.h | 2 + + drivers/pwm/pwm-mtk-disp.c | 243 +++++++++++++++ + drivers/pwm/pwm-pca9685.c | 20 +- + drivers/pwm/pwm-rcar.c | 274 ++++++++++++++++ + drivers/pwm/pwm-sun4i.c | 27 +- + drivers/pwm/sysfs.c | 75 +++-- + include/linux/pwm.h | 2 + + 22 files changed, 1440 insertions(+), 82 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-berlin.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt + create mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt + create mode 100644 drivers/pwm/pwm-berlin.c + create mode 100644 drivers/pwm/pwm-brcmstb.c + create mode 100644 drivers/pwm/pwm-mtk-disp.c + create mode 100644 drivers/pwm/pwm-rcar.c +Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge dma-buf/for-next +Already up-to-date. +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 (e5bf1991ea62 clk: qcom: msm8960: Fix dsi1/2 halt bits) +$ git merge clk/clk-next +Already up-to-date. +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 (6ff33f3902c3 Linux 4.3-rc1) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (3b5bab390181 selftests: breakpoint: Actually build it) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/vm/run_vmtests +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 4 + + tools/testing/selftests/breakpoints/Makefile | 2 +- + tools/testing/selftests/efivarfs/.gitignore | 2 + + .../ftrace/test.d/kprobe/add_and_remove.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +- + .../selftests/ftrace/test.d/kprobe/kprobe_args.tc | 2 +- + .../ftrace/test.d/kprobe/kprobe_ftrace.tc | 14 +-- + .../ftrace/test.d/kprobe/kretprobe_args.tc | 2 +- + tools/testing/selftests/memfd/Makefile | 12 +-- + tools/testing/selftests/memfd/memfd_test.c | 3 +- + tools/testing/selftests/memfd/run_fuse_test.sh | 0 + tools/testing/selftests/mqueue/mq_open_tests.c | 1 + + tools/testing/selftests/mqueue/mq_perf_tests.c | 1 + + tools/testing/selftests/pstore/Makefile | 15 +++ + tools/testing/selftests/pstore/common_tests | 83 +++++++++++++++ + tools/testing/selftests/pstore/pstore_crash_test | 30 ++++++ + .../selftests/pstore/pstore_post_reboot_tests | 77 ++++++++++++++ + tools/testing/selftests/pstore/pstore_tests | 30 ++++++ + tools/testing/selftests/seccomp/seccomp_bpf.c | 117 +++++++++++++++------ + .../selftests/static_keys/test_static_keys.sh | 0 + tools/testing/selftests/timers/nanosleep.c | 1 + + tools/testing/selftests/vm/run_vmtests | 15 ++- + 22 files changed, 362 insertions(+), 53 deletions(-) + create mode 100644 tools/testing/selftests/efivarfs/.gitignore + mode change 100644 => 100755 tools/testing/selftests/memfd/run_fuse_test.sh + create mode 100644 tools/testing/selftests/pstore/Makefile + create mode 100755 tools/testing/selftests/pstore/common_tests + create mode 100755 tools/testing/selftests/pstore/pstore_crash_test + create mode 100755 tools/testing/selftests/pstore/pstore_post_reboot_tests + create mode 100755 tools/testing/selftests/pstore/pstore_tests + mode change 100644 => 100755 tools/testing/selftests/static_keys/test_static_keys.sh +Merging y2038/y2038 (8750343a6505 coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +Auto-merging kernel/cpuset.c +Auto-merging fs/coredump.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/gdm72xx/gdm_sdio.c +Merge made by the 'recursive' strategy. + drivers/staging/gdm72xx/gdm_sdio.c | 13 ++++---- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +-- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++++------------ + drivers/staging/media/lirc/lirc_sasem.c | 20 ++++++------ + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++++-------------------- + fs/coredump.c | 8 +++-- + kernel/cpuset.c | 12 ++++--- + 7 files changed, 62 insertions(+), 80 deletions(-) +Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops) +$ git merge borntraeger/linux-next +Auto-merging lib/Makefile +Auto-merging include/linux/dma-mapping.h +Auto-merging arch/s390/pci/pci_dma.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci-noop.c | 46 ++--------------------- + arch/s390/Kconfig | 7 +--- + 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 +- + include/linux/dma-mapping.h | 2 + + lib/Makefile | 1 + + lib/dma-noop.c | 75 +++++++++++++++++++++++++++++++++++++ + 9 files changed, 96 insertions(+), 52 deletions(-) + create mode 100644 lib/dma-noop.c +Merging livepatching/for-next (a42a260806c4 Merge branch 'for-4.4/upstream' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (0130ff26f071 coresight: checking for NULL string in coresight_name_match()) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc/rtc-next (1e3929ef0e1c rtc: Add a driver for Micro Crystal RV8803) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-ds1390.c +Auto-merging drivers/rtc/rtc-ds1343.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/dallas,ds1390.txt | 18 + + Documentation/devicetree/bindings/rtc/pcf8563.txt | 25 + + drivers/rtc/Kconfig | 13 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-ab8500.c | 6 +- + drivers/rtc/rtc-at91rm9200.c | 2 + + drivers/rtc/rtc-da9063.c | 18 +- + drivers/rtc/rtc-davinci.c | 1 - + drivers/rtc/rtc-ds1307.c | 4 +- + drivers/rtc/rtc-ds1343.c | 9 +- + drivers/rtc/rtc-ds1390.c | 65 ++- + drivers/rtc/rtc-isl12057.c | 10 +- + drivers/rtc/rtc-isl1208.c | 2 +- + drivers/rtc/rtc-opal.c | 9 +- + drivers/rtc/rtc-pcf2127.c | 47 +- + drivers/rtc/rtc-pcf85063.c | 8 +- + drivers/rtc/rtc-pcf8563.c | 170 ++++++- + drivers/rtc/rtc-pl031.c | 13 +- + drivers/rtc/rtc-rv8803.c | 521 +++++++++++++++++++++ + drivers/rtc/rtc-rx8025.c | 4 +- + drivers/rtc/rtc-s3c.c | 16 + + drivers/rtc/rtc-stmp3xxx.c | 27 +- + tools/testing/selftests/timers/rtctest.c | 2 +- + 23 files changed, 908 insertions(+), 83 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1390.txt + create mode 100644 Documentation/devicetree/bindings/rtc/pcf8563.txt + create mode 100644 drivers/rtc/rtc-rv8803.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 (a22bb890cb0c coredump: add DAX filtering for FDPIC ELF coredumps) +$ git merge nvdimm/libnvdimm-for-next +Recorded preimage for 'block/ioctl.c' +Resolved 'arch/x86/kvm/mmu.c' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +Auto-merging kernel/memremap.c +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kvm_host.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/dax.c +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging drivers/s390/block/dcssblk.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging drivers/block/brd.c +Auto-merging drivers/acpi/nfit.h +Auto-merging drivers/acpi/nfit.c +Auto-merging block/ioctl.c +CONFLICT (content): Merge conflict in block/ioctl.c +Auto-merging block/blk.h +Auto-merging block/blk-mq.c +Auto-merging block/blk-core.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/init.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 +CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c +Auto-merging arch/powerpc/sysdev/axonram.c +Auto-merging arch/powerpc/kvm/e500_mmu_host.c +Auto-merging arch/mips/include/asm/kvm_host.h +Auto-merging Documentation/filesystems/proc.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'block/ioctl.c'. +[master 5708844cd43a] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/proc.txt | 22 +-- + arch/arm/include/asm/kvm_mmu.h | 5 +- + arch/arm/kvm/mmu.c | 10 +- + arch/arm64/include/asm/kvm_mmu.h | 3 +- + arch/mips/include/asm/kvm_host.h | 6 +- + arch/mips/kvm/emulate.c | 2 +- + arch/mips/kvm/tlb.c | 14 +- + arch/powerpc/include/asm/kvm_book3s.h | 4 +- + arch/powerpc/include/asm/kvm_ppc.h | 2 +- + arch/powerpc/kvm/book3s.c | 6 +- + arch/powerpc/kvm/book3s_32_mmu_host.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- + arch/powerpc/kvm/e500.h | 2 +- + arch/powerpc/kvm/e500_mmu_host.c | 8 +- + arch/powerpc/kvm/trace_pr.h | 2 +- + arch/powerpc/sysdev/axonram.c | 8 +- + arch/um/include/asm/page.h | 6 +- + arch/um/include/asm/pgtable-3level.h | 4 +- + arch/um/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/pmem.h | 7 +- + arch/x86/kvm/iommu.c | 11 +- + arch/x86/kvm/mmu.c | 37 +++-- + arch/x86/kvm/mmu_audit.c | 2 +- + arch/x86/kvm/paging_tmpl.h | 6 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/mm/init.c | 4 +- + arch/x86/mm/init_64.c | 4 +- + block/Kconfig | 15 ++ + block/blk-core.c | 12 +- + block/blk-mq.c | 19 ++- + block/blk.h | 2 - + block/ioctl.c | 60 +++++++ + drivers/acpi/nfit.c | 298 +++++++++++++++++++++++++++------- + drivers/acpi/nfit.h | 2 + + drivers/base/devres.c | 19 ++- + drivers/block/brd.c | 4 +- + drivers/nvdimm/pmem.c | 120 +++++++++----- + drivers/s390/block/dcssblk.c | 10 +- + fs/binfmt_elf.c | 10 ++ + fs/binfmt_elf_fdpic.c | 15 ++ + fs/block_dev.c | 129 +++++++++++++-- + fs/dax.c | 233 +++++++++++++++++--------- + include/linux/blkdev.h | 10 +- + include/linux/device.h | 16 +- + include/linux/fs.h | 11 ++ + include/linux/io.h | 17 -- + include/linux/kvm_host.h | 37 +++-- + include/linux/kvm_types.h | 2 +- + include/linux/mm.h | 91 +++++++++++ + include/linux/pfn.h | 9 + + include/linux/pmem.h | 26 +-- + include/linux/sched.h | 4 +- + include/uapi/linux/fs.h | 2 + + kernel/memremap.c | 114 +++++++++++-- + tools/testing/nvdimm/test/nfit.c | 164 ++++++++++++++++++- + virt/kvm/kvm_main.c | 47 +++--- + 57 files changed, 1260 insertions(+), 423 deletions(-) +Merging akpm-current/current (f1e1fabe6b48 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'block/blk-mq.c' +Resolved 'arch/arc/mm/cache.c' using previous resolution. +Resolved 'arch/s390/include/asm/pgtable.h' using previous resolution. +Resolved 'mm/pgtable-generic.c' using previous resolution. +Auto-merging tools/testing/selftests/vm/mlock2-tests.c +CONFLICT (add/add): Merge conflict in tools/testing/selftests/vm/mlock2-tests.c +Auto-merging net/openvswitch/flow.c +Auto-merging mm/vmstat.c +Auto-merging mm/vmscan.c +Auto-merging mm/util.c +Auto-merging mm/swap.c +CONFLICT (content): Merge conflict in mm/swap.c +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging mm/shmem.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Auto-merging mm/pgtable-generic.c +CONFLICT (content): Merge conflict in mm/pgtable-generic.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging mm/mremap.c +Auto-merging mm/mlock.c +Auto-merging mm/mincore.c +Auto-merging mm/migrate.c +CONFLICT (content): Merge conflict in mm/migrate.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memcontrol.c +CONFLICT (content): Merge conflict in mm/memcontrol.c +Auto-merging mm/ksm.c +CONFLICT (content): Merge conflict in mm/ksm.c +Auto-merging mm/internal.h +CONFLICT (content): Merge conflict in mm/internal.h +Auto-merging mm/hugetlb.c +CONFLICT (content): Merge conflict in mm/hugetlb.c +Auto-merging mm/huge_memory.c +CONFLICT (content): Merge conflict in mm/huge_memory.c +Auto-merging mm/gup.c +CONFLICT (content): Merge conflict in mm/gup.c +Auto-merging mm/filemap.c +Auto-merging mm/failslab.c +CONFLICT (content): Merge conflict in mm/failslab.c +Auto-merging mm/debug.c +Auto-merging lib/dma-debug.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/watchdog.c +CONFLICT (content): Merge conflict in kernel/watchdog.c +Auto-merging kernel/futex.c +Auto-merging include/uapi/asm-generic/mman-common.h +Auto-merging include/linux/vm_event_item.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/page-flags.h +CONFLICT (content): Merge conflict in include/linux/page-flags.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/mm.h +CONFLICT (content): Merge conflict in include/linux/mm.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/gfp.h +CONFLICT (content): Merge conflict in include/linux/gfp.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging fs/proc/task_mmu.c +CONFLICT (content): Merge conflict in fs/proc/task_mmu.c +Auto-merging fs/ocfs2/journal.c +Auto-merging fs/ocfs2/inode.h +Auto-merging fs/ocfs2/dlm/dlmrecovery.c +Auto-merging fs/ocfs2/aops.c +CONFLICT (content): Merge conflict in fs/ocfs2/aops.c +Auto-merging fs/cifs/file.c +Auto-merging fs/9p/vfs_file.c +CONFLICT (content): Merge conflict in fs/9p/vfs_file.c +Auto-merging drivers/usb/host/u132-hcd.c +CONFLICT (content): Merge conflict in drivers/usb/host/u132-hcd.c +Auto-merging drivers/nvme/host/pci.c +CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c +Auto-merging block/genhd.c +Auto-merging block/blk-mq.c +CONFLICT (content): Merge conflict in block/blk-mq.c +Auto-merging arch/xtensa/include/uapi/asm/mman.h +Auto-merging arch/x86/mm/gup.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/include/asm/pgtable.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h +Auto-merging arch/parisc/include/uapi/asm/mman.h +Auto-merging arch/mips/mm/tlbex.c +Auto-merging arch/mips/include/uapi/asm/mman.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arc/mm/cache.c +CONFLICT (content): Merge conflict in arch/arc/mm/cache.c +Auto-merging arch/alpha/include/uapi/asm/mman.h +Auto-merging Documentation/vm/transhuge.txt +Auto-merging Documentation/filesystems/proc.txt +CONFLICT (content): Merge conflict in Documentation/filesystems/proc.txt +Removing Documentation/features/vm/pmdp_splitting_flush/arch-support.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git merge --abort +$ 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: net/ipv4/route.c: prevent oops +Applying: mips: add entry for new mlock2 syscall +Applying: sparc/sparc64: allocate sys_membarrier system call number +Applying: kernel.h: make abs() work with 64-bit types +Applying: Remove abs64() +Applying: Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory +Applying: pcnet32: use pci_set_dma_mask insted of pci_dma_supported +Applying: tw68-core: use pci_set_dma_mask insted of pci_dma_supported +Applying: saa7164: use pci_set_dma_mask insted of pci_dma_supported +Applying: saa7134: use pci_set_dma_mask insted of pci_dma_supported +Applying: cx88: use pci_set_dma_mask insted of pci_dma_supported +Applying: cx25821: use pci_set_dma_mask insted of pci_dma_supported +Applying: cx23885: use pci_set_dma_mask insted of pci_dma_supported +Applying: netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported +Applying: nouveau: don't call pci_dma_supported +Applying: sfc: don't call dma_supported +Applying: kaweth: remove ifdefed out call to dma_supported +Applying: usbnet: remove ifdefed out call to dma_supported +Applying: pci: remove pci_dma_supported +Applying: dma: remove external references to dma_supported +Applying: drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS +Applying: kmap_atomic_to_page() has no users, remove it +Applying: include/linux/kdev_t.h: remove unused huge_valid_dev() +Applying: include/linux/kdev_t.h: old/new_valid_dev() can return bool +Applying: fs/9p: remove unnecessary new_valid_dev() checks +Applying: fs/btrfs/inode.c: remove unnecessary new_valid_dev() check +Applying: fs/exofs/namei.c: remove unnecessary new_valid_dev() check +Applying: fs/ext2/namei.c: remove unnecessary new_valid_dev() check +Applying: fs/f2fs/namei.c: remove unnecessary new_valid_dev() check +Applying: fs/hpfs/namei.c: remove unnecessary new_valid_dev() check +Applying: fs/jfs: remove unnecessary new_valid_dev() checks +Applying: fs/ncpfs/dir.c: remove unnecessary new_valid_dev() check +Applying: fs/nilfs2/namei.c: remove unnecessary new_valid_dev() check +Applying: fs/reiserfs/namei.c: remove unnecessary new_valid_dev() check +Applying: fs/stat.c: remove unnecessary new_valid_dev() check +Applying: fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 2140852486ed...dc0a2b135028 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (dc0a2b135028 fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/DMA-API.txt | 13 ------ + Documentation/sysctl/vm.txt | 2 +- + arch/arm/include/asm/highmem.h | 1 - + arch/arm/mm/highmem.c | 10 ----- + arch/frv/include/asm/highmem.h | 2 - + arch/frv/mm/highmem.c | 5 --- + arch/metag/include/asm/highmem.h | 1 - + arch/metag/mm/highmem.c | 14 ------- + arch/microblaze/include/asm/highmem.h | 13 ------ + arch/mips/include/asm/highmem.h | 1 - + arch/mips/include/uapi/asm/unistd.h | 15 ++++--- + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mips/mm/highmem.c | 13 ------ + arch/parisc/include/asm/cacheflush.h | 1 - + arch/powerpc/include/asm/highmem.h | 13 ------ + arch/sparc/include/uapi/asm/unistd.h | 3 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/tile/include/asm/highmem.h | 1 - + arch/tile/mm/highmem.c | 12 ------ + arch/x86/include/asm/highmem.h | 1 - + arch/x86/mm/highmem_32.c | 14 ------- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 7 +++- + drivers/gpu/drm/tegra/sor.c | 4 +- + drivers/input/joystick/walkera0701.c | 4 +- + drivers/media/i2c/ov9650.c | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 2 +- + drivers/media/pci/cx25821/cx25821-core.c | 2 +- + drivers/media/pci/cx88/cx88-alsa.c | 2 +- + drivers/media/pci/cx88/cx88-mpeg.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/media/pci/tw68/tw68-core.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 8 ++-- + drivers/net/usb/kaweth.c | 6 --- + drivers/net/usb/usbnet.c | 6 --- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/parisc/ccio-dma.c | 2 - + drivers/scsi/cxgbi/cxgb3i/Kbuild | 2 +- + drivers/scsi/cxgbi/cxgb4i/Kbuild | 2 +- + drivers/thermal/power_allocator.c | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + fs/9p/vfs_inode.c | 3 -- + fs/9p/vfs_inode_dotl.c | 3 -- + fs/binfmt_elf_fdpic.c | 46 ++++++++++++++++++---- + fs/btrfs/inode.c | 3 -- + fs/exofs/namei.c | 3 -- + fs/ext2/namei.c | 3 -- + fs/ext4/mballoc.c | 4 +- + fs/f2fs/namei.c | 3 -- + fs/gfs2/lock_dlm.c | 2 +- + fs/hpfs/namei.c | 2 - + fs/jfs/namei.c | 3 -- + fs/jfs/super.c | 3 -- + fs/ncpfs/dir.c | 2 - + fs/nilfs2/namei.c | 3 -- + fs/reiserfs/namei.c | 3 -- + fs/stat.c | 2 - + include/asm-generic/pci-dma-compat.h | 6 --- + include/linux/highmem.h | 1 - + include/linux/kdev_t.h | 9 +---- + include/linux/kernel.h | 42 ++++++++++---------- + kernel/time/clocksource.c | 2 +- + kernel/time/timekeeping.c | 2 +- + lib/div64.c | 2 +- + net/ipv4/route.c | 2 + + net/sctp/transport.c | 2 +- + 75 files changed, 119 insertions(+), 255 deletions(-) |