diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 5766 |
1 files changed, 5766 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..b9049c210b44 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5766 @@ +$ date -R +Mon, 27 Feb 2017 10:04:40 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 60e8d3e11645 Merge tag 'pci-v4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci +Merging origin/master (c4f3f22eddc9 Merge tag 'linux-kselftest-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ git merge origin/master +Updating 60e8d3e11645..c4f3f22eddc9 +Fast-forward + Documentation/00-INDEX | 4 +- + Documentation/admin-guide/md.rst | 5 + + Documentation/arm/sunxi/README | 8 + + Documentation/blockdev/zram.txt | 6 +- + Documentation/devicetree/bindings/arm/axentia.txt | 19 + + Documentation/devicetree/bindings/arm/cpus.txt | 2 + + Documentation/devicetree/bindings/arm/davinci.txt | 4 + + Documentation/devicetree/bindings/arm/fsl.txt | 20 +- + .../bindings/arm/hisilicon/hisilicon.txt | 4 + + .../bindings/arm/marvell/98dx3236-resume-ctrl.txt | 16 + + .../devicetree/bindings/arm/marvell/98dx3236.txt | 23 + + .../devicetree/bindings/arm/omap/omap.txt | 3 + + Documentation/devicetree/bindings/arm/shmobile.txt | 2 +- + Documentation/devicetree/bindings/arm/sunxi.txt | 1 + + .../devicetree/bindings/ata/ahci-da850.txt | 18 + + .../bindings/clock/brcm,bcm2835-cprman.txt | 15 +- + .../devicetree/bindings/clock/exynos4415-clock.txt | 38 - + .../devicetree/bindings/clock/hi3660-clock.txt | 42 + + .../devicetree/bindings/clock/idt,versaclock5.txt | 65 + + .../bindings/clock/mvebu-corediv-clock.txt | 1 + + .../devicetree/bindings/clock/mvebu-cpu-clock.txt | 1 + + .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 + + .../devicetree/bindings/clock/qoriq-clock.txt | 1 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 6 + + .../bindings/clock/rockchip,rk3328-cru.txt | 57 + + .../bindings/clock/rockchip,rk3399-cru.txt | 6 + + .../devicetree/bindings/clock/st,stm32-rcc.txt | 37 + + .../bindings/clock/stericsson,abx500.txt | 20 + + .../devicetree/bindings/clock/sun9i-de.txt | 28 + + .../devicetree/bindings/clock/sun9i-usb.txt | 24 + + .../devicetree/bindings/clock/sunxi-ccu.txt | 2 + + .../devicetree/bindings/clock/ti,cdce925.txt | 15 +- + .../devicetree/bindings/clock/zx296718-clk.txt | 3 + + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 35 + + .../bindings/display/bridge/adi,adv7511.txt | 12 + + .../devicetree/bindings/display/bridge/dw_hdmi.txt | 85 +- + .../bindings/display/bridge/ti,ths8135.txt | 46 + + .../bindings/display/exynos/exynos7-decon.txt | 2 +- + .../bindings/display/hisilicon/hisi-ade.txt | 2 +- + .../devicetree/bindings/display/imx/hdmi.txt | 51 +- + .../devicetree/bindings/display/msm/gpu.txt | 38 +- + .../bindings/display/multi-inno,mi0283qt.txt | 27 + + .../bindings/display/panel/boe,nv101wxmn51.txt | 7 + + .../bindings/display/panel/netron-dy,e231732.txt | 7 + + .../devicetree/bindings/display/panel/panel.txt | 4 + + .../bindings/display/panel/tianma,tm070jdhg30.txt | 7 + + .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 43 +- + .../devicetree/bindings/display/ssd1307fb.txt | 5 +- + .../devicetree/bindings/display/zte,vou.txt | 15 + + .../devicetree/bindings/eeprom/eeprom.txt | 2 + + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 81 + + .../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 14 +- + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 1 + + .../devicetree/bindings/i2c/i2c-stm32.txt | 33 + + .../bindings/i2c/nvidia,tegra186-bpmp-i2c.txt | 42 + + .../bindings/interrupt-controller/arm,gic.txt | 2 +- + .../devicetree/bindings/net/marvell,prestera.txt | 50 + + .../devicetree/bindings/power/pd-samsung.txt | 5 + + .../bindings/reset/hisilicon,hi3660-reset.txt | 43 + + .../devicetree/bindings/reset/ti-syscon-reset.txt | 8 +- + .../devicetree/bindings/reset/uniphier-reset.txt | 47 +- + .../devicetree/bindings/reset/zte,zx2967-reset.txt | 20 + + .../devicetree/bindings/soc/rockchip/grf.txt | 4 + + .../bindings/soc/rockchip/power_domain.txt | 3 + + .../devicetree/bindings/soc/zte/pd-2967xx.txt | 19 + + Documentation/devicetree/bindings/sound/rt5665.txt | 0 + .../devicetree/bindings/vendor-prefixes.txt | 8 + + Documentation/dma-buf-sharing.txt | 482 ---- + Documentation/driver-api/dma-buf.rst | 92 + + Documentation/gpu/drm-kms.rst | 8 +- + Documentation/gpu/drm-mm.rst | 61 +- + Documentation/gpu/drm-uapi.rst | 25 +- + Documentation/gpu/i915.rst | 103 + + Documentation/gpu/index.rst | 1 + + Documentation/gpu/introduction.rst | 15 +- + Documentation/gpu/tinydrm.rst | 42 + + Documentation/i2c/busses/i2c-i801 | 1 + + Documentation/i2c/muxes/i2c-mux-gpio | 20 +- + Documentation/kselftest.txt | 12 + + Documentation/{ => md}/md-cluster.txt | 0 + Documentation/md/raid5-cache.txt | 109 + + Documentation/sound/hd-audio/dp-mst.rst | 17 + + Documentation/sparc/console.txt | 9 + + Documentation/sysctl/vm.txt | 4 +- + Documentation/vm/ksm.txt | 18 + + Documentation/vm/userfaultfd.txt | 89 + + MAINTAINERS | 77 +- + arch/Kconfig | 3 + + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/current.h | 9 - + arch/alpha/include/asm/dma-mapping.h | 4 +- + arch/alpha/kernel/pci-noop.c | 4 +- + arch/alpha/kernel/pci_iommu.c | 4 +- + arch/arc/include/asm/dma-mapping.h | 4 +- + arch/arc/mm/dma.c | 2 +- + arch/arm/boot/dts/Makefile | 32 +- + arch/arm/boot/dts/alpine.dtsi | 2 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 2 + + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 163 ++ + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 109 + + arch/arm/boot/dts/am335x-boneblack.dts | 155 +- + arch/arm/boot/dts/am335x-bonegreen-common.dtsi | 44 + + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 126 ++ + arch/arm/boot/dts/am335x-bonegreen.dts | 38 +- + arch/arm/boot/dts/am335x-chiliboard.dts | 16 + + arch/arm/boot/dts/am335x-chilisom.dtsi | 8 + + arch/arm/boot/dts/am335x-evm.dts | 4 + + arch/arm/boot/dts/am335x-evmsk.dts | 4 + + arch/arm/boot/dts/am335x-icev2.dts | 4 + + arch/arm/boot/dts/am335x-nano.dts | 31 +- + arch/arm/boot/dts/am335x-pcm-953.dtsi | 288 +++ + arch/arm/boot/dts/am335x-phycore-rdk.dts | 27 + + arch/arm/boot/dts/am335x-phycore-som.dtsi | 72 +- + arch/arm/boot/dts/am335x-sl50.dts | 70 +- + arch/arm/boot/dts/am335x-wega.dtsi | 9 +- + arch/arm/boot/dts/am33xx.dtsi | 3 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 4 + + arch/arm/boot/dts/am437x-idk-evm.dts | 4 + + arch/arm/boot/dts/am437x-sk-evm.dts | 4 + + arch/arm/boot/dts/am43x-epos-evm.dts | 4 + + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 18 +- + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 5 + + arch/arm/boot/dts/am57xx-beagle-x15.dts | 5 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 4 + + arch/arm/boot/dts/armada-370-db.dts | 10 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 10 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 10 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 10 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 10 +- + arch/arm/boot/dts/armada-370-rd.dts | 54 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 10 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 10 +- + arch/arm/boot/dts/armada-370.dtsi | 10 +- + arch/arm/boot/dts/armada-375-db.dts | 10 +- + arch/arm/boot/dts/armada-375.dtsi | 10 +- + arch/arm/boot/dts/armada-380.dtsi | 10 +- + arch/arm/boot/dts/armada-385-linksys.dtsi | 52 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 58 +- + arch/arm/boot/dts/armada-385.dtsi | 10 +- + arch/arm/boot/dts/armada-388-clearfog-base.dts | 109 + + arch/arm/boot/dts/armada-388-clearfog-pro.dts | 55 + + arch/arm/boot/dts/armada-388-clearfog.dts | 435 ++-- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 307 +++ + arch/arm/boot/dts/armada-388-db.dts | 10 +- + arch/arm/boot/dts/armada-388-rd.dts | 10 +- + .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 130 +- + arch/arm/boot/dts/armada-38x.dtsi | 10 +- + arch/arm/boot/dts/armada-390-db.dts | 10 +- + arch/arm/boot/dts/armada-390.dtsi | 10 +- + arch/arm/boot/dts/armada-395.dtsi | 10 +- + arch/arm/boot/dts/armada-398-db.dts | 10 +- + arch/arm/boot/dts/armada-398.dtsi | 10 +- + arch/arm/boot/dts/armada-39x.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 254 +++ + arch/arm/boot/dts/armada-xp-98dx3336.dtsi | 76 + + arch/arm/boot/dts/armada-xp-98dx4251.dtsi | 90 + + arch/arm/boot/dts/armada-xp-axpwifiap.dts | 10 +- + arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 151 ++ + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 142 ++ + arch/arm/boot/dts/armada-xp-db.dts | 10 +- + arch/arm/boot/dts/armada-xp-gp.dts | 10 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 10 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 53 + + arch/arm/boot/dts/armada-xp-matrix.dts | 10 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 10 +- + arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 10 +- + arch/arm/boot/dts/armada-xp-synology-ds414.dts | 10 +- + arch/arm/boot/dts/armada-xp.dtsi | 10 +- + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 14 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 24 +- + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 45 + + arch/arm/boot/dts/aspeed-g4.dtsi | 776 +++++++ + arch/arm/boot/dts/aspeed-g5.dtsi | 879 ++++++++ + arch/arm/boot/dts/at91-linea.dtsi | 49 + + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 4 + + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 8 + + arch/arm/boot/dts/at91-tse850-3.dts | 274 +++ + arch/arm/boot/dts/axm55xx.dtsi | 2 +- + arch/arm/boot/dts/axp223.dtsi | 58 + + arch/arm/boot/dts/bcm-nsp.dtsi | 64 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 + + arch/arm/boot/dts/bcm283x.dtsi | 8 + + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 3 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 3 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 7 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 4 - + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 - + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 7 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 3 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 7 +- + arch/arm/boot/dts/bcm4708.dtsi | 4 + + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 3 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 7 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 3 +- + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 60 + + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 107 + + arch/arm/boot/dts/bcm47081.dtsi | 4 + + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 3 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 3 +- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 11 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 51 +- + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 4 - + arch/arm/boot/dts/bcm4709.dtsi | 1 + + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 7 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 13 +- + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 7 +- + arch/arm/boot/dts/bcm47094.dtsi | 1 + + arch/arm/boot/dts/bcm5301x.dtsi | 41 +- + arch/arm/boot/dts/bcm53573.dtsi | 22 + + arch/arm/boot/dts/bcm94708.dts | 4 - + arch/arm/boot/dts/bcm94709.dts | 4 - + arch/arm/boot/dts/bcm953012er.dts | 4 - + arch/arm/boot/dts/bcm953012k.dts | 1 - + arch/arm/boot/dts/bcm958522er.dts | 35 +- + arch/arm/boot/dts/bcm958525er.dts | 35 +- + arch/arm/boot/dts/bcm958525xmc.dts | 68 +- + arch/arm/boot/dts/bcm958622hr.dts | 42 + + arch/arm/boot/dts/bcm958623hr.dts | 58 +- + arch/arm/boot/dts/bcm958625hr.dts | 72 +- + arch/arm/boot/dts/bcm958625k.dts | 151 +- + arch/arm/boot/dts/bcm988312hr.dts | 42 + + arch/arm/boot/dts/da850-evm.dts | 20 + + arch/arm/boot/dts/da850-lcdk.dts | 90 + + arch/arm/boot/dts/da850-lego-ev3.dts | 313 +++ + arch/arm/boot/dts/da850.dtsi | 51 +- + arch/arm/boot/dts/dm814x.dtsi | 9 +- + arch/arm/boot/dts/dm816x.dtsi | 6 +- + arch/arm/boot/dts/dove-cm-a510.dtsi | 10 +- + arch/arm/boot/dts/dove-sbc-a510.dts | 10 +- + arch/arm/boot/dts/dra7-evm.dts | 286 +-- + arch/arm/boot/dts/dra7.dtsi | 2 +- + arch/arm/boot/dts/dra71-evm.dts | 5 + + arch/arm/boot/dts/dra72-evm-common.dtsi | 20 +- + arch/arm/boot/dts/dra72-evm-revc.dts | 4 + + arch/arm/boot/dts/ecx-2000.dts | 2 +- + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/boot/dts/exynos4.dtsi | 37 +- + arch/arm/boot/dts/exynos4210.dtsi | 1 + + arch/arm/boot/dts/exynos4212.dtsi | 133 -- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 25 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 28 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 5 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 13 + + arch/arm/boot/dts/exynos4412-odroidx2.dts | 25 +- + ...os4x12-pinctrl.dtsi => exynos4412-pinctrl.dtsi} | 4 +- + arch/arm/boot/dts/exynos4412-prime.dtsi | 41 + + arch/arm/boot/dts/exynos4412.dtsi | 578 ++++- + arch/arm/boot/dts/exynos4x12.dtsi | 594 ----- + arch/arm/boot/dts/exynos5.dtsi | 4 +- + arch/arm/boot/dts/exynos5250.dtsi | 11 + + arch/arm/boot/dts/exynos5260.dtsi | 2 +- + arch/arm/boot/dts/exynos5410.dtsi | 8 + + arch/arm/boot/dts/exynos5420.dtsi | 13 + + arch/arm/boot/dts/exynos5440.dtsi | 2 +- + arch/arm/boot/dts/imx1-ads.dts | 1 - + arch/arm/boot/dts/imx1.dtsi | 3 +- + arch/arm/boot/dts/imx23.dtsi | 5 +- + arch/arm/boot/dts/imx25.dtsi | 7 +- + arch/arm/boot/dts/imx27-apf27dev.dts | 2 - + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 1 - + arch/arm/boot/dts/imx27-pdk.dts | 1 - + arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 1 - + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 1 - + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 - + arch/arm/boot/dts/imx27.dtsi | 1 + + arch/arm/boot/dts/imx28.dtsi | 7 +- + arch/arm/boot/dts/imx31.dtsi | 5 +- + arch/arm/boot/dts/imx35.dtsi | 5 +- + arch/arm/boot/dts/imx50-evk.dts | 1 - + arch/arm/boot/dts/imx51-apf51dev.dts | 2 - + arch/arm/boot/dts/imx51-babbage.dts | 1 - + arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 - + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 - + arch/arm/boot/dts/imx53-qsb-common.dtsi | 20 +- + arch/arm/boot/dts/imx53-qsb.dts | 5 +- + arch/arm/boot/dts/imx53-qsrb.dts | 6 +- + arch/arm/boot/dts/imx53-smd.dts | 1 - + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 - + arch/arm/boot/dts/imx53-tx53.dtsi | 1 - + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 1 - + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 10 +- + arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 10 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 1 - + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 10 +- + arch/arm/boot/dts/imx6dl-cubox-i.dts | 10 +- + arch/arm/boot/dts/imx6dl-hummingboard.dts | 10 +- + arch/arm/boot/dts/imx6dl-icore-rqs.dts | 51 + + arch/arm/boot/dts/imx6dl-icore.dts | 10 +- + arch/arm/boot/dts/imx6dl-nit6xlite.dts | 10 +- + arch/arm/boot/dts/imx6dl-nitrogen6x.dts | 10 +- + arch/arm/boot/dts/imx6dl-sabrelite.dts | 10 +- + arch/arm/boot/dts/imx6dl-savageboard.dts | 51 + + arch/arm/boot/dts/imx6dl-ts4900.dts | 10 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 10 +- + arch/arm/boot/dts/imx6q-b450v3.dts | 10 +- + arch/arm/boot/dts/imx6q-b650v3.dts | 10 +- + arch/arm/boot/dts/imx6q-b850v3.dts | 10 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 11 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 11 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 32 +- + arch/arm/boot/dts/imx6q-cubox-i.dts | 10 +- + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 1 - + arch/arm/boot/dts/imx6q-evi.dts | 3 - + arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 - + arch/arm/boot/dts/imx6q-h100.dts | 10 +- + arch/arm/boot/dts/imx6q-hummingboard.dts | 10 +- + arch/arm/boot/dts/imx6q-icore-rqs.dts | 12 +- + arch/arm/boot/dts/imx6q-icore.dts | 10 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 11 +- + arch/arm/boot/dts/imx6q-mccmon6.dts | 473 ++++ + arch/arm/boot/dts/imx6q-nitrogen6_max.dts | 10 +- + arch/arm/boot/dts/imx6q-nitrogen6_som2.dts | 10 +- + arch/arm/boot/dts/imx6q-nitrogen6x.dts | 10 +- + arch/arm/boot/dts/imx6q-novena.dts | 1 - + arch/arm/boot/dts/imx6q-sabrelite.dts | 10 +- + arch/arm/boot/dts/imx6q-savageboard.dts | 55 + + arch/arm/boot/dts/imx6q-ts4900.dts | 10 +- + arch/arm/boot/dts/imx6q-utilite-pro.dts | 115 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 11 +- + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 132 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 166 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 163 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 16 + + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 132 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 130 +- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 98 +- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 14 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 15 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 13 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-savageboard.dtsi | 255 +++ + arch/arm/boot/dts/imx6qdl-ts4900.dtsi | 12 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 1 - + arch/arm/boot/dts/imx6qdl.dtsi | 12 +- + arch/arm/boot/dts/imx6qp.dtsi | 6 + + arch/arm/boot/dts/imx6sl-evk.dts | 1 - + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 11 +- + arch/arm/boot/dts/imx6sx-sdb-sai.dts | 10 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 137 ++ + arch/arm/boot/dts/imx6ul-geam-kit.dts | 10 +- + arch/arm/boot/dts/imx6ul-geam.dtsi | 10 +- + arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 77 + + arch/arm/boot/dts/imx6ul-isiot-nand.dts | 79 + + arch/arm/boot/dts/imx6ul-isiot.dtsi | 114 + + arch/arm/boot/dts/imx6ul-liteboard.dts | 10 +- + arch/arm/boot/dts/imx6ul-litesom.dtsi | 10 +- + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 192 ++ + arch/arm/boot/dts/imx6ul-opos6uldev.dts | 412 ++++ + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 10 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 - + arch/arm/boot/dts/imx6ul.dtsi | 11 +- + arch/arm/boot/dts/imx6ull-14x14-evk.dts | 10 +- + arch/arm/boot/dts/imx6ull.dtsi | 10 +- + arch/arm/boot/dts/imx7-colibri.dtsi | 16 +- + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 14 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 14 +- + arch/arm/boot/dts/imx7d-pinfunc.h | 110 +- + arch/arm/boot/dts/imx7d-sdb.dts | 25 +- + arch/arm/boot/dts/imx7s-warp.dts | 4 +- + arch/arm/boot/dts/imx7s.dtsi | 1 - + arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 3 +- + arch/arm/boot/dts/keystone-k2e.dtsi | 25 + + arch/arm/boot/dts/keystone-k2g.dtsi | 18 +- + arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 3 +- + arch/arm/boot/dts/keystone-k2hk.dtsi | 32 + + arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 3 +- + arch/arm/boot/dts/keystone-k2l.dtsi | 32 +- + arch/arm/boot/dts/keystone.dtsi | 13 +- + arch/arm/boot/dts/kirkwood-dir665.dts | 49 + + arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi | 10 +- + .../boot/dts/kirkwood-linkstation-duo-6281.dtsi | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts | 10 +- + arch/arm/boot/dts/kirkwood-linkstation.dtsi | 10 +- + arch/arm/boot/dts/kirkwood-linksys-viper.dts | 49 + + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 49 + + arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 9 +- + arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 11 + + arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 44 + + arch/arm/boot/dts/ls1021a.dtsi | 4 +- + arch/arm/boot/dts/mt2701-evb.dts | 54 + + arch/arm/boot/dts/mt2701.dtsi | 249 ++- + arch/arm/boot/dts/mt6580.dtsi | 2 +- + arch/arm/boot/dts/mt6589.dtsi | 2 +- + arch/arm/boot/dts/mt7623-evb.dts | 2 +- + arch/arm/boot/dts/mt7623.dtsi | 4 +- + arch/arm/boot/dts/mt8127.dtsi | 2 +- + arch/arm/boot/dts/mt8135.dtsi | 2 +- + arch/arm/boot/dts/mvebu-linkstation-fan.dtsi | 10 +- + .../boot/dts/mvebu-linkstation-gpio-simple.dtsi | 10 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 16 + + arch/arm/boot/dts/omap3-igep.dtsi | 21 - + arch/arm/boot/dts/omap3-n900.dts | 3 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 16 + + arch/arm/boot/dts/omap5-igep0050.dts | 21 + + arch/arm/boot/dts/omap5-uevm.dts | 21 + + arch/arm/boot/dts/omap5.dtsi | 2 +- + arch/arm/boot/dts/orion5x-kuroboxpro.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation-lschl.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation-lsgl.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 10 +- + arch/arm/boot/dts/orion5x-linkstation.dtsi | 10 +- + arch/arm/boot/dts/orion5x-lswsgl.dts | 10 +- + arch/arm/boot/dts/ox810se.dtsi | 10 +- + arch/arm/boot/dts/ox820.dtsi | 14 +- + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 62 +- + .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts | 69 + + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 22 - + arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 37 + + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 7 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 287 ++- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 +- + arch/arm/boot/dts/qcom-msm8660-surf.dts | 2 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 12 +- + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 8 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 96 +- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 8 + + arch/arm/boot/dts/r7s72100.dtsi | 28 + + arch/arm/boot/dts/r8a73a4.dtsi | 6 +- + arch/arm/boot/dts/r8a7743.dtsi | 18 +- + arch/arm/boot/dts/r8a7745.dtsi | 18 +- + arch/arm/boot/dts/r8a7778.dtsi | 10 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 4 + + arch/arm/boot/dts/r8a7779.dtsi | 9 +- + arch/arm/boot/dts/r8a7790.dtsi | 37 +- + arch/arm/boot/dts/r8a7791.dtsi | 35 +- + arch/arm/boot/dts/r8a7792.dtsi | 26 +- + arch/arm/boot/dts/r8a7793-gose.dts | 21 + + arch/arm/boot/dts/r8a7793.dtsi | 23 +- + arch/arm/boot/dts/r8a7794.dtsi | 23 +- + arch/arm/boot/dts/rk1108.dtsi | 2 +- + arch/arm/boot/dts/rk3036-evb.dts | 2 +- + arch/arm/boot/dts/rk3036-kylin.dts | 12 +- + arch/arm/boot/dts/rk3036.dtsi | 2 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 8 +- + arch/arm/boot/dts/rk3066a-marsboard.dts | 6 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 10 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 18 +- + arch/arm/boot/dts/rk3066a.dtsi | 4 + + arch/arm/boot/dts/rk3188-px3-evb.dts | 10 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 20 +- + arch/arm/boot/dts/rk3188.dtsi | 4 + + arch/arm/boot/dts/rk3229-evb.dts | 2 +- + arch/arm/boot/dts/rk322x.dtsi | 2 +- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 6 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 2 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 14 +- + arch/arm/boot/dts/rk3288-fennec.dts | 6 +- + arch/arm/boot/dts/rk3288-firefly-beta.dts | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +- + arch/arm/boot/dts/rk3288-firefly-reload.dts | 26 +- + arch/arm/boot/dts/rk3288-firefly.dts | 2 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 18 +- + arch/arm/boot/dts/rk3288-miqi.dts | 8 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 8 +- + arch/arm/boot/dts/rk3288-r89.dts | 14 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 4 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 14 +- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 8 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 8 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 14 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 14 +- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 12 +- + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 18 +- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 4 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 2 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 10 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 10 +- + arch/arm/boot/dts/rk3288.dtsi | 86 +- + arch/arm/boot/dts/sama5d2.dtsi | 30 +- + arch/arm/boot/dts/sama5d36ek_cmp.dts | 87 + + arch/arm/boot/dts/sama5d3_uart.dtsi | 4 +- + arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 201 ++ + arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 301 +++ + arch/arm/boot/dts/sama5d4.dtsi | 16 +- + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/boot/dts/socfpga.dtsi | 31 +- + arch/arm/boot/dts/socfpga_arria10.dtsi | 41 +- + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 9 + + arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts | 31 + + arch/arm/boot/dts/socfpga_arria5.dtsi | 4 + + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 43 + + arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 53 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 2 + + arch/arm/boot/dts/ste-href.dtsi | 16 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 1 + + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 1 + + arch/arm/boot/dts/ste-snowball.dts | 20 +- + arch/arm/boot/dts/stih407-family.dtsi | 59 +- + arch/arm/boot/dts/stih410-b2120.dts | 6 + + arch/arm/boot/dts/stih410.dtsi | 24 +- + arch/arm/boot/dts/stm32429i-eval.dts | 37 +- + arch/arm/boot/dts/stm32f429-disco.dts | 6 + + arch/arm/boot/dts/stm32f429.dtsi | 450 +++- + arch/arm/boot/dts/stm32f469-disco.dts | 36 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 43 +- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 14 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 14 +- + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 38 +- + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 6 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 12 +- + arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 16 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 26 +- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 14 +- + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 29 +- + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 12 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 13 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 2 +- + arch/arm/boot/dts/sun4i-a10-mk802.dts | 18 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 27 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 19 +- + arch/arm/boot/dts/sun4i-a10-pcduino2.dts | 6 +- + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 32 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 170 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 18 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 29 +- + arch/arm/boot/dts/sun5i-a10s-mk802.dts | 19 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 36 +- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 20 +- + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 21 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 128 +- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 23 +- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 22 +- + arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 224 ++ + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 40 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 36 +- + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 11 +- + arch/arm/boot/dts/sun5i-a13.dtsi | 164 +- + arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 12 +- + arch/arm/boot/dts/sun5i-gr8-evb.dts | 24 +- + arch/arm/boot/dts/sun5i-gr8.dtsi | 642 +----- + arch/arm/boot/dts/sun5i-r8-chip.dts | 27 +- + arch/arm/boot/dts/sun5i-r8.dtsi | 10 +- + .../boot/dts/sun5i-reference-design-tablet.dtsi | 33 +- + arch/arm/boot/dts/sun5i.dtsi | 437 +--- + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 6 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 22 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 42 +- + arch/arm/boot/dts/sun6i-a31-i7.dts | 49 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 19 +- + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 19 +- + arch/arm/boot/dts/sun6i-a31.dtsi | 122 +- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 20 +- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 18 +- + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 29 +- + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 9 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 14 +- + arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 27 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 26 +- + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 70 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 13 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 38 +- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 24 +- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 26 +- + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 7 +- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 30 +- + arch/arm/boot/dts/sun7i-a20-m3.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 70 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 27 +- + .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 6 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 123 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 28 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 45 +- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 38 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 25 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 21 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 25 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 13 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 287 +-- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 151 +- + arch/arm/boot/dts/sun8i-a23-evb.dts | 7 +- + .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 8 +- + .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 8 +- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 23 + + arch/arm/boot/dts/sun8i-a23.dtsi | 16 + + arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 9 +- + arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 20 +- + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 59 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 86 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 24 +- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 160 ++ + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 160 ++ + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 26 +- + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 18 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 4 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 26 +- + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 10 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 146 +- + arch/arm/boot/dts/sun8i-q8-common.dtsi | 9 +- + arch/arm/boot/dts/sun8i-r16-parrot.dts | 50 +- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 32 +- + arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 103 + + arch/arm/boot/dts/sun8i-v3s.dtsi | 309 +++ + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 23 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 41 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 470 ++-- + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 24 +- + arch/arm/boot/dts/tango4-common.dtsi | 46 + + arch/arm/boot/dts/tango4-vantage-1172.dts | 5 + + arch/arm/boot/dts/tegra124-apalis-eval.dts | 10 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 61 +- + arch/arm/boot/dts/tegra124-nyan-big.dts | 26 +- + arch/arm/boot/dts/tegra124-nyan-blaze.dts | 28 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 5 +- + arch/arm/boot/dts/tegra20-paz00.dts | 1 + + arch/arm/boot/dts/tegra20-trimslice.dts | 1 + + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 18 +- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 10 +- + arch/arm/boot/dts/vf-colibri.dtsi | 10 +- + arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 10 +- + arch/arm/boot/dts/vf500-colibri.dtsi | 10 +- + arch/arm/boot/dts/vf500.dtsi | 10 +- + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 10 +- + arch/arm/boot/dts/vf610-colibri.dtsi | 10 +- + arch/arm/boot/dts/vf610-twr.dts | 10 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 334 +-- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 416 ++++ + arch/arm/boot/dts/vf610-zii-dev.dtsi | 383 ++++ + arch/arm/boot/dts/vf610.dtsi | 10 +- + arch/arm/boot/dts/vf610m4-colibri.dts | 10 +- + arch/arm/boot/dts/vf610m4-cosmic.dts | 10 +- + arch/arm/boot/dts/vf610m4.dtsi | 10 +- + arch/arm/boot/dts/vfxxx.dtsi | 10 +- + arch/arm/common/dmabounce.c | 2 +- + arch/arm/configs/aspeed_g4_defconfig | 38 +- + arch/arm/configs/aspeed_g5_defconfig | 38 +- + arch/arm/configs/davinci_all_defconfig | 23 + + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm/configs/keystone_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 13 +- + arch/arm/configs/omap2plus_defconfig | 7 +- + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 34 + + arch/arm/configs/s5pv210_defconfig | 4 - + arch/arm/configs/sama5_defconfig | 7 +- + arch/arm/configs/shmobile_defconfig | 6 + + arch/arm/configs/socfpga_defconfig | 28 +- + arch/arm/configs/stm32_defconfig | 7 + + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/configs/tango4_defconfig | 94 + + arch/arm/configs/tegra_defconfig | 2 +- + arch/arm/configs/vf610m4_defconfig | 3 +- + arch/arm/include/asm/device.h | 1 - + arch/arm/include/asm/dma-mapping.h | 20 +- + arch/arm/mach-aspeed/Kconfig | 4 + + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-at91/pm.h | 2 - + arch/arm/mach-davinci/Makefile | 2 +- + arch/arm/mach-davinci/da850.c | 24 +- + arch/arm/mach-davinci/da8xx-dt.c | 10 + + arch/arm/mach-davinci/devices-da8xx.c | 30 +- + arch/arm/mach-davinci/include/mach/common.h | 2 + + arch/arm/mach-davinci/include/mach/da8xx.h | 1 + + arch/arm/mach-davinci/pdata-quirks.c | 39 + + arch/arm/mach-ep93xx/include/mach/uncompress.h | 12 + + arch/arm/mach-exynos/Kconfig | 5 - + arch/arm/mach-exynos/exynos.c | 5 +- + arch/arm/mach-exynos/mcpm-exynos.c | 2 +- + arch/arm/mach-exynos/suspend.c | 9 +- + arch/arm/mach-hisi/core.h | 1 - + arch/arm/mach-imx/devices/platform-flexcan.c | 9 - + .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 10 - + arch/arm/mach-imx/mach-mx27_3ds.c | 107 - + arch/arm/mach-imx/mach-mx31_3ds.c | 160 -- + arch/arm/mach-imx/mach-mx35_3ds.c | 103 - + arch/arm/mach-imx/mach-pcm037.c | 115 - + arch/arm/mach-imx/mx31moboard-marxbot.c | 92 - + arch/arm/mach-imx/mx31moboard-smartbot.c | 74 - + arch/arm/mach-keystone/Kconfig | 1 + + arch/arm/mach-mv78xx0/pcie.c | 2 +- + arch/arm/mach-mvebu/platsmp.c | 75 + + arch/arm/mach-omap1/clock.c | 20 - + arch/arm/mach-omap1/clock.h | 2 - + arch/arm/mach-omap1/include/mach/usb.h | 2 - + arch/arm/mach-omap1/usb.c | 51 +- + arch/arm/mach-omap2/clock.c | 61 - + arch/arm/mach-omap2/clock.h | 4 - + arch/arm/mach-omap2/display.c | 258 +-- + arch/arm/mach-omap2/display.h | 7 - + arch/arm/mach-omap2/id.c | 10 +- + arch/arm/mach-omap2/omap_hwmod.c | 33 + + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 8 +- + arch/arm/mach-omap2/pdata-quirks.c | 1 - + arch/arm/mach-pxa/ezx.c | 56 +- + arch/arm/mach-pxa/idp.c | 1 + + arch/arm/mach-rockchip/rockchip.c | 12 - + arch/arm/mach-s3c24xx/bast-irq.c | 4 +- + arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/pm-s3c2412.c | 2 +- + arch/arm/mach-s3c64xx/common.c | 3 +- + arch/arm/mach-s3c64xx/dev-audio.c | 19 - + arch/arm/mach-s3c64xx/pm.c | 2 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 41 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 40 +- + arch/arm/mach-shmobile/rcar-gen2.h | 2 - + arch/arm/mach-shmobile/setup-rcar-gen2.c | 18 - + arch/arm/mach-shmobile/smp-r8a7791.c | 14 +- + arch/arm/mach-sunxi/sunxi.c | 2 + + arch/arm/mach-tegra/board-paz00.c | 2 +- + arch/arm/mach-ux500/Makefile | 1 - + arch/arm/mach-ux500/board-mop500-audio.c | 77 - + arch/arm/mach-ux500/board-mop500.h | 17 - + arch/arm/mach-ux500/cpu-db8500.c | 17 - + arch/arm/mach-ux500/platsmp.c | 45 +- + arch/arm/mach-ux500/ste-dma40-db8500.h | 85 - + arch/arm/mm/dma-mapping.c | 38 +- + arch/arm/plat-samsung/devs.c | 19 - + arch/arm/plat-samsung/include/plat/wakeup-mask.h | 2 +- + arch/arm/plat-samsung/wakeup-mask.c | 2 +- + arch/arm/xen/mm.c | 4 +- + arch/arm64/Kconfig.platforms | 7 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 120 + + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 43 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 137 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 43 +- + arch/arm64/boot/dts/arm/juno-clocks.dtsi | 3 +- + arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 100 + + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 7 - + arch/arm64/boot/dts/arm/juno-r1.dts | 16 +- + arch/arm64/boot/dts/arm/juno-r2.dts | 16 +- + arch/arm64/boot/dts/arm/juno.dts | 27 +- + arch/arm64/boot/dts/broadcom/Makefile | 2 +- + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 4 + + arch/arm64/boot/dts/broadcom/ns2-xmc.dts | 191 ++ + arch/arm64/boot/dts/broadcom/ns2.dtsi | 123 +- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 197 ++ + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 373 ++-- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 1203 ++++++++++ + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 1039 +-------- + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 12 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 123 +- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 14 +- + arch/arm64/boot/dts/freescale/Makefile | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 115 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 128 ++ + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 59 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 247 +++ + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 80 + + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 1 - + arch/arm64/boot/dts/hisilicon/Makefile | 1 + + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 33 + + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 160 ++ + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/armada-371x.dtsi | 10 +- + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 44 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 76 +- + arch/arm64/boot/dts/marvell/armada-372x.dtsi | 10 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 39 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 138 ++ + .../boot/dts/marvell/armada-cp110-master.dtsi | 5 +- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 5 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 13 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 86 +- + .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 13 + + arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi | 13 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 32 + + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 14 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 19 + + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 13 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 315 ++- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 + + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 2 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 314 ++- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 37 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 245 ++- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 10 +- + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 14 +- + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 10 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 16 +- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 41 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 21 + + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 10 + + arch/arm64/boot/dts/zte/zx296718.dtsi | 39 + + arch/arm64/configs/defconfig | 9 + + arch/arm64/include/asm/device.h | 1 - + arch/arm64/include/asm/dma-mapping.h | 12 +- + arch/arm64/mm/dma-mapping.c | 18 +- + arch/avr32/include/asm/dma-mapping.h | 4 +- + arch/avr32/mm/dma-coherent.c | 2 +- + arch/blackfin/include/asm/dma-mapping.h | 4 +- + arch/blackfin/include/asm/vga.h | 1 + + arch/blackfin/kernel/dma-mapping.c | 2 +- + arch/c6x/include/asm/dma-mapping.h | 4 +- + arch/c6x/kernel/dma.c | 2 +- + arch/cris/arch-v32/drivers/pci/dma.c | 2 +- + arch/cris/include/asm/Kbuild | 1 + + arch/cris/include/asm/current.h | 15 - + arch/cris/include/asm/dma-mapping.h | 6 +- + arch/frv/include/asm/dma-mapping.h | 4 +- + arch/frv/mb93090-mb00/pci-dma-nommu.c | 2 +- + arch/frv/mb93090-mb00/pci-dma.c | 2 +- + arch/frv/mb93090-mb00/pci-frv.c | 11 +- + arch/h8300/include/asm/dma-mapping.h | 4 +- + arch/h8300/kernel/dma.c | 2 +- + arch/hexagon/include/asm/dma-mapping.h | 7 +- + arch/hexagon/kernel/dma.c | 4 +- + arch/ia64/hp/common/hwsw_iommu.c | 4 +- + arch/ia64/hp/common/sba_iommu.c | 4 +- + arch/ia64/include/asm/dma-mapping.h | 7 +- + arch/ia64/include/asm/machvec.h | 4 +- + arch/ia64/kernel/dma-mapping.c | 4 +- + arch/ia64/kernel/pci-dma.c | 10 +- + arch/ia64/kernel/pci-swiotlb.c | 2 +- + arch/m32r/Kconfig | 1 + + arch/m32r/include/asm/device.h | 1 - + arch/m32r/include/asm/dma-mapping.h | 4 +- + arch/m68k/68000/bootlogo-vz.h | 4 +- + arch/m68k/68000/bootlogo.h | 4 +- + arch/m68k/include/asm/MC68328.h | 3 +- + arch/m68k/include/asm/MC68EZ328.h | 3 +- + arch/m68k/include/asm/MC68VZ328.h | 2 +- + arch/m68k/include/asm/dma-mapping.h | 4 +- + arch/m68k/include/asm/natfeat.h | 3 +- + arch/m68k/kernel/dma.c | 2 +- + arch/m68k/lib/ashldi3.c | 8 +- + arch/m68k/lib/ashrdi3.c | 8 +- + arch/m68k/lib/lshrdi3.c | 8 +- + arch/m68k/lib/muldi3.c | 8 +- + arch/metag/include/asm/dma-mapping.h | 4 +- + arch/metag/kernel/dma.c | 2 +- + arch/microblaze/include/asm/dma-mapping.h | 4 +- + arch/microblaze/kernel/dma.c | 2 +- + arch/microblaze/pci/pci-common.c | 1 + + arch/mips/cavium-octeon/dma-octeon.c | 4 +- + arch/mips/include/asm/device.h | 5 - + arch/mips/include/asm/dma-mapping.h | 9 +- + .../include/asm/mach-cavium-octeon/dma-coherence.h | 2 +- + arch/mips/include/asm/netlogic/common.h | 2 +- + arch/mips/kernel/vdso.c | 2 +- + arch/mips/loongson64/common/dma-swiotlb.c | 2 +- + arch/mips/mm/dma-default.c | 8 +- + arch/mips/netlogic/common/nlm-dma.c | 2 +- + arch/mips/pci/pci-octeon.c | 2 +- + arch/mn10300/include/asm/dma-mapping.h | 4 +- + arch/mn10300/mm/dma-alloc.c | 2 +- + arch/nios2/boot/dts/10m50_devboard.dts | 0 + arch/nios2/configs/10m50_defconfig | 0 + arch/nios2/include/asm/dma-mapping.h | 4 +- + arch/nios2/mm/dma-mapping.c | 2 +- + arch/openrisc/Kconfig | 1 + + arch/openrisc/TODO.openrisc | 1 - + arch/openrisc/include/asm/Kbuild | 5 +- + arch/openrisc/include/asm/atomic.h | 126 ++ + arch/openrisc/include/asm/bitops.h | 2 +- + arch/openrisc/include/asm/bitops/atomic.h | 123 ++ + arch/openrisc/include/asm/cmpxchg.h | 83 + + arch/openrisc/include/asm/cpuinfo.h | 2 + + arch/openrisc/include/asm/dma-mapping.h | 4 +- + arch/openrisc/include/asm/futex.h | 135 ++ + arch/openrisc/include/asm/spr_defs.h | 4 +- + arch/openrisc/include/asm/string.h | 10 + + arch/openrisc/kernel/.gitignore | 1 + + arch/openrisc/kernel/dma.c | 2 +- + arch/openrisc/kernel/entry.S | 60 +- + arch/openrisc/kernel/head.S | 200 +- + arch/openrisc/kernel/or32_ksyms.c | 1 + + arch/openrisc/kernel/process.c | 14 + + arch/openrisc/kernel/ptrace.c | 1 - + arch/openrisc/kernel/setup.c | 67 +- + arch/openrisc/kernel/traps.c | 183 ++ + arch/openrisc/lib/Makefile | 2 +- + arch/openrisc/lib/memcpy.c | 124 ++ + arch/openrisc/lib/memset.S | 98 + + arch/openrisc/mm/ioremap.c | 2 + + arch/parisc/include/asm/dma-mapping.h | 8 +- + arch/parisc/kernel/drivers.c | 2 +- + arch/parisc/kernel/pci-dma.c | 4 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 52 +- + arch/powerpc/include/asm/device.h | 4 - + arch/powerpc/include/asm/dma-mapping.h | 14 +- + arch/powerpc/include/asm/pci.h | 4 +- + arch/powerpc/include/asm/ps3.h | 2 +- + arch/powerpc/include/asm/swiotlb.h | 2 +- + arch/powerpc/kernel/dma-swiotlb.c | 2 +- + arch/powerpc/kernel/dma.c | 8 +- + arch/powerpc/kernel/pci-common.c | 7 +- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/book3s_hv_builtin.c | 3 +- + arch/powerpc/platforms/cell/iommu.c | 6 +- + arch/powerpc/platforms/cell/spufs/file.c | 39 +- + arch/powerpc/platforms/pasemi/iommu.c | 2 +- + arch/powerpc/platforms/pasemi/setup.c | 2 +- + arch/powerpc/platforms/powernv/npu-dma.c | 2 +- + arch/powerpc/platforms/ps3/system-bus.c | 8 +- + arch/powerpc/platforms/pseries/ibmebus.c | 4 +- + arch/powerpc/platforms/pseries/vio.c | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/device.h | 1 - + arch/s390/include/asm/dma-mapping.h | 6 +- + arch/s390/kernel/crash_dump.c | 1 + + arch/s390/pci/pci.c | 2 +- + arch/s390/pci/pci_dma.c | 2 +- + arch/sh/boot/dts/j2_mimas_v2.dts | 0 + arch/sh/include/asm/dma-mapping.h | 4 +- + arch/sh/kernel/dma-nommu.c | 2 +- + arch/sh/mm/consistent.c | 2 +- + arch/sparc/include/asm/dma-mapping.h | 10 +- + arch/sparc/include/asm/page_64.h | 4 +- + arch/sparc/include/asm/pgtable_64.h | 23 +- + arch/sparc/include/asm/setup.h | 5 +- + arch/sparc/include/asm/tlbflush_64.h | 5 +- + arch/sparc/include/asm/topology_64.h | 4 +- + arch/sparc/include/asm/uprobes.h | 4 +- + arch/sparc/kernel/iommu.c | 4 +- + arch/sparc/kernel/ioport.c | 8 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/sparc/kernel/smp_64.c | 9 +- + arch/sparc/kernel/tsb.S | 21 +- + arch/sparc/mm/hugetlbpage.c | 201 +- + arch/sparc/mm/init_64.c | 260 ++- + arch/sparc/mm/srmmu.c | 6 +- + arch/sparc/mm/tlb.c | 17 +- + arch/sparc/mm/tsb.c | 61 +- + arch/tile/include/asm/device.h | 3 - + arch/tile/include/asm/dma-mapping.h | 20 +- + arch/tile/kernel/pci-dma.c | 24 +- + arch/tile/mm/elf.c | 2 +- + arch/unicore32/include/asm/dma-mapping.h | 4 +- + arch/unicore32/mm/dma-swiotlb.c | 2 +- + arch/x86/Kconfig | 5 +- + arch/x86/entry/vdso/vma.c | 2 +- + arch/x86/include/asm/device.h | 5 +- + arch/x86/include/asm/dma-mapping.h | 11 +- + arch/x86/include/asm/intel_pmc_ipc.h | 6 + + arch/x86/include/asm/iommu.h | 2 +- + arch/x86/include/asm/paravirt.h | 11 + + arch/x86/include/asm/paravirt_types.h | 2 + + arch/x86/include/asm/pgtable-2level.h | 17 + + arch/x86/include/asm/pgtable-3level.h | 30 + + arch/x86/include/asm/pgtable.h | 140 ++ + arch/x86/include/asm/pgtable_64.h | 15 + + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/paravirt.c | 1 + + arch/x86/kernel/pci-calgary_64.c | 6 +- + arch/x86/kernel/pci-dma.c | 7 +- + arch/x86/kernel/pci-nommu.c | 2 +- + arch/x86/kernel/pci-swiotlb.c | 2 +- + arch/x86/mm/gup.c | 28 +- + arch/x86/mm/mpx.c | 4 +- + arch/x86/mm/pgtable.c | 31 + + arch/x86/pci/common.c | 2 +- + arch/x86/pci/sta2x11-fixup.c | 10 +- + arch/x86/platform/atom/Makefile | 1 - + arch/x86/xen/pci-swiotlb-xen.c | 2 +- + arch/xtensa/include/asm/device.h | 4 - + arch/xtensa/include/asm/dma-mapping.h | 9 +- + arch/xtensa/kernel/pci-dma.c | 5 +- + block/Kconfig.iosched | 44 - + block/bio.c | 61 +- + block/blk-mq-sched.c | 29 +- + block/blk-mq-sched.h | 26 +- + block/blk-mq.c | 64 +- + block/elevator.c | 19 +- + block/genhd.c | 4 +- + block/sed-opal.c | 577 +++-- + crypto/lz4.c | 23 +- + crypto/lz4hc.c | 23 +- + crypto/testmgr.h | 142 +- + drivers/acpi/acpi_lpss.c | 2 +- + drivers/android/binder.c | 2 +- + drivers/ata/ahci.h | 3 + + drivers/ata/ahci_da850.c | 175 +- + drivers/ata/libahci.c | 18 +- + drivers/base/core.c | 5 + + drivers/base/dma-contiguous.c | 5 +- + drivers/base/memory.c | 2 +- + drivers/block/cciss_scsi.c | 182 +- + drivers/block/nbd.c | 307 ++- + drivers/block/sunvdc.c | 18 +- + drivers/block/zram/zram_drv.c | 127 +- + drivers/block/zram/zram_drv.h | 12 +- + drivers/bus/Kconfig | 1 + + drivers/bus/da8xx-mstpri.c | 2 +- + drivers/char/agp/alpha-agp.c | 5 +- + drivers/char/agp/intel-gtt.c | 6 +- + drivers/char/mspec.c | 6 +- + drivers/clk/Kconfig | 21 +- + drivers/clk/Makefile | 3 + + drivers/clk/axs10x/i2s_pll_clock.c | 1 + + drivers/clk/bcm/clk-bcm2835.c | 303 ++- + drivers/clk/clk-cdce925.c | 108 +- + drivers/clk/clk-conf.c | 15 +- + drivers/clk/clk-cs2000-cp.c | 22 + + drivers/clk/clk-scpi.c | 14 +- + drivers/clk/clk-stm32f4.c | 872 +++++++- + drivers/clk/clk-versaclock5.c | 791 +++++++ + drivers/clk/clk-wm831x.c | 3 +- + drivers/clk/hisilicon/Kconfig | 7 + + drivers/clk/hisilicon/Makefile | 1 + + drivers/clk/hisilicon/clk-hi3660.c | 567 +++++ + drivers/clk/hisilicon/clkgate-separated.c | 1 + + drivers/clk/imx/clk-imx6q.c | 21 +- + drivers/clk/imx/clk-imx7d.c | 1 + + drivers/clk/imx/clk-pllv3.c | 99 + + drivers/clk/imx/clk-vf610.c | 4 +- + drivers/clk/imx/clk.h | 1 + + drivers/clk/mediatek/Kconfig | 19 +- + drivers/clk/meson/meson8b.c | 1 - + drivers/clk/mvebu/Makefile | 2 +- + drivers/clk/mvebu/ap806-system-controller.c | 28 +- + drivers/clk/mvebu/armada-xp.c | 26 + + drivers/clk/mvebu/clk-corediv.c | 23 + + drivers/clk/mvebu/clk-cpu.c | 8 + + drivers/clk/mvebu/cp110-system-controller.c | 13 +- + drivers/clk/mvebu/mv98dx3236.c | 180 ++ + drivers/clk/qcom/clk-smd-rpm.c | 71 + + drivers/clk/qcom/common.c | 1 - + drivers/clk/qcom/gcc-ipq4019.c | 479 +++- + drivers/clk/qcom/gcc-mdm9615.c | 30 + + drivers/clk/qcom/gcc-msm8994.c | 18 + + drivers/clk/qcom/gcc-msm8996.c | 1 + + drivers/clk/qcom/gdsc.c | 58 +- + drivers/clk/renesas/clk-mstp.c | 17 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 10 + + drivers/clk/renesas/renesas-cpg-mssr.c | 149 +- + drivers/clk/rockchip/Makefile | 2 + + drivers/clk/rockchip/clk-muxgrf.c | 102 + + drivers/clk/rockchip/clk-pll.c | 16 +- + drivers/clk/rockchip/clk-rk3188.c | 4 +- + drivers/clk/rockchip/clk-rk3288.c | 36 +- + drivers/clk/rockchip/clk-rk3328.c | 895 ++++++++ + drivers/clk/rockchip/clk-rk3399.c | 2 +- + drivers/clk/rockchip/clk.c | 8 +- + drivers/clk/rockchip/clk.h | 40 + + drivers/clk/samsung/Makefile | 1 - + drivers/clk/samsung/clk-exynos-audss.c | 24 +- + drivers/clk/samsung/clk-exynos4.c | 4 + + drivers/clk/samsung/clk-exynos4415.c | 1022 --------- + drivers/clk/samsung/clk-exynos5433.c | 44 +- + drivers/clk/samsung/clk-pll.c | 45 +- + drivers/clk/samsung/clk-s3c2410.c | 4 +- + drivers/clk/samsung/clk-s3c2412.c | 4 +- + drivers/clk/samsung/clk-s3c2443.c | 4 +- + drivers/clk/samsung/clk-s3c64xx.c | 4 +- + drivers/clk/sunxi-ng/Kconfig | 32 + + drivers/clk/sunxi-ng/Makefile | 5 + + drivers/clk/sunxi-ng/ccu-sun5i.c | 1022 +++++++++ + drivers/clk/sunxi-ng/ccu-sun5i.h | 67 + + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 4 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 16 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 10 + + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 591 +++++ + drivers/clk/sunxi-ng/ccu-sun8i-v3s.h | 63 + + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 283 +++ + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h | 33 + + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 144 ++ + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h | 25 + + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 1223 +++++++++++ + drivers/clk/sunxi-ng/ccu-sun9i-a80.h | 57 + + drivers/clk/sunxi-ng/ccu_common.c | 24 +- + drivers/clk/sunxi-ng/ccu_common.h | 4 + + drivers/clk/sunxi-ng/ccu_div.c | 12 + + drivers/clk/sunxi-ng/ccu_div.h | 10 +- + drivers/clk/sunxi-ng/ccu_mp.c | 10 +- + drivers/clk/sunxi-ng/ccu_mult.c | 30 +- + drivers/clk/sunxi-ng/ccu_mult.h | 24 +- + drivers/clk/sunxi-ng/ccu_mux.c | 43 +- + drivers/clk/sunxi-ng/ccu_nk.c | 22 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 26 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 25 +- + drivers/clk/sunxi-ng/ccu_nm.c | 17 +- + drivers/clk/tegra/Kconfig | 4 + + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-bpmp.c | 620 ++++++ + drivers/clk/ti/divider.c | 31 +- + drivers/clk/uniphier/clk-uniphier-core.c | 7 +- + drivers/clk/uniphier/clk-uniphier-cpugear.c | 1 - + drivers/clk/uniphier/clk-uniphier-sys.c | 21 + + drivers/clk/ux500/abx500-clk.c | 44 +- + drivers/clk/ux500/u8500_of_clk.c | 3 + + drivers/clk/x86/Makefile | 1 + + drivers/clk/x86/clk-pmc-atom.c | 371 ++++ + drivers/clk/zte/clk-zx296718.c | 158 +- + drivers/clk/zte/clk.c | 127 ++ + drivers/clk/zte/clk.h | 21 + + drivers/cpufreq/davinci-cpufreq.c | 2 +- + drivers/crypto/chelsio/chcr_algo.c | 0 + drivers/dax/dax.c | 92 +- + drivers/dma-buf/dma-buf.c | 207 +- + drivers/dma-buf/dma-fence.c | 27 + + drivers/dma-buf/sync_debug.c | 17 +- + drivers/dma-buf/sync_file.c | 21 +- + drivers/firmware/Kconfig | 1 + + drivers/firmware/qcom_scm-32.c | 18 + + drivers/firmware/qcom_scm-64.c | 16 + + drivers/firmware/qcom_scm.c | 8 +- + drivers/firmware/qcom_scm.h | 2 + + drivers/gpu/drm/Kconfig | 36 +- + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 229 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 151 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 118 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 149 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 114 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 116 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 - + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 221 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 23 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 - + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 64 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 10 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 2 +- + .../asic_reg/si => amdgpu}/clearstate_si.h | 0 + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 2320 -------------------- + drivers/gpu/drm/amd/amdgpu/cz_dpm.h | 239 -- + drivers/gpu/drm/amd/amdgpu/cz_smc.c | 995 --------- + drivers/gpu/drm/amd/amdgpu/cz_smumgr.h | 94 - + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 227 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 898 +++++++- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 132 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 592 +++++ + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 55 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/si.c | 1072 ++++----- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 67 +- + drivers/gpu/drm/amd/amdgpu/si_enums.h | 4 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/si_smc.c | 2 +- + .../drm/amd/{include/asic_reg/si => amdgpu}/sid.h | 0 + drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h | 101 - + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 133 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 53 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 451 ++-- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 69 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 157 +- + drivers/gpu/drm/amd/amdgpu/vi.h | 112 + + drivers/gpu/drm/amd/amdgpu/vi_dpm.h | 4 - + drivers/gpu/drm/amd/amdgpu/vid.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +- + drivers/gpu/drm/amd/include/amd_shared.h | 14 + + .../gpu/drm/amd/include/asic_reg/dce/dce_10_0_d.h | 8 + + .../amd/include/asic_reg/dce/dce_10_0_sh_mask.h | 4 + + .../gpu/drm/amd/include/asic_reg/dce/dce_11_0_d.h | 9 + + .../amd/include/asic_reg/dce/dce_11_0_sh_mask.h | 6 + + .../gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h | 9 + + .../amd/include/asic_reg/dce/dce_11_2_sh_mask.h | 6 + + .../gpu/drm/amd/include/asic_reg/dce/dce_8_0_d.h | 8 + + .../drm/amd/include/asic_reg/dce/dce_8_0_sh_mask.h | 4 + + drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h | 105 - + .../gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h | 2 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_1_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_1_1_sh_mask.h | 2 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h | 1 + + .../amd/include/asic_reg/smu/smu_7_1_2_sh_mask.h | 2 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h | 2 +- + .../amd/include/asic_reg/smu/smu_7_1_3_sh_mask.h | 3 + + drivers/gpu/drm/amd/include/cgs_common.h | 8 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 741 ++++--- + drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 2 +- + drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c | 9 +- + .../gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 5 +- + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 86 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 99 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h | 1 - + .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 14 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 175 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 30 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 3 + + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 2 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 23 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.h | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 241 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 2 +- + .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 378 +++- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 28 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 20 +- + drivers/gpu/drm/amd/powerplay/inc/eventmgr.h | 3 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 21 +- + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 10 +- + drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 5 + + drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h | 3 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 20 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 181 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h | 4 - + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 44 +- + drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 10 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 32 +- + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 12 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 36 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 16 +- + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 43 +- + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 16 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 32 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 3 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 3 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 5 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 18 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 9 +- + drivers/gpu/drm/arm/malidp_drv.c | 76 +- + drivers/gpu/drm/arm/malidp_drv.h | 2 +- + drivers/gpu/drm/arm/malidp_hw.c | 41 +- + drivers/gpu/drm/arm/malidp_hw.h | 13 +- + drivers/gpu/drm/arm/malidp_planes.c | 102 +- + drivers/gpu/drm/arm/malidp_regs.h | 8 + + drivers/gpu/drm/armada/Kconfig | 2 +- + drivers/gpu/drm/armada/Makefile | 2 + + drivers/gpu/drm/armada/armada_crtc.c | 9 +- + drivers/gpu/drm/armada/armada_debugfs.c | 6 +- + drivers/gpu/drm/armada/armada_drv.c | 6 - + drivers/gpu/drm/armada/armada_fb.c | 2 +- + drivers/gpu/drm/armada/armada_fbdev.c | 7 +- + drivers/gpu/drm/armada/armada_gem.c | 13 +- + drivers/gpu/drm/armada/armada_overlay.c | 4 +- + drivers/gpu/drm/ast/Kconfig | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 3 +- + drivers/gpu/drm/ast/ast_fb.c | 7 +- + drivers/gpu/drm/ast/ast_main.c | 5 +- + drivers/gpu/drm/ast/ast_mode.c | 16 +- + drivers/gpu/drm/ast/ast_ttm.c | 2 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 17 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 22 +- + drivers/gpu/drm/bochs/Kconfig | 2 +- + drivers/gpu/drm/bochs/bochs.h | 1 + + drivers/gpu/drm/bochs/bochs_drv.c | 13 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 5 +- + drivers/gpu/drm/bochs/bochs_mm.c | 4 +- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 6 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 153 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + + drivers/gpu/drm/bridge/dw-hdmi.c | 441 ++-- + drivers/gpu/drm/bridge/dw-hdmi.h | 85 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 949 ++++++-- + drivers/gpu/drm/bridge/sil-sii8620.h | 50 +- + drivers/gpu/drm/cirrus/Kconfig | 2 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 3 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 8 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 7 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 9 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 - + drivers/gpu/drm/drm_agpsupport.c | 2 + + drivers/gpu/drm/drm_atomic.c | 141 +- + drivers/gpu/drm/drm_atomic_helper.c | 362 +-- + drivers/gpu/drm/drm_auth.c | 12 +- + drivers/gpu/drm/drm_blend.c | 11 +- + drivers/gpu/drm/drm_bridge.c | 88 +- + drivers/gpu/drm/drm_cache.c | 27 +- + drivers/gpu/drm/drm_color_mgmt.c | 28 +- + drivers/gpu/drm/drm_connector.c | 228 +- + drivers/gpu/drm/drm_crtc.c | 83 +- + drivers/gpu/drm/drm_crtc_helper.c | 85 +- + drivers/gpu/drm/drm_crtc_internal.h | 11 + + drivers/gpu/drm/drm_debugfs.c | 30 +- + drivers/gpu/drm/drm_debugfs_crc.c | 34 +- + drivers/gpu/drm/drm_dp_helper.c | 2 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 6 +- + drivers/gpu/drm/drm_drv.c | 98 +- + drivers/gpu/drm/drm_dumb_buffers.c | 4 +- + drivers/gpu/drm/drm_edid.c | 80 +- + drivers/gpu/drm/drm_encoder.c | 23 +- + drivers/gpu/drm/drm_encoder_slave.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 135 +- + drivers/gpu/drm/drm_fb_helper.c | 96 +- + drivers/gpu/drm/drm_fops.c | 15 +- + drivers/gpu/drm/drm_framebuffer.c | 71 +- + drivers/gpu/drm/drm_gem.c | 24 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 93 +- + drivers/gpu/drm/drm_global.c | 23 + + drivers/gpu/drm/drm_internal.h | 9 +- + drivers/gpu/drm/drm_ioctl.c | 34 +- + drivers/gpu/drm/drm_irq.c | 75 +- + drivers/gpu/drm/drm_legacy.h | 7 + + drivers/gpu/drm/drm_mm.c | 1023 ++++----- + drivers/gpu/drm/drm_mode_config.c | 150 +- + drivers/gpu/drm/drm_mode_object.c | 3 +- + drivers/gpu/drm/drm_modes.c | 28 +- + drivers/gpu/drm/drm_modeset_helper.c | 25 +- + drivers/gpu/drm/drm_modeset_lock.c | 10 +- + drivers/gpu/drm/drm_of.c | 1 + + drivers/gpu/drm/drm_panel.c | 2 +- + drivers/gpu/drm/drm_pci.c | 8 +- + drivers/gpu/drm/drm_plane.c | 20 +- + drivers/gpu/drm/drm_plane_helper.c | 17 +- + drivers/gpu/drm/drm_platform.c | 6 +- + drivers/gpu/drm/drm_prime.c | 19 +- + drivers/gpu/drm/drm_print.c | 6 + + drivers/gpu/drm/drm_probe_helper.c | 85 +- + drivers/gpu/drm/drm_property.c | 6 +- + drivers/gpu/drm/drm_rect.c | 6 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 23 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/gpu/drm/drm_vm.c | 36 +- + drivers/gpu/drm/drm_vma_manager.c | 3 +- + drivers/gpu/drm/etnaviv/Kconfig | 3 +- + drivers/gpu/drm/etnaviv/Makefile | 1 + + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 14 +- + drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c | 6 + + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 153 ++ + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 58 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 24 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 95 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 28 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 76 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 10 +- + drivers/gpu/drm/exynos/Kconfig | 2 - + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 100 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 8 +- + drivers/gpu/drm/exynos/exynos_dp.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 34 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 4 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 118 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 10 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 34 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 15 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 19 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 126 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 80 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 14 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 13 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 2 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 12 +- + drivers/gpu/drm/gma500/Kconfig | 2 +- + drivers/gpu/drm/gma500/accel_2d.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 11 +- + drivers/gpu/drm/gma500/gem.c | 3 +- + drivers/gpu/drm/gma500/gma_display.c | 13 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 17 +- + drivers/gpu/drm/gma500/oaktrail_crtc.c | 13 +- + drivers/gpu/drm/gma500/psb_drv.c | 9 +- + drivers/gpu/drm/gma500/psb_drv.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 + + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 7 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 4 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 5 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 27 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 15 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 5 +- + drivers/gpu/drm/i810/i810_dma.c | 24 +- + drivers/gpu/drm/i810/i810_drv.c | 1 - + drivers/gpu/drm/i810/i810_drv.h | 1 - + drivers/gpu/drm/i915/Kconfig.debug | 15 + + drivers/gpu/drm/i915/Makefile | 11 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 43 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 25 +- + drivers/gpu/drm/i915/gvt/display.c | 31 +- + drivers/gpu/drm/i915/gvt/display.h | 1 + + drivers/gpu/drm/i915/gvt/execlist.c | 2 +- + drivers/gpu/drm/i915/gvt/firmware.c | 47 +- + drivers/gpu/drm/i915/gvt/gtt.c | 70 +- + drivers/gpu/drm/i915/gvt/gvt.c | 7 - + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 1 - + drivers/gpu/drm/i915/gvt/interrupt.c | 57 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 108 +- + drivers/gpu/drm/i915/gvt/mpt.h | 12 - + drivers/gpu/drm/i915/gvt/render.c | 17 + + drivers/gpu/drm/i915/gvt/sched_policy.c | 1 - + drivers/gpu/drm/i915/gvt/scheduler.c | 15 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 14 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 174 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1150 ++-------- + drivers/gpu/drm/i915/i915_drv.c | 218 +- + drivers/gpu/drm/i915/i915_drv.h | 927 +++++--- + drivers/gpu/drm/i915/i915_gem.c | 529 ++--- + drivers/gpu/drm/i915/i915_gem.h | 4 +- + drivers/gpu/drm/i915/i915_gem_context.c | 297 ++- + drivers/gpu/drm/i915/i915_gem_context.h | 277 +++ + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 172 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 20 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 100 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.h | 2 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 617 ++++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 95 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 49 +- + drivers/gpu/drm/i915/i915_gem_object.h | 23 + + drivers/gpu/drm/i915/i915_gem_render_state.c | 6 +- + drivers/gpu/drm/i915/i915_gem_request.c | 113 +- + drivers/gpu/drm/i915/i915_gem_request.h | 11 - + drivers/gpu/drm/i915/i915_gem_stolen.c | 146 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 347 +-- + drivers/gpu/drm/i915/i915_gem_timeline.c | 16 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 116 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 13 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 959 ++------ + drivers/gpu/drm/i915/i915_irq.c | 169 +- + drivers/gpu/drm/i915/i915_oa_hsw.c | 752 +++++++ + drivers/gpu/drm/i915/i915_oa_hsw.h | 38 + + drivers/gpu/drm/i915/i915_params.c | 6 +- + drivers/gpu/drm/i915/i915_params.h | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 183 +- + drivers/gpu/drm/i915/i915_perf.c | 2096 ++++++++++++++++++ + drivers/gpu/drm/i915/i915_reg.h | 488 +++- + drivers/gpu/drm/i915/i915_suspend.c | 16 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 141 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 6 + + drivers/gpu/drm/i915/i915_sysfs.c | 6 +- + drivers/gpu/drm/i915/i915_trace.h | 34 +- + drivers/gpu/drm/i915/i915_utils.h | 64 + + drivers/gpu/drm/i915/i915_vgpu.c | 33 +- + drivers/gpu/drm/i915/i915_vma.c | 266 ++- + drivers/gpu/drm/i915/i915_vma.h | 59 +- + drivers/gpu/drm/i915/intel_atomic.c | 31 - + drivers/gpu/drm/i915/intel_atomic_plane.c | 51 +- + drivers/gpu/drm/i915/intel_audio.c | 39 +- + drivers/gpu/drm/i915/intel_bios.c | 27 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 10 +- + drivers/gpu/drm/i915/intel_crt.c | 7 +- + drivers/gpu/drm/i915/intel_csr.c | 16 +- + drivers/gpu/drm/i915/intel_ddi.c | 70 +- + drivers/gpu/drm/i915/intel_device_info.c | 55 +- + drivers/gpu/drm/i915/intel_display.c | 827 ++++--- + drivers/gpu/drm/i915/intel_dp.c | 366 ++- + drivers/gpu/drm/i915/intel_dp_mst.c | 31 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 130 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 351 ++- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 178 +- + drivers/gpu/drm/i915/intel_drv.h | 111 +- + drivers/gpu/drm/i915/intel_dsi.c | 46 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 38 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 18 +- + drivers/gpu/drm/i915/intel_dvo.c | 9 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 30 +- + drivers/gpu/drm/i915/intel_fbc.c | 20 +- + drivers/gpu/drm/i915/intel_fbdev.c | 19 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 79 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 255 ++- + drivers/gpu/drm/i915/intel_guc_log.c | 658 ++++++ + drivers/gpu/drm/i915/intel_gvt.c | 5 + + drivers/gpu/drm/i915/intel_hangcheck.c | 256 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 198 +- + drivers/gpu/drm/i915/intel_hotplug.c | 4 +- + drivers/gpu/drm/i915/intel_huc.c | 338 +++ + drivers/gpu/drm/i915/intel_i2c.c | 22 +- + drivers/gpu/drm/i915/intel_lrc.c | 259 +-- + drivers/gpu/drm/i915/intel_lrc.h | 11 +- + drivers/gpu/drm/i915/intel_lspcon.c | 99 +- + drivers/gpu/drm/i915/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/intel_mocs.c | 7 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 +- + drivers/gpu/drm/i915/intel_opregion.c | 13 +- + drivers/gpu/drm/i915/intel_overlay.c | 289 +-- + drivers/gpu/drm/i915/intel_panel.c | 32 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 1011 +++++++++ + drivers/gpu/drm/i915/intel_pm.c | 843 +++---- + drivers/gpu/drm/i915/intel_psr.c | 209 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 155 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 66 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 163 +- + drivers/gpu/drm/i915/intel_sdvo.c | 21 +- + drivers/gpu/drm/i915/intel_sprite.c | 131 +- + drivers/gpu/drm/i915/intel_tv.c | 4 +- + drivers/gpu/drm/i915/intel_uc.c | 116 + + drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} | 108 +- + drivers/gpu/drm/i915/intel_uncore.c | 14 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 12 +- + drivers/gpu/drm/imx/dw_hdmi-imx.c | 14 +- + drivers/gpu/drm/imx/imx-drm-core.c | 7 +- + drivers/gpu/drm/imx/imx-ldb.c | 8 +- + drivers/gpu/drm/imx/imx-tve.c | 18 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 40 +- + drivers/gpu/drm/imx/parallel-display.c | 6 +- + drivers/gpu/drm/lib/drm_random.c | 41 + + drivers/gpu/drm/lib/drm_random.h | 25 + + drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 9 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 - + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 24 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 +- + drivers/gpu/drm/meson/Makefile | 6 +- + drivers/gpu/drm/meson/meson_drv.c | 4 +- + drivers/gpu/drm/meson/meson_plane.c | 2 +- + drivers/gpu/drm/mga/mga_dma.c | 24 +- + drivers/gpu/drm/mga/mga_drv.c | 37 - + drivers/gpu/drm/mga/mga_drv.h | 2 +- + drivers/gpu/drm/mgag200/Kconfig | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 + + drivers/gpu/drm/mgag200/mgag200_drv.h | 4 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 1 + + drivers/gpu/drm/mgag200/mgag200_main.c | 9 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 100 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 - + drivers/gpu/drm/msm/Kconfig | 8 + + drivers/gpu/drm/msm/Makefile | 2 + + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 21 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 62 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 1 - + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 +- + drivers/gpu/drm/msm/dsi/dsi.c | 18 +- + drivers/gpu/drm/msm/dsi/dsi.h | 51 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 269 ++- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 25 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 97 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 257 ++- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 239 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 20 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 169 ++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 5 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 5 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 12 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 11 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c | 1104 ++++++++++ + drivers/gpu/drm/msm/edp/edp_bridge.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 28 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 48 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 10 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 3 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 135 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 73 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 14 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 4 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 77 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 123 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 45 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c | 8 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 183 +- + drivers/gpu/drm/msm/mdp/mdp_kms.h | 1 + + drivers/gpu/drm/msm/msm_atomic.c | 26 +- + drivers/gpu/drm/msm/msm_debugfs.c | 6 +- + drivers/gpu/drm/msm/msm_drv.c | 20 + + drivers/gpu/drm/msm/msm_drv.h | 14 +- + drivers/gpu/drm/msm/msm_fb.c | 12 +- + drivers/gpu/drm/msm/msm_fbdev.c | 10 +- + drivers/gpu/drm/msm/msm_gem.c | 6 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 13 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 3 +- + drivers/gpu/drm/msm/msm_gpu.c | 7 +- + drivers/gpu/drm/msm/msm_iommu.c | 7 +- + drivers/gpu/drm/msm/msm_kms.h | 3 + + drivers/gpu/drm/msm/msm_mmu.h | 9 + + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 2 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- + drivers/gpu/drm/nouveau/Kconfig | 3 +- + drivers/gpu/drm/nouveau/dispnv04/arb.c | 6 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 60 +- + drivers/gpu/drm/nouveau/dispnv04/cursor.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dac.c | 18 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 15 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 6 +- + drivers/gpu/drm/nouveau/dispnv04/disp.h | 6 +- + drivers/gpu/drm/nouveau/dispnv04/hw.c | 80 +- + drivers/gpu/drm/nouveau/dispnv04/hw.h | 42 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 24 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 4 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 16 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.h | 4 +- + drivers/gpu/drm/nouveau/include/nvif/cl826e.h | 2 +- + drivers/gpu/drm/nouveau/include/nvif/cl826f.h | 2 +- + drivers/gpu/drm/nouveau/include/nvif/cl906f.h | 3 +- + drivers/gpu/drm/nouveau/include/nvif/cla06f.h | 3 +- + drivers/gpu/drm/nouveau/include/nvif/class.h | 30 +- + drivers/gpu/drm/nouveau/include/nvif/client.h | 3 +- + drivers/gpu/drm/nouveau/include/nvif/driver.h | 6 +- + drivers/gpu/drm/nouveau/include/nvif/if0000.h | 11 +- + drivers/gpu/drm/nouveau/include/nvkm/core/client.h | 20 +- + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/core/memory.h | 7 +- + drivers/gpu/drm/nouveau/include/nvkm/core/mm.h | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/core/object.h | 5 + + drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h | 6 +- + .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 76 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 1 + + .../include/nvkm/subdev/bios/power_budget.h | 26 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 2 +- + .../gpu/drm/nouveau/include/nvkm/subdev/iccsense.h | 3 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h | 3 + + .../gpu/drm/nouveau/include/nvkm/subdev/secboot.h | 17 +- + .../gpu/drm/nouveau/include/nvkm/subdev/timer.h | 6 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/top.h | 1 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 24 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 18 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 358 +-- + drivers/gpu/drm/nouveau/nouveau_bo.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 30 +- + drivers/gpu/drm/nouveau/nouveau_chan.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 25 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 1 + + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 60 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 177 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 8 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 30 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_gem.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 110 +- + drivers/gpu/drm/nouveau/nouveau_led.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_nvif.c | 24 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 104 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 8 +- + drivers/gpu/drm/nouveau/nv04_fbcon.c | 2 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 8 +- + drivers/gpu/drm/nouveau/nv50_display.c | 50 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 8 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 10 +- + drivers/gpu/drm/nouveau/nvif/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvif/client.c | 49 +- + drivers/gpu/drm/nouveau/nvif/driver.c | 58 + + drivers/gpu/drm/nouveau/nvkm/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/core/client.c | 170 +- + drivers/gpu/drm/nouveau/nvkm/core/engine.c | 8 + + drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 78 +- + drivers/gpu/drm/nouveau/nvkm/core/mm.c | 2 + + drivers/gpu/drm/nouveau/nvkm/core/object.c | 64 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | 7 - + drivers/gpu/drm/nouveau/nvkm/engine/dma/base.c | 42 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c | 75 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chang84.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 266 ++- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h | 7 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c | 20 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/g84.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 307 +-- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gt200.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gt215.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp79.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/mcp89.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h | 2 + + drivers/gpu/drm/nouveau/nvkm/falcon/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 191 ++ + drivers/gpu/drm/nouveau/nvkm/falcon/priv.h | 8 + + drivers/gpu/drm/nouveau/nvkm/falcon/v1.c | 266 +++ + drivers/gpu/drm/nouveau/nvkm/subdev/bios/Kbuild | 1 + + .../drm/nouveau/nvkm/subdev/bios/power_budget.c | 126 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/clk/nv50.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/rammcp77.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv50.c | 23 +- + .../gpu/drm/nouveau/nvkm/subdev/iccsense/base.c | 20 +- + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/base.c | 10 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/g92.c | 57 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/g94.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/gf106.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c | 94 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 34 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild | 4 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.c | 54 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.h | 69 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 936 ++++++++ + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h | 250 +++ + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c | 138 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c | 254 +-- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c | 1391 +----------- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.h | 43 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c | 126 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h | 151 ++ + .../drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c | 158 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h | 199 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 22 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/base.c | 14 + + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 1 + + drivers/gpu/drm/omapdrm/dss/dispc.c | 46 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 18 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 3 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - + drivers/gpu/drm/omapdrm/omap_connector.c | 6 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 148 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 15 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 4 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 232 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 54 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 176 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 13 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 4 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 242 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 24 - + drivers/gpu/drm/panel/panel-simple.c | 102 + + drivers/gpu/drm/qxl/Kconfig | 2 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 16 +- + drivers/gpu/drm/qxl/qxl_display.c | 35 +- + drivers/gpu/drm/qxl/qxl_draw.c | 2 +- + drivers/gpu/drm/qxl/qxl_drv.c | 57 +- + drivers/gpu/drm/qxl/qxl_drv.h | 11 +- + drivers/gpu/drm/qxl/qxl_fb.c | 16 +- + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_irq.c | 2 +- + drivers/gpu/drm/qxl/qxl_kms.c | 70 +- + drivers/gpu/drm/qxl/qxl_object.c | 18 +- + drivers/gpu/drm/qxl/qxl_object.h | 8 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 25 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 19 +- + drivers/gpu/drm/radeon/r100.c | 10 +- + drivers/gpu/drm/radeon/radeon_bios.c | 64 +- + drivers/gpu/drm/radeon/radeon_cs.c | 3 +- + drivers/gpu/drm/radeon/radeon_device.c | 16 - + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 +- + drivers/gpu/drm/radeon/radeon_fb.c | 5 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 +- + drivers/gpu/drm/radeon/radeon_kms.c | 7 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 16 +- + drivers/gpu/drm/radeon/radeon_mode.h | 1 + + drivers/gpu/drm/radeon/radeon_object.c | 1 + + drivers/gpu/drm/radeon/radeon_object.h | 1 + + drivers/gpu/drm/radeon/radeon_ttm.c | 16 +- + drivers/gpu/drm/radeon/si_dpm.c | 47 +- + drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +- + drivers/gpu/drm/rockchip/Kconfig | 10 + + drivers/gpu/drm/rockchip/Makefile | 2 + + drivers/gpu/drm/rockchip/cdn-dp-core.c | 1260 +++++++++++ + drivers/gpu/drm/rockchip/cdn-dp-core.h | 112 + + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 979 +++++++++ + drivers/gpu/drm/rockchip/cdn-dp-reg.h | 483 ++++ + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 14 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 118 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 244 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 8 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 39 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 9 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 + + drivers/gpu/drm/savage/savage_bci.c | 4 +- + drivers/gpu/drm/savage/savage_drv.h | 2 +- + drivers/gpu/drm/selftests/Makefile | 1 + + drivers/gpu/drm/selftests/drm_mm_selftests.h | 24 + + drivers/gpu/drm/selftests/drm_selftest.c | 109 + + drivers/gpu/drm/selftests/drm_selftest.h | 41 + + drivers/gpu/drm/selftests/test-drm_mm.c | 2276 +++++++++++++++++++ + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 6 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 + + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 4 +- + drivers/gpu/drm/sis/sis_drv.c | 4 +- + drivers/gpu/drm/sis/sis_mm.c | 6 +- + drivers/gpu/drm/sti/Makefile | 1 - + drivers/gpu/drm/sti/sti_crtc.c | 46 +- + drivers/gpu/drm/sti/sti_drv.c | 162 +- + drivers/gpu/drm/sti/sti_drv.h | 7 - + drivers/gpu/drm/sti/sti_dvo.c | 13 +- + drivers/gpu/drm/sti/sti_gdp.c | 95 +- + drivers/gpu/drm/sti/sti_hda.c | 14 +- + drivers/gpu/drm/sti/sti_hdmi.c | 257 +-- + drivers/gpu/drm/sti/sti_hdmi.h | 17 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 31 +- + drivers/gpu/drm/sti/sti_mixer.h | 2 - + drivers/gpu/drm/sti/sti_plane.c | 17 +- + drivers/gpu/drm/sti/sti_plane.h | 2 +- + drivers/gpu/drm/sti/sti_tvout.c | 8 - + drivers/gpu/drm/sti/sti_vtac.c | 223 -- + drivers/gpu/drm/sti/sti_vtg.c | 63 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 7 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 13 +- + drivers/gpu/drm/tegra/dc.c | 8 +- + drivers/gpu/drm/tegra/drm.c | 46 +- + drivers/gpu/drm/tegra/drm.h | 1 + + drivers/gpu/drm/tegra/fb.c | 15 +- + drivers/gpu/drm/tegra/gem.c | 7 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 19 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 2 - + drivers/gpu/drm/tilcdc/tilcdc_external.c | 4 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +- + drivers/gpu/drm/tinydrm/Kconfig | 21 + + drivers/gpu/drm/tinydrm/Makefile | 7 + + drivers/gpu/drm/tinydrm/core/Makefile | 3 + + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 376 ++++ + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 460 ++++ + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 234 ++ + drivers/gpu/drm/tinydrm/mi0283qt.c | 279 +++ + drivers/gpu/drm/tinydrm/mipi-dbi.c | 1005 +++++++++ + drivers/gpu/drm/ttm/ttm_bo.c | 129 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 31 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 22 +- + drivers/gpu/drm/udl/udl_drv.h | 4 +- + drivers/gpu/drm/udl/udl_fb.c | 9 +- + drivers/gpu/drm/udl/udl_gem.c | 3 +- + drivers/gpu/drm/udl/udl_main.c | 3 +- + drivers/gpu/drm/vc4/Kconfig | 2 + + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_crtc.c | 52 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 7 +- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 9 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 1725 +++++++++++++++ + drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 17 +- + drivers/gpu/drm/vc4/vc4_kms.c | 1 - + drivers/gpu/drm/vc4/vc4_plane.c | 14 +- + drivers/gpu/drm/vc4/vc4_regs.h | 5 + + drivers/gpu/drm/vgem/vgem_drv.c | 3 +- + drivers/gpu/drm/vgem/vgem_drv.h | 1 + + drivers/gpu/drm/vgem/vgem_fence.c | 4 +- + drivers/gpu/drm/via/via_drv.h | 2 +- + drivers/gpu/drm/via/via_map.c | 4 +- + drivers/gpu/drm/via/via_mm.c | 4 +- + drivers/gpu/drm/virtio/Kconfig | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 4 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 20 +- + drivers/gpu/drm/vmwgfx/Kconfig | 2 +- + .../drm/vmwgfx/device_include/svga3d_surfacedefs.h | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +- + drivers/gpu/drm/zte/Kconfig | 2 + + drivers/gpu/drm/zte/Makefile | 1 + + drivers/gpu/drm/zte/zx_drm_drv.c | 3 +- + drivers/gpu/drm/zte/zx_drm_drv.h | 1 + + drivers/gpu/drm/zte/zx_hdmi.c | 160 +- + drivers/gpu/drm/zte/zx_hdmi_regs.h | 14 + + drivers/gpu/drm/zte/zx_plane.c | 332 ++- + drivers/gpu/drm/zte/zx_plane.h | 12 +- + drivers/gpu/drm/zte/zx_plane_regs.h | 51 + + drivers/gpu/drm/zte/zx_tvenc.c | 407 ++++ + drivers/gpu/drm/zte/zx_tvenc_regs.h | 31 + + drivers/gpu/drm/zte/zx_vou.c | 371 +++- + drivers/gpu/drm/zte/zx_vou.h | 48 +- + drivers/gpu/drm/zte/zx_vou_regs.h | 51 + + drivers/gpu/host1x/bus.c | 1 + + drivers/gpu/ipu-v3/ipu-common.c | 6 - + drivers/gpu/ipu-v3/ipu-csi.c | 1 + + drivers/hsi/clients/cmt_speech.c | 4 +- + drivers/hwtracing/intel_th/msu.c | 6 +- + drivers/i2c/busses/Kconfig | 22 + + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-at91.c | 5 +- + drivers/i2c/busses/i2c-bcm2835.c | 4 +- + drivers/i2c/busses/i2c-bfin-twi.c | 2 +- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 8 +- + drivers/i2c/busses/i2c-designware-core.c | 2 +- + drivers/i2c/busses/i2c-eg20t.c | 2 +- + drivers/i2c/busses/i2c-emev2.c | 2 +- + drivers/i2c/busses/i2c-exynos5.c | 34 +- + drivers/i2c/busses/i2c-i801.c | 3 + + drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +- + drivers/i2c/busses/i2c-imx.c | 2 +- + drivers/i2c/busses/i2c-mv64xxx.c | 21 + + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/busses/i2c-octeon-core.h | 4 - + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/i2c/busses/i2c-riic.c | 30 +- + drivers/i2c/busses/i2c-robotfuzz-osif.c | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 2 +- + drivers/i2c/busses/i2c-st.c | 2 +- + drivers/i2c/busses/i2c-stm32f4.c | 897 ++++++++ + drivers/i2c/busses/i2c-tegra-bpmp.c | 346 +++ + drivers/i2c/busses/i2c-thunderx-pcidrv.c | 6 +- + drivers/i2c/busses/i2c-xgene-slimpro.c | 2 +- + drivers/i2c/busses/i2c-xlp9xx.c | 2 +- + drivers/i2c/busses/i2c-xlr.c | 2 +- + drivers/i2c/i2c-core.c | 33 + + drivers/i2c/muxes/i2c-mux-mlxcpld.c | 1 - + drivers/i2c/muxes/i2c-mux-pca9541.c | 1 + + drivers/i2c/muxes/i2c-mux-pca954x.c | 151 +- + drivers/infiniband/core/device.c | 9 + + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/core/ucm.c | 2 +- + drivers/infiniband/core/user_mad.c | 4 +- + drivers/infiniband/core/uverbs_main.c | 2 +- + drivers/infiniband/hw/bnxt_re/main.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 +- + drivers/infiniband/hw/cxgb4/provider.c | 2 +- + drivers/infiniband/hw/hfi1/dma.c | 183 -- + drivers/infiniband/hw/hfi1/file_ops.c | 4 +- + drivers/infiniband/hw/hfi1/mad.c | 2 +- + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 1 - + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 +- + drivers/infiniband/hw/mlx4/mr.c | 6 +- + drivers/infiniband/hw/mlx5/main.c | 2 +- + drivers/infiniband/hw/mlx5/mr.c | 8 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 2 +- + drivers/infiniband/hw/nes/nes_verbs.c | 1 - + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +- + drivers/infiniband/hw/qedr/main.c | 2 +- + drivers/infiniband/hw/qib/qib_dma.c | 169 -- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/hw/qib/qib_keys.c | 5 +- + drivers/infiniband/hw/qib/qib_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- + drivers/infiniband/sw/rdmavt/Kconfig | 1 + + drivers/infiniband/sw/rdmavt/Makefile | 2 +- + drivers/infiniband/sw/rdmavt/dma.c | 198 -- + drivers/infiniband/sw/rdmavt/dma.h | 53 - + drivers/infiniband/sw/rdmavt/mr.c | 8 +- + drivers/infiniband/sw/rdmavt/vt.c | 4 +- + drivers/infiniband/sw/rdmavt/vt.h | 1 - + drivers/infiniband/sw/rxe/Kconfig | 1 + + drivers/infiniband/sw/rxe/Makefile | 1 - + drivers/infiniband/sw/rxe/rxe_dma.c | 183 -- + drivers/infiniband/sw/rxe/rxe_loc.h | 2 - + drivers/infiniband/sw/rxe/rxe_verbs.c | 9 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 4 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 3 +- + drivers/iommu/amd_iommu.c | 12 +- + drivers/iommu/intel-iommu.c | 2 +- + drivers/md/dm-rq.c | 6 +- + drivers/md/faulty.c | 2 +- + drivers/md/linear.c | 41 +- + drivers/md/linear.h | 1 + + drivers/md/md.c | 22 +- + drivers/md/md.h | 9 +- + drivers/md/multipath.c | 1 + + drivers/md/raid0.c | 1 + + drivers/md/raid1.c | 596 +++-- + drivers/md/raid1.h | 58 +- + drivers/md/raid10.c | 11 +- + drivers/md/raid5-cache.c | 225 +- + drivers/md/raid5.c | 129 +- + drivers/md/raid5.h | 7 + + drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +- + drivers/memory/atmel-ebi.c | 126 +- + drivers/memory/tegra/tegra124-emc.c | 5 +- + drivers/misc/cxl/context.c | 3 +- + drivers/misc/eeprom/at24.c | 45 +- + drivers/misc/mic/bus/mic_bus.c | 4 +- + drivers/misc/mic/bus/scif_bus.c | 4 +- + drivers/misc/mic/bus/scif_bus.h | 2 +- + drivers/misc/mic/bus/vop_bus.c | 2 +- + drivers/misc/mic/host/mic_boot.c | 4 +- + drivers/misc/sgi-gru/grumain.c | 3 +- + drivers/misc/sgi-gru/grutables.h | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/nvme/host/core.c | 257 ++- + drivers/nvme/host/fabrics.c | 7 +- + drivers/nvme/host/fabrics.h | 2 +- + drivers/nvme/host/fc.c | 15 +- + drivers/nvme/host/nvme.h | 12 + + drivers/nvme/host/pci.c | 27 +- + drivers/nvme/host/rdma.c | 50 +- + drivers/nvme/target/admin-cmd.c | 4 +- + drivers/nvme/target/core.c | 10 +- + drivers/nvme/target/discovery.c | 4 +- + drivers/nvme/target/fabrics-cmd.c | 6 +- + drivers/nvme/target/fc.c | 8 +- + drivers/nvme/target/loop.c | 3 +- + drivers/nvme/target/nvmet.h | 1 - + drivers/nvme/target/rdma.c | 7 +- + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/sba_iommu.c | 2 +- + drivers/pci/host/vmd.c | 2 +- + drivers/platform/x86/Kconfig | 36 +- + drivers/platform/x86/Makefile | 3 + + drivers/platform/x86/acer-wmi.c | 97 +- + drivers/platform/x86/alienware-wmi.c | 1 - + drivers/platform/x86/asus-wireless.c | 60 +- + drivers/platform/x86/dell-laptop.c | 6 + + drivers/platform/x86/fujitsu-laptop.c | 220 +- + drivers/platform/x86/hp_accel.c | 1 + + drivers/platform/x86/intel-hid.c | 96 +- + drivers/platform/x86/intel_mid_powerbtn.c | 187 +- + drivers/platform/x86/intel_mid_thermal.c | 2 +- + drivers/platform/x86/intel_pmc_core.c | 6 +- + drivers/platform/x86/intel_pmc_ipc.c | 67 +- + drivers/platform/x86/intel_turbo_max_3.c | 151 ++ + drivers/platform/x86/mlx-platform.c | 84 +- + .../atom => drivers/platform/x86}/pmc_atom.c | 88 +- + drivers/platform/x86/silead_dmi.c | 136 ++ + drivers/platform/x86/thinkpad_acpi.c | 124 +- + drivers/reset/Kconfig | 6 + + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 55 +- + drivers/reset/hisilicon/Kconfig | 7 + + drivers/reset/hisilicon/Makefile | 1 + + drivers/reset/hisilicon/reset-hi3660.c | 126 ++ + drivers/reset/reset-ti-syscon.c | 6 +- + drivers/reset/reset-uniphier.c | 4 + + drivers/reset/reset-zx2967.c | 99 + + drivers/scsi/cxlflash/superpipe.c | 6 +- + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 24 +- + drivers/scsi/sg.c | 3 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/dove/pmu.c | 2 +- + drivers/soc/rockchip/Kconfig | 10 + + drivers/soc/rockchip/Makefile | 1 + + drivers/soc/rockchip/grf.c | 134 ++ + drivers/soc/rockchip/pm_domains.c | 63 +- + drivers/soc/samsung/exynos-pmu.c | 6 +- + drivers/soc/samsung/exynos5250-pmu.c | 2 +- + drivers/soc/samsung/exynos5420-pmu.c | 4 +- + drivers/soc/samsung/pm_domains.c | 31 +- + drivers/soc/ti/knav_dma.c | 4 +- + drivers/soc/ti/knav_qmss_acc.c | 15 +- + drivers/soc/ti/knav_qmss_queue.c | 25 +- + drivers/soc/ti/wkup_m3_ipc.c | 2 - + drivers/soc/zte/Kconfig | 13 + + drivers/soc/zte/Makefile | 5 + + drivers/soc/zte/zx296718_pm_domains.c | 182 ++ + drivers/soc/zte/zx2967_pm_domains.c | 143 ++ + drivers/soc/zte/zx2967_pm_domains.h | 44 + + drivers/staging/android/ion/ion.c | 6 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 7 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 2 +- + drivers/target/target_core_user.c | 6 +- + drivers/tty/serial/sunhv.c | 12 +- + drivers/uio/uio.c | 6 +- + drivers/usb/mon/mon_bin.c | 4 +- + drivers/video/console/fbcon.c | 75 +- + drivers/video/fbdev/Kconfig | 8 + + drivers/video/fbdev/amba-clcd-nomadik.c | 9 +- + drivers/video/fbdev/amba-clcd-nomadik.h | 5 +- + drivers/video/fbdev/amba-clcd-versatile.c | 14 +- + drivers/video/fbdev/amba-clcd-versatile.h | 5 +- + drivers/video/fbdev/amba-clcd.c | 51 +- + drivers/video/fbdev/amifb.c | 8 +- + drivers/video/fbdev/core/fb_defio.c | 16 +- + drivers/video/fbdev/core/fbmem.c | 18 +- + drivers/video/fbdev/fsl-diu-fb.c | 13 +- + drivers/video/fbdev/imxfb.c | 6 +- + drivers/video/fbdev/matrox/matroxfb_DAC1064.c | 10 +- + drivers/video/fbdev/matrox/matroxfb_Ti3026.c | 5 +- + drivers/video/fbdev/maxinefb.c | 2 +- + drivers/video/fbdev/mbx/mbxdebugfs.c | 18 +- + drivers/video/fbdev/offb.c | 4 +- + drivers/video/fbdev/omap/lcd_ams_delta.c | 25 - + drivers/video/fbdev/omap/lcd_h3.c | 37 +- + drivers/video/fbdev/omap/lcd_htcherald.c | 51 +- + drivers/video/fbdev/omap/lcd_inn1510.c | 39 +- + drivers/video/fbdev/omap/lcd_inn1610.c | 27 +- + drivers/video/fbdev/omap/lcd_osk.c | 38 +- + drivers/video/fbdev/omap/lcd_palmte.c | 50 +- + drivers/video/fbdev/omap/lcd_palmtt.c | 43 +- + drivers/video/fbdev/omap/lcd_palmz71.c | 45 +- + drivers/video/fbdev/omap/omapfb_main.c | 31 +- + drivers/video/fbdev/pmag-ba-fb.c | 2 +- + drivers/video/fbdev/pmagb-b-fb.c | 2 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 10 +- + drivers/video/fbdev/simplefb.c | 56 +- + drivers/video/fbdev/ssd1307fb.c | 56 +- + drivers/video/fbdev/stifb.c | 4 + + drivers/video/fbdev/wm8505fb.c | 2 +- + drivers/virtio/virtio_balloon.c | 4 + + drivers/xen/privcmd.c | 4 +- + fs/9p/vfs_file.c | 4 +- + fs/afs/mntpt.c | 2 +- + fs/aio.c | 2 +- + fs/autofs4/waitq.c | 4 +- + fs/block_dev.c | 11 +- + fs/btrfs/backref.c | 7 +- + fs/btrfs/btrfs_inode.h | 44 +- + fs/btrfs/compression.c | 6 +- + fs/btrfs/ctree.c | 128 +- + fs/btrfs/ctree.h | 86 +- + fs/btrfs/delayed-inode.c | 57 +- + fs/btrfs/delayed-inode.h | 16 +- + fs/btrfs/delayed-ref.c | 31 +- + fs/btrfs/delayed-ref.h | 6 +- + fs/btrfs/dir-item.c | 5 +- + fs/btrfs/disk-io.c | 29 +- + fs/btrfs/disk-io.h | 6 +- + fs/btrfs/export.c | 13 +- + fs/btrfs/extent-tree.c | 282 ++- + fs/btrfs/extent_io.c | 213 +- + fs/btrfs/extent_io.h | 5 +- + fs/btrfs/file-item.c | 8 +- + fs/btrfs/file.c | 17 +- + fs/btrfs/free-space-cache.c | 65 +- + fs/btrfs/free-space-cache.h | 7 +- + fs/btrfs/free-space-tree.c | 2 +- + fs/btrfs/inode-map.c | 2 +- + fs/btrfs/inode.c | 588 +++-- + fs/btrfs/ioctl.c | 109 +- + fs/btrfs/ordered-data.c | 47 +- + fs/btrfs/ordered-data.h | 4 +- + fs/btrfs/props.c | 4 +- + fs/btrfs/qgroup.c | 163 +- + fs/btrfs/qgroup.h | 36 +- + fs/btrfs/raid56.c | 2 - + fs/btrfs/relocation.c | 25 +- + fs/btrfs/root-tree.c | 6 +- + fs/btrfs/scrub.c | 12 +- + fs/btrfs/super.c | 7 +- + fs/btrfs/transaction.c | 58 +- + fs/btrfs/tree-log.c | 299 ++- + fs/btrfs/tree-log.h | 14 +- + fs/btrfs/ulist.c | 10 +- + fs/btrfs/ulist.h | 8 +- + fs/btrfs/volumes.c | 18 +- + fs/btrfs/xattr.c | 16 +- + fs/ceph/addr.c | 8 +- + fs/cifs/cifs_dfs_ref.c | 7 +- + fs/cifs/file.c | 2 +- + fs/dax.c | 59 +- + fs/debugfs/inode.c | 8 +- + fs/exec.c | 10 +- + fs/ext2/file.c | 19 +- + fs/ext4/ext4.h | 4 +- + fs/ext4/file.c | 40 +- + fs/ext4/inode.c | 9 +- + fs/f2fs/file.c | 7 +- + fs/fuse/file.c | 6 +- + fs/gfs2/file.c | 8 +- + fs/iomap.c | 5 +- + fs/kernfs/file.c | 13 +- + fs/mount.h | 1 - + fs/namei.c | 9 +- + fs/namespace.c | 127 +- + fs/ncpfs/mmap.c | 7 +- + fs/nfs/file.c | 4 +- + fs/nfs/namespace.c | 2 +- + fs/nfs/nfs4namespace.c | 2 +- + fs/nilfs2/file.c | 3 +- + fs/notify/inotify/inotify.h | 17 + + fs/notify/inotify/inotify_fsnotify.c | 6 +- + fs/notify/inotify/inotify_user.c | 34 +- + fs/nsfs.c | 13 + + fs/ocfs2/mmap.c | 15 +- + fs/orangefs/devorangefs-req.c | 5 +- + fs/orangefs/inode.c | 6 - + fs/orangefs/orangefs-bufmap.c | 5 + + fs/orangefs/orangefs-debugfs.c | 15 +- + fs/orangefs/orangefs-dev-proto.h | 3 +- + fs/orangefs/orangefs-kernel.h | 1 - + fs/orangefs/orangefs-mod.c | 12 +- + fs/orangefs/orangefs-sysfs.c | 32 +- + fs/orangefs/upcall.h | 1 + + fs/pnode.c | 61 +- + fs/pnode.h | 2 + + fs/proc/base.c | 254 +-- + fs/proc/fd.c | 12 +- + fs/proc/generic.c | 11 +- + fs/proc/inode.c | 5 +- + fs/proc/internal.h | 23 +- + fs/proc/proc_sysctl.c | 66 +- + fs/proc/root.c | 3 +- + fs/proc/vmcore.c | 8 +- + fs/pstore/platform.c | 22 +- + fs/squashfs/lz4_wrapper.c | 12 +- + fs/super.c | 13 +- + fs/ubifs/file.c | 5 +- + fs/userfaultfd.c | 109 +- + fs/xfs/xfs_file.c | 38 +- + fs/xfs/xfs_trace.h | 2 +- + include/asm-generic/atomic.h | 2 + + include/asm-generic/pgtable.h | 104 +- + include/asm-generic/tlb.h | 14 + + include/drm/bridge/dw_hdmi.h | 19 +- + include/drm/bridge/mhl.h | 85 + + include/drm/drmP.h | 34 +- + include/drm/drm_atomic.h | 37 +- + include/drm/drm_atomic_helper.h | 22 +- + include/drm/drm_auth.h | 17 +- + include/drm/drm_bridge.h | 46 +- + include/drm/drm_cache.h | 4 + + include/drm/drm_color_mgmt.h | 27 +- + include/drm/drm_connector.h | 107 +- + include/drm/drm_crtc.h | 98 +- + include/drm/drm_crtc_helper.h | 1 - + include/drm/drm_dp_helper.h | 13 +- + include/drm/drm_dp_mst_helper.h | 14 +- + include/drm/drm_drv.h | 79 +- + include/drm/drm_edid.h | 10 +- + include/drm/drm_encoder.h | 9 +- + include/drm/drm_encoder_slave.h | 1 + + include/drm/drm_fb_cma_helper.h | 12 +- + include/drm/drm_fb_helper.h | 10 +- + include/drm/drm_flip_work.h | 2 +- + include/drm/drm_framebuffer.h | 46 +- + include/drm/drm_gem.h | 16 +- + include/drm/drm_gem_cma_helper.h | 17 + + include/drm/drm_irq.h | 8 +- + include/drm/drm_mm.h | 443 ++-- + include/drm/drm_mode_config.h | 30 +- + include/drm/drm_mode_object.h | 13 +- + include/drm/drm_modes.h | 2 + + include/drm/drm_modeset_helper.h | 3 +- + include/drm/drm_modeset_helper_vtables.h | 147 +- + include/drm/drm_modeset_lock.h | 2 +- + include/drm/drm_panel.h | 4 +- + include/drm/drm_plane.h | 28 +- + include/drm/drm_print.h | 24 +- + include/drm/drm_property.h | 8 +- + include/drm/drm_simple_kms_helper.h | 18 +- + include/drm/i915_pciids.h | 21 +- + include/drm/intel-gtt.h | 6 +- + include/drm/tinydrm/ili9341.h | 54 + + include/drm/tinydrm/mipi-dbi.h | 107 + + include/drm/tinydrm/tinydrm-helpers.h | 81 + + include/drm/tinydrm/tinydrm.h | 115 + + include/drm/ttm/ttm_bo_api.h | 2 + + include/drm/ttm/ttm_bo_driver.h | 31 +- + include/dt-bindings/clock/bcm2835.h | 2 + + include/dt-bindings/clock/exynos4415.h | 360 --- + include/dt-bindings/clock/exynos5433.h | 5 +- + include/dt-bindings/clock/hi3660-clock.h | 194 ++ + include/dt-bindings/clock/imx7d-clock.h | 3 +- + include/dt-bindings/clock/qcom,gcc-ipq4019.h | 11 + + include/dt-bindings/clock/qcom,gcc-mdm9615.h | 2 + + include/dt-bindings/clock/qcom,gcc-msm8994.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8996.h | 1 + + include/dt-bindings/clock/qcom,rpmcc.h | 40 +- + include/dt-bindings/clock/r7s72100-clock.h | 4 + + include/dt-bindings/clock/rk3188-cru-common.h | 2 + + include/dt-bindings/clock/rk3288-cru.h | 2 + + include/dt-bindings/clock/rk3328-cru.h | 400 ++++ + include/dt-bindings/clock/ste-ab8500.h | 11 + + include/dt-bindings/clock/stm32fx-clock.h | 59 + + include/dt-bindings/clock/sun5i-ccu.h | 103 + + include/dt-bindings/clock/sun8i-v3s-ccu.h | 107 + + include/dt-bindings/clock/sun9i-a80-ccu.h | 162 ++ + include/dt-bindings/clock/sun9i-a80-de.h | 80 + + include/dt-bindings/clock/sun9i-a80-usb.h | 59 + + include/dt-bindings/mfd/stm32f4-rcc.h | 24 +- + include/dt-bindings/pinctrl/omap.h | 4 +- + include/dt-bindings/pinctrl/samsung.h | 14 + + include/dt-bindings/power/rk3328-power.h | 18 + + include/dt-bindings/reset/sun5i-ccu.h | 32 + + include/dt-bindings/reset/sun8i-v3s-ccu.h | 78 + + include/dt-bindings/reset/sun9i-a80-ccu.h | 102 + + include/dt-bindings/reset/sun9i-a80-de.h | 58 + + include/dt-bindings/reset/sun9i-a80-usb.h | 56 + + include/dt-bindings/soc/zte,pm_domains.h | 24 + + include/linux/bio.h | 11 +- + include/linux/blk-mq.h | 2 + + include/linux/bug.h | 12 +- + include/linux/cma.h | 3 +- + include/linux/compiler-gcc.h | 1 + + include/linux/dax.h | 12 +- + include/linux/debugfs.h | 3 +- + include/linux/device.h | 2 + + include/linux/dma-buf.h | 224 +- + include/linux/dma-contiguous.h | 4 +- + include/linux/dma-fence.h | 52 +- + include/linux/dma-mapping.h | 55 +- + include/linux/fsl-diu-fb.h | 4 +- + include/linux/fsnotify_backend.h | 3 +- + include/linux/gfp.h | 2 +- + include/linux/huge_mm.h | 83 +- + include/linux/i2c.h | 1 + + include/linux/iomap.h | 3 +- + include/linux/iopoll.h | 2 +- + include/linux/kasan.h | 4 +- + include/linux/kernel.h | 10 +- + include/linux/lz4.h | 701 +++++- + include/linux/memblock.h | 1 + + include/linux/memory.h | 3 - + include/linux/mic_bus.h | 2 +- + include/linux/migrate.h | 4 +- + include/linux/mm.h | 82 +- + include/linux/mm_inline.h | 7 + + include/linux/mmu_notifier.h | 14 + + include/linux/mmzone.h | 2 - + include/linux/mount.h | 3 + + include/linux/nvme-rdma.h | 24 + + include/linux/nvme.h | 10 +- + include/linux/pfn_t.h | 12 + + include/linux/pid_namespace.h | 6 + + include/linux/platform_data/video-imxfb.h | 4 - + include/linux/platform_data/x86/clk-pmc-atom.h | 44 + + .../linux/platform_data/x86}/pmc_atom.h | 2 +- + include/linux/prime_numbers.h | 37 + + include/linux/qcom_scm.h | 54 +- + include/linux/rbtree_augmented.h | 4 +- + include/linux/reservation.h | 34 + + include/linux/reset.h | 45 +- + include/linux/rmap.h | 52 +- + include/linux/sched.h | 7 +- + include/linux/security.h | 3 +- + include/linux/sed-opal.h | 5 + + include/linux/shmem_fs.h | 7 + + include/linux/soc/samsung/exynos-regs-pmu.h | 91 +- + include/linux/sysctl.h | 1 + + include/linux/user_namespace.h | 4 + + include/linux/userfaultfd_k.h | 41 +- + include/linux/writeback.h | 2 +- + include/rdma/ib_verbs.h | 143 +- + include/sound/rt5665.h | 0 + include/trace/events/btrfs.h | 2 +- + include/trace/events/writeback.h | 2 +- + include/uapi/drm/Kbuild | 1 + + include/uapi/drm/amdgpu_drm.h | 9 + + include/uapi/drm/drm_fourcc.h | 59 + + include/uapi/drm/i915_drm.h | 136 ++ + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/fs.h | 1 + + include/uapi/linux/mqueue.h | 2 + + include/uapi/linux/nsfs.h | 9 +- + include/uapi/linux/userfaultfd.h | 16 +- + include/video/exynos5433_decon.h | 2 + + include/xen/arm/hypervisor.h | 2 +- + ipc/shm.c | 14 +- + kernel/events/core.c | 6 +- + kernel/events/uprobes.c | 26 +- + kernel/exit.c | 15 +- + kernel/fork.c | 42 +- + kernel/ksysfs.c | 2 +- + kernel/memremap.c | 6 + + kernel/notifier.c | 2 +- + kernel/panic.c | 3 +- + kernel/relay.c | 4 +- + kernel/sys.c | 22 + + kernel/trace/trace.c | 4 +- + kernel/ucount.c | 6 +- + lib/Kconfig | 19 +- + lib/Kconfig.debug | 13 +- + lib/Makefile | 8 +- + lib/atomic64_test.c | 10 +- + lib/crc32.c | 824 ------- + lib/crc32test.c | 856 ++++++++ + lib/decompress_unlz4.c | 13 +- + lib/dma-noop.c | 4 +- + lib/dma-virt.c | 72 + + lib/find_bit.c | 4 +- + lib/glob.c | 164 -- + lib/globtest.c | 167 ++ + lib/list_debug.c | 45 +- + lib/lz4/Makefile | 2 + + lib/lz4/lz4_compress.c | 1141 +++++++--- + lib/lz4/lz4_decompress.c | 665 +++--- + lib/lz4/lz4defs.h | 338 +-- + lib/lz4/lz4hc_compress.c | 846 ++++--- + lib/prime_numbers.c | 315 +++ + lib/radix-tree.c | 1 + + lib/rbtree.c | 4 +- + lib/sort.c | 41 +- + lib/test_kasan.c | 34 + + lib/test_sort.c | 44 + + lib/test_user_copy.c | 3 +- + mm/Makefile | 6 +- + mm/cma.c | 40 +- + mm/cma_debug.c | 2 +- + mm/compaction.c | 2 +- + mm/dmapool.c | 16 +- + mm/filemap.c | 26 +- + mm/gup.c | 12 +- + mm/huge_memory.c | 282 ++- + mm/hugetlb.c | 5 +- + mm/internal.h | 9 +- + mm/kasan/kasan.c | 2 +- + mm/kasan/quarantine.c | 1 + + mm/ksm.c | 109 +- + mm/madvise.c | 55 +- + mm/memblock.c | 32 +- + mm/memcontrol.c | 1 + + mm/memory-failure.c | 26 +- + mm/memory.c | 179 +- + mm/memory_hotplug.c | 37 +- + mm/migrate.c | 108 +- + mm/mincore.c | 1 + + mm/mmap.c | 74 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 23 +- + mm/nommu.c | 11 +- + mm/oom_kill.c | 16 +- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 322 +-- + mm/page_idle.c | 34 +- + mm/page_vma_mapped.c | 218 ++ + mm/pagewalk.c | 20 +- + mm/pgtable-generic.c | 14 + + mm/rmap.c | 574 ++--- + mm/shmem.c | 5 +- + mm/slab_common.c | 4 +- + mm/swap.c | 9 +- + mm/truncate.c | 1 + + mm/userfaultfd.c | 58 +- + mm/util.c | 5 +- + mm/vmalloc.c | 7 +- + mm/vmpressure.c | 10 +- + mm/vmscan.c | 78 +- + mm/workingset.c | 1 + + mm/z3fold.c | 381 ++-- + mm/zsmalloc.c | 10 +- + net/rds/ib.h | 8 +- + net/rds/ib_mr.h | 1 - + scripts/checkpatch.pl | 37 +- + scripts/checkstack.pl | 3 + + security/apparmor/domain.c | 2 +- + security/commoncap.c | 5 +- + security/selinux/hooks.c | 3 +- + security/selinux/selinuxfs.c | 5 +- + security/smack/smack_lsm.c | 2 +- + sound/core/pcm_native.c | 15 +- + sound/pci/hda/hda_codec.c | 76 +- + sound/pci/hda/hda_codec.h | 3 + + sound/pci/hda/patch_hdmi.c | 245 ++- + sound/usb/usx2y/us122l.c | 5 +- + sound/usb/usx2y/usX2Yhwdep.c | 7 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 5 +- + tools/lib/find_bit.c | 2 +- + tools/power/cpupower/utils/cpufreq-info.c | 21 +- + tools/testing/selftests/Makefile | 38 +- + tools/testing/selftests/bpf/Makefile | 10 +- + tools/testing/selftests/breakpoints/Makefile | 10 +- + tools/testing/selftests/capabilities/Makefile | 11 +- + tools/testing/selftests/cpufreq/Makefile | 8 + + tools/testing/selftests/cpufreq/cpu.sh | 84 + + tools/testing/selftests/cpufreq/cpufreq.sh | 241 ++ + tools/testing/selftests/cpufreq/governor.sh | 153 ++ + tools/testing/selftests/cpufreq/main.sh | 194 ++ + tools/testing/selftests/cpufreq/module.sh | 243 ++ + tools/testing/selftests/cpufreq/special-tests.sh | 115 + + tools/testing/selftests/drivers/gpu/drm_mm.sh | 15 + + tools/testing/selftests/efivarfs/Makefile | 8 +- + tools/testing/selftests/exec/Makefile | 32 +- + tools/testing/selftests/ftrace/Makefile | 6 +- + tools/testing/selftests/futex/Makefile | 21 +- + tools/testing/selftests/futex/functional/Makefile | 17 +- + tools/testing/selftests/futex/include/logging.h | 1 + + tools/testing/selftests/gpio/.gitignore | 1 + + tools/testing/selftests/intel_pstate/Makefile | 13 +- + tools/testing/selftests/intel_pstate/aperf.c | 2 +- + tools/testing/selftests/ipc/.gitignore | 1 + + tools/testing/selftests/ipc/Makefile | 7 +- + tools/testing/selftests/kcmp/Makefile | 6 +- + tools/testing/selftests/lib.mk | 36 +- + tools/testing/selftests/lib/prime_numbers.sh | 15 + + tools/testing/selftests/membarrier/Makefile | 6 +- + tools/testing/selftests/memfd/Makefile | 15 +- + tools/testing/selftests/mount/Makefile | 7 +- + tools/testing/selftests/mqueue/Makefile | 6 +- + tools/testing/selftests/net/Makefile | 15 +- + tools/testing/selftests/nsfs/Makefile | 9 +- + tools/testing/selftests/powerpc/Makefile | 14 +- + tools/testing/selftests/powerpc/alignment/Makefile | 9 +- + .../testing/selftests/powerpc/benchmarks/Makefile | 17 +- + .../selftests/powerpc/context_switch/Makefile | 9 +- + tools/testing/selftests/powerpc/copyloops/Makefile | 19 +- + tools/testing/selftests/powerpc/dscr/Makefile | 13 +- + tools/testing/selftests/powerpc/math/Makefile | 29 +- + tools/testing/selftests/powerpc/mm/Makefile | 18 +- + tools/testing/selftests/powerpc/pmu/Makefile | 26 +- + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 15 +- + .../testing/selftests/powerpc/primitives/Makefile | 9 +- + .../testing/selftests/powerpc/stringloops/Makefile | 9 +- + .../selftests/powerpc/switch_endian/Makefile | 17 +- + tools/testing/selftests/powerpc/syscalls/Makefile | 9 +- + tools/testing/selftests/powerpc/tm/Makefile | 18 +- + tools/testing/selftests/powerpc/vphn/Makefile | 10 +- + tools/testing/selftests/pstore/Makefile | 4 +- + tools/testing/selftests/ptrace/Makefile | 8 +- + tools/testing/selftests/seccomp/Makefile | 6 +- + tools/testing/selftests/sigaltstack/Makefile | 5 +- + tools/testing/selftests/size/Makefile | 10 +- + tools/testing/selftests/timers/Makefile | 10 +- + tools/testing/selftests/vm/Makefile | 54 +- + tools/testing/selftests/vm/userfaultfd.c | 22 +- + tools/testing/selftests/x86/Makefile | 17 +- + tools/testing/selftests/x86/protection_keys.c | 19 +- + tools/testing/selftests/zram/Makefile | 3 +- + virt/kvm/kvm_main.c | 4 +- + 2587 files changed, 99871 insertions(+), 44022 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/axentia.txt + create mode 100644 Documentation/devicetree/bindings/arm/marvell/98dx3236-resume-ctrl.txt + create mode 100644 Documentation/devicetree/bindings/arm/marvell/98dx3236.txt + create mode 100644 Documentation/devicetree/bindings/ata/ahci-da850.txt + delete mode 100644 Documentation/devicetree/bindings/clock/exynos4415-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/hi3660-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/idt,versaclock5.txt + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt + create mode 100644 Documentation/devicetree/bindings/clock/stericsson,abx500.txt + create mode 100644 Documentation/devicetree/bindings/clock/sun9i-de.txt + create mode 100644 Documentation/devicetree/bindings/clock/sun9i-usb.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt + create mode 100644 Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,nv101wxmn51.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/netron-dy,e231732.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/panel.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tianma,tm070jdhg30.txt + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-stm32.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt + create mode 100644 Documentation/devicetree/bindings/net/marvell,prestera.txt + create mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.txt + create mode 100644 Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt + create mode 100644 Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt + mode change 100755 => 100644 Documentation/devicetree/bindings/sound/rt5665.txt + delete mode 100644 Documentation/dma-buf-sharing.txt + create mode 100644 Documentation/gpu/tinydrm.rst + rename Documentation/{ => md}/md-cluster.txt (100%) + create mode 100644 Documentation/md/raid5-cache.txt + create mode 100644 Documentation/sparc/console.txt + delete mode 100644 arch/alpha/include/asm/current.h + create mode 100644 arch/arm/boot/dts/am335x-boneblack-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-boneblack-wireless.dts + create mode 100644 arch/arm/boot/dts/am335x-bonegreen-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-bonegreen-wireless.dts + create mode 100644 arch/arm/boot/dts/am335x-pcm-953.dtsi + create mode 100644 arch/arm/boot/dts/am335x-phycore-rdk.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog-base.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog-pro.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-98dx3236.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-98dx3336.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-98dx4251.dtsi + create mode 100644 arch/arm/boot/dts/armada-xp-db-dxbc2.dts + create mode 100644 arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts + create mode 100644 arch/arm/boot/dts/at91-linea.dtsi + create mode 100644 arch/arm/boot/dts/at91-tse850-3.dts + create mode 100644 arch/arm/boot/dts/axp223.dtsi + create mode 100644 arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts + create mode 100644 arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts + create mode 100644 arch/arm/boot/dts/da850-lego-ev3.dts + delete mode 100644 arch/arm/boot/dts/exynos4212.dtsi + rename arch/arm/boot/dts/{exynos4x12-pinctrl.dtsi => exynos4412-pinctrl.dtsi} (99%) + create mode 100644 arch/arm/boot/dts/exynos4412-prime.dtsi + delete mode 100644 arch/arm/boot/dts/exynos4x12.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-icore-rqs.dts + create mode 100644 arch/arm/boot/dts/imx6dl-savageboard.dts + create mode 100644 arch/arm/boot/dts/imx6q-mccmon6.dts + create mode 100644 arch/arm/boot/dts/imx6q-savageboard.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-savageboard.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-isiot-emmc.dts + create mode 100644 arch/arm/boot/dts/imx6ul-isiot-nand.dts + create mode 100644 arch/arm/boot/dts/imx6ul-isiot.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-opos6ul.dtsi + create mode 100644 arch/arm/boot/dts/imx6ul-opos6uldev.dts + create mode 100644 arch/arm/boot/dts/sama5d36ek_cmp.dts + create mode 100644 arch/arm/boot/dts/sama5d3xcm_cmp.dtsi + create mode 100644 arch/arm/boot/dts/sama5d3xmb_cmp.dtsi + create mode 100644 arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-licheepi-one.dts + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-beelink-x2.dts + create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts + create mode 100644 arch/arm/boot/dts/sun8i-v3s.dtsi + create mode 100644 arch/arm/boot/dts/vf610-zii-dev-rev-c.dts + create mode 100644 arch/arm/boot/dts/vf610-zii-dev.dtsi + create mode 100644 arch/arm/configs/tango4_defconfig + create mode 100644 arch/arm/mach-davinci/pdata-quirks.c + delete mode 100644 arch/arm/mach-ux500/board-mop500-audio.c + delete mode 100644 arch/arm/mach-ux500/board-mop500.h + delete mode 100644 arch/arm/mach-ux500/ste-dma40-db8500.h + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts + create mode 100644 arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/ns2-xmc.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hi3660.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts + create mode 100644 arch/blackfin/include/asm/vga.h + delete mode 100644 arch/cris/include/asm/current.h + mode change 100755 => 100644 arch/nios2/boot/dts/10m50_devboard.dts + mode change 100755 => 100644 arch/nios2/configs/10m50_defconfig + create mode 100644 arch/openrisc/include/asm/atomic.h + create mode 100644 arch/openrisc/include/asm/bitops/atomic.h + create mode 100644 arch/openrisc/include/asm/cmpxchg.h + create mode 100644 arch/openrisc/include/asm/futex.h + create mode 100644 arch/openrisc/include/asm/string.h + create mode 100644 arch/openrisc/kernel/.gitignore + create mode 100644 arch/openrisc/lib/memcpy.c + create mode 100644 arch/openrisc/lib/memset.S + mode change 100755 => 100644 arch/sh/boot/dts/j2_mimas_v2.dts + create mode 100644 drivers/clk/clk-versaclock5.c + create mode 100644 drivers/clk/hisilicon/clk-hi3660.c + create mode 100644 drivers/clk/mvebu/mv98dx3236.c + create mode 100644 drivers/clk/rockchip/clk-muxgrf.c + create mode 100644 drivers/clk/rockchip/clk-rk3328.c + delete mode 100644 drivers/clk/samsung/clk-exynos4415.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun5i.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun5i.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-v3s.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-v3s.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80-de.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.h + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun9i-a80.h + create mode 100644 drivers/clk/tegra/clk-bpmp.c + create mode 100644 drivers/clk/x86/clk-pmc-atom.c + mode change 100755 => 100644 drivers/crypto/chelsio/chcr_algo.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c + rename drivers/gpu/drm/amd/{include/asic_reg/si => amdgpu}/clearstate_si.h (100%) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_dpm.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_dpm.h + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_smc.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/cz_smumgr.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h + rename drivers/gpu/drm/amd/{include/asic_reg/si => amdgpu}/sid.h (100%) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h + create mode 100644 drivers/gpu/drm/i915/i915_gem_context.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.h + create mode 100644 drivers/gpu/drm/i915/i915_perf.c + create mode 100644 drivers/gpu/drm/i915/i915_utils.h + create mode 100644 drivers/gpu/drm/i915/intel_guc_log.c + create mode 100644 drivers/gpu/drm/i915/intel_huc.c + create mode 100644 drivers/gpu/drm/i915/intel_pipe_crc.c + create mode 100644 drivers/gpu/drm/i915/intel_uc.c + rename drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} (70%) + create mode 100644 drivers/gpu/drm/lib/drm_random.c + create mode 100644 drivers/gpu/drm/lib/drm_random.h + create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/power_budget.h + create mode 100644 drivers/gpu/drm/nouveau/nvif/driver.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/base.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/v1.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/bios/power_budget.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pci/g92.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm200.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_gr.c + create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-core.c + create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-core.h + create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.c + create mode 100644 drivers/gpu/drm/rockchip/cdn-dp-reg.h + create mode 100644 drivers/gpu/drm/selftests/Makefile + create mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h + create mode 100644 drivers/gpu/drm/selftests/drm_selftest.c + create mode 100644 drivers/gpu/drm/selftests/drm_selftest.h + create mode 100644 drivers/gpu/drm/selftests/test-drm_mm.c + delete mode 100644 drivers/gpu/drm/sti/sti_vtac.c + create mode 100644 drivers/gpu/drm/tinydrm/Kconfig + create mode 100644 drivers/gpu/drm/tinydrm/Makefile + create mode 100644 drivers/gpu/drm/tinydrm/core/Makefile + create mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-core.c + create mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c + create mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c + create mode 100644 drivers/gpu/drm/tinydrm/mi0283qt.c + create mode 100644 drivers/gpu/drm/tinydrm/mipi-dbi.c + create mode 100644 drivers/gpu/drm/vc4/vc4_dsi.c + create mode 100644 drivers/gpu/drm/zte/zx_tvenc.c + create mode 100644 drivers/gpu/drm/zte/zx_tvenc_regs.h + create mode 100644 drivers/i2c/busses/i2c-stm32f4.c + create mode 100644 drivers/i2c/busses/i2c-tegra-bpmp.c + delete mode 100644 drivers/infiniband/hw/hfi1/dma.c + delete mode 100644 drivers/infiniband/hw/qib/qib_dma.c + delete mode 100644 drivers/infiniband/sw/rdmavt/dma.c + delete mode 100644 drivers/infiniband/sw/rdmavt/dma.h + delete mode 100644 drivers/infiniband/sw/rxe/rxe_dma.c + create mode 100644 drivers/platform/x86/intel_turbo_max_3.c + rename {arch/x86/platform/atom => drivers/platform/x86}/pmc_atom.c (87%) + create mode 100644 drivers/platform/x86/silead_dmi.c + create mode 100644 drivers/reset/hisilicon/reset-hi3660.c + create mode 100644 drivers/reset/reset-zx2967.c + create mode 100644 drivers/soc/rockchip/grf.c + create mode 100644 drivers/soc/zte/Kconfig + create mode 100644 drivers/soc/zte/Makefile + create mode 100644 drivers/soc/zte/zx296718_pm_domains.c + create mode 100644 drivers/soc/zte/zx2967_pm_domains.c + create mode 100644 drivers/soc/zte/zx2967_pm_domains.h + create mode 100644 include/drm/tinydrm/ili9341.h + create mode 100644 include/drm/tinydrm/mipi-dbi.h + create mode 100644 include/drm/tinydrm/tinydrm-helpers.h + create mode 100644 include/drm/tinydrm/tinydrm.h + delete mode 100644 include/dt-bindings/clock/exynos4415.h + create mode 100644 include/dt-bindings/clock/hi3660-clock.h + create mode 100644 include/dt-bindings/clock/rk3328-cru.h + create mode 100644 include/dt-bindings/clock/ste-ab8500.h + create mode 100644 include/dt-bindings/clock/stm32fx-clock.h + create mode 100644 include/dt-bindings/clock/sun5i-ccu.h + create mode 100644 include/dt-bindings/clock/sun8i-v3s-ccu.h + create mode 100644 include/dt-bindings/clock/sun9i-a80-ccu.h + create mode 100644 include/dt-bindings/clock/sun9i-a80-de.h + create mode 100644 include/dt-bindings/clock/sun9i-a80-usb.h + create mode 100644 include/dt-bindings/power/rk3328-power.h + create mode 100644 include/dt-bindings/reset/sun5i-ccu.h + create mode 100644 include/dt-bindings/reset/sun8i-v3s-ccu.h + create mode 100644 include/dt-bindings/reset/sun9i-a80-ccu.h + create mode 100644 include/dt-bindings/reset/sun9i-a80-de.h + create mode 100644 include/dt-bindings/reset/sun9i-a80-usb.h + create mode 100644 include/dt-bindings/soc/zte,pm_domains.h + create mode 100644 include/linux/platform_data/x86/clk-pmc-atom.h + rename {arch/x86/include/asm => include/linux/platform_data/x86}/pmc_atom.h (98%) + create mode 100644 include/linux/prime_numbers.h + mode change 100755 => 100644 include/sound/rt5665.h + create mode 100644 lib/crc32test.c + create mode 100644 lib/dma-virt.c + create mode 100644 lib/globtest.c + create mode 100644 lib/prime_numbers.c + create mode 100644 lib/test_sort.c + create mode 100644 mm/page_vma_mapped.c + create mode 100644 tools/testing/selftests/cpufreq/Makefile + create mode 100755 tools/testing/selftests/cpufreq/cpu.sh + create mode 100755 tools/testing/selftests/cpufreq/cpufreq.sh + create mode 100755 tools/testing/selftests/cpufreq/governor.sh + create mode 100755 tools/testing/selftests/cpufreq/main.sh + create mode 100755 tools/testing/selftests/cpufreq/module.sh + create mode 100755 tools/testing/selftests/cpufreq/special-tests.sh + create mode 100755 tools/testing/selftests/drivers/gpu/drm_mm.sh + create mode 100644 tools/testing/selftests/gpio/.gitignore + create mode 100755 tools/testing/selftests/lib/prime_numbers.sh +Merging fixes/master (c470abd4fde4 Linux 4.10) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (8ba605b607b7 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (9e3440481845 ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init()) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (3f91a89d424a powerpc/64: Disable use of radix under a hypervisor) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (f8e6859ea9d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc/master +Already up-to-date. +Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) +$ git merge fscrypt-current/for-stable +Already up-to-date. +Merging net/master (47d3a07528ec net/mlx4_en: fix overflow in mlx4_en_init_timestamp()) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 13 +--- + drivers/net/ethernet/mellanox/mlx4/en_clock.c | 18 +++-- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 - + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 4 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 10 +-- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 16 ++--- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 30 +++------ + drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 15 ++--- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 12 +--- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 78 +++++++++++----------- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 22 +----- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 -- + drivers/net/phy/phy.c | 2 +- + drivers/net/vxlan.c | 14 ++-- + lib/test_parman.c | 2 +- + net/ipv4/fib_frontend.c | 6 +- + net/ipv4/route.c | 2 + + net/ipv6/ip6_vti.c | 4 ++ + net/rds/ib.c | 3 +- + net/rds/tcp.c | 7 +- + net/rxrpc/key.c | 2 +- + net/sctp/socket.c | 8 ++- + net/tipc/node.c | 12 ++-- + 25 files changed, 120 insertions(+), 170 deletions(-) +Merging ipsec/master (e3dc847a5f85 vti6: Don't report path MTU below IPV6_MIN_MTU.) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/ipv6/ip6_vti.c +Merge made by the 'recursive' strategy. + net/ipv6/ip6_vti.c | 8 ++++++-- + net/xfrm/xfrm_policy.c | 19 +++++++++---------- + 2 files changed, 15 insertions(+), 12 deletions(-) +Merging netfilter/master (47b1f6fd6ebc uapi: stop including linux/sysctl.h in uapi/linux/netfilter.h) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + include/uapi/linux/netfilter.h | 1 - + net/netfilter/nft_ct.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (8a96bb837818 mac80211: don't reorder frames with SN smaller than SSN) +$ git merge mac80211/master +Auto-merging net/mac80211/rx.c +Merge made by the 'recursive' strategy. + net/mac80211/agg-rx.c | 1 + + net/mac80211/pm.c | 1 + + net/mac80211/rx.c | 15 ++++++++++++++- + net/mac80211/sta_info.h | 6 ++++-- + 4 files changed, 20 insertions(+), 3 deletions(-) +Merging sound-current/for-linus (44b46d739d35 ALSA: hda - Add Geminilake PCI ID) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/hda_intel.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging pci-current/for-linus (afe3e4d11bdf PCI/PME: Restore pcie_pme_driver.remove) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew)) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew)) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew)) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (6cf1bf636a06 staging: vchiq_2835_arm: Make cache-line-size a required DT property) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/adc/rcar-gyroadc.c | 4 +++- + drivers/iio/adc/xilinx-xadc-core.c | 6 +++--- + drivers/iio/counter/104-quad-8.c | 2 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 2 +- + drivers/staging/media/platform/bcm2835/mmal-vchiq.c | 7 +++++-- + .../staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 8 +++++++- + 6 files changed, 20 insertions(+), 9 deletions(-) +Merging char-misc.current/char-misc-linus (bc49a7831b11 Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (6e11617fcff3 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (12cb3a1c4184 crypto: xts - Add ECB dependency) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)") +$ git merge ide/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging vfio-fixes/for-linus (930a42ded3fe vfio/spapr_tce: Set window when adding additional groups to container) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration") +$ 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 (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (9eeb0ed0f309 [media] mtk-vcodec: fix build warnings without DEBUG) +$ git merge v4l-dvb-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (c470abd4fde4 Linux 4.10) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging drm-misc-fixes/for-linux-next-fixes (bb08c04dc867 drm/dp/mst: fix kernel oops when turning off secondary monitor) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up-to-date. +Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/genksyms/parse.tab.c_shipped | 474 +++++++++++++++++------------------ + scripts/genksyms/parse.y | 2 - + 2 files changed, 234 insertions(+), 242 deletions(-) +Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) +$ git merge asm-generic/master +Resolved 'include/asm-generic/percpu.h' using previous resolution. +Auto-merging include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 919c0e1e90ab] Merge remote-tracking branch 'asm-generic/master' +$ git diff -M --stat --summary HEAD^.. + include/asm-generic/page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (85593554fb35 Merge branch 'fixes' into for-next) +$ git merge arm/for-next +Resolved 'arch/arm/mach-ux500/platsmp.c' using previous resolution. +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/mach-ux500/platsmp.c +CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c +Auto-merging arch/arm/mach-shmobile/platsmp-apmu.c +Auto-merging arch/arm/mach-s5pv210/pm.c +Auto-merging arch/arm/mach-s3c64xx/pm.c +Auto-merging arch/arm/mach-exynos/suspend.c +Auto-merging arch/arm/mach-exynos/platsmp.c +Auto-merging arch/arm/mach-exynos/mcpm-exynos.c +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8bf4e22c6995] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 1 + + arch/arm/Kconfig-nommu | 3 +- + arch/arm/boot/compressed/decompress.c | 1 + + arch/arm/common/mcpm_entry.c | 12 ++--- + arch/arm/include/asm/hardware/cache-uniphier.h | 2 +- + arch/arm/include/asm/memory.h | 29 +++++++++- + arch/arm/include/asm/pgtable-nommu.h | 6 +-- + arch/arm/kernel/head-nommu.S | 5 -- + arch/arm/kernel/module.c | 13 ++++- + arch/arm/kernel/setup.c | 10 +++- + arch/arm/kernel/smp.c | 2 +- + arch/arm/mach-alpine/platsmp.c | 2 +- + arch/arm/mach-axxia/platsmp.c | 2 +- + arch/arm/mach-bcm/bcm63xx_smp.c | 2 +- + arch/arm/mach-bcm/platsmp-brcmstb.c | 2 +- + arch/arm/mach-bcm/platsmp.c | 4 +- + arch/arm/mach-berlin/platsmp.c | 5 +- + arch/arm/mach-exynos/firmware.c | 4 +- + arch/arm/mach-exynos/mcpm-exynos.c | 2 +- + arch/arm/mach-exynos/platsmp.c | 4 +- + arch/arm/mach-exynos/pm.c | 6 +-- + arch/arm/mach-exynos/suspend.c | 6 +-- + arch/arm/mach-hisi/platmcpm.c | 2 +- + arch/arm/mach-hisi/platsmp.c | 6 +-- + arch/arm/mach-imx/platsmp.c | 2 +- + arch/arm/mach-imx/pm-imx6.c | 2 +- + arch/arm/mach-imx/src.c | 2 +- + arch/arm/mach-mediatek/platsmp.c | 2 +- + arch/arm/mach-mvebu/pm.c | 2 +- + arch/arm/mach-mvebu/pmsu.c | 2 +- + arch/arm/mach-mvebu/system-controller.c | 2 +- + arch/arm/mach-omap2/control.c | 8 +-- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 12 ++--- + arch/arm/mach-omap2/omap-smp.c | 4 +- + arch/arm/mach-prima2/platsmp.c | 2 +- + arch/arm/mach-prima2/pm.c | 2 +- + arch/arm/mach-pxa/palmz72.c | 2 +- + arch/arm/mach-pxa/pxa25x.c | 2 +- + arch/arm/mach-pxa/pxa27x.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-realview/platsmp-dt.c | 2 +- + arch/arm/mach-rockchip/platsmp.c | 4 +- + arch/arm/mach-rockchip/pm.c | 2 +- + arch/arm/mach-s3c24xx/mach-jive.c | 2 +- + arch/arm/mach-s3c24xx/pm-s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/pm-s3c2416.c | 2 +- + arch/arm/mach-s3c64xx/pm.c | 2 +- + arch/arm/mach-s5pv210/pm.c | 2 +- + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 6 +-- + arch/arm/mach-shmobile/platsmp-scu.c | 4 +- + arch/arm/mach-socfpga/platsmp.c | 4 +- + arch/arm/mach-spear/platsmp.c | 2 +- + arch/arm/mach-sti/platsmp.c | 2 +- + arch/arm/mach-sunxi/platsmp.c | 4 +- + arch/arm/mach-tango/platsmp.c | 2 +- + arch/arm/mach-tango/pm.c | 2 +- + arch/arm/mach-tegra/reset.c | 4 +- + arch/arm/mach-ux500/platsmp.c | 2 +- + arch/arm/mach-vexpress/dcscb.c | 2 +- + arch/arm/mach-vexpress/platsmp.c | 2 +- + arch/arm/mach-vexpress/tc2_pm.c | 4 +- + arch/arm/mach-zx/platsmp.c | 4 +- + arch/arm/mach-zynq/platsmp.c | 2 +- + arch/arm/mm/Kconfig | 31 +++++++++-- + arch/arm/mm/Makefile | 1 + + arch/arm/mm/cache-uniphier.c | 23 ++++---- + arch/arm/mm/dma-mapping.c | 3 ++ + arch/arm/mm/dump.c | 5 +- + arch/arm/mm/flush.c | 6 +++ + arch/arm/mm/init.c | 64 ++++++++++++++-------- + arch/arm/mm/mmu.c | 75 ++++++++++---------------- + arch/arm/mm/nommu.c | 60 ++++++++++++++++++--- + arch/arm/mm/physaddr.c | 57 ++++++++++++++++++++ + drivers/mtd/devices/lart.c | 24 ++++----- + 75 files changed, 382 insertions(+), 214 deletions(-) + create mode 100644 arch/arm/mm/physaddr.c +Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (93f0a7522a39 arm-soc: document merges) +$ git merge arm-soc/for-next +Resolved 'arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts' using previous resolution. +Auto-merging arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e5ac990243ad] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/amlogic.txt | 2 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/arm-soc-for-next-contents.txt | 275 +++++++++++++++++++ + arch/arm64/boot/dts/amlogic/Makefile | 8 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 68 +++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 50 ++++ + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 11 + + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 66 +++++ + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 94 +++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 106 +++++--- + ...ox-a95x.dts => meson-gxl-s905x-nexbox-a95x.dts} | 0 + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 78 ++++++ + ...{meson-gxm-s912-q200.dts => meson-gxm-q200.dts} | 0 + ...{meson-gxm-s912-q201.dts => meson-gxm-q201.dts} | 0 + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 14 + + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 12 - + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 34 +++ + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 34 +++ + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 49 +++- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 302 +++++++++++---------- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 34 +++ + drivers/clk/meson/gxbb.c | 48 ++++ + drivers/clk/meson/gxbb.h | 15 +- + include/dt-bindings/clock/gxbb-clkc.h | 6 + + include/dt-bindings/pinctrl/samsung.h | 8 + + 25 files changed, 1107 insertions(+), 208 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts + rename arch/arm64/boot/dts/amlogic/{meson-gxl-nexbox-a95x.dts => meson-gxl-s905x-nexbox-a95x.dts} (100%) + rename arch/arm64/boot/dts/amlogic/{meson-gxm-s912-q200.dts => meson-gxm-q200.dts} (100%) + rename arch/arm64/boot/dts/amlogic/{meson-gxm-s912-q201.dts => meson-gxm-q201.dts} (100%) +Merging amlogic/for-next (2452b94d227c Merge v4.11/dt64) +$ git merge amlogic/for-next +Resolved 'arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi' using previous resolution. +Auto-merging arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 50b3077ae6d6] Merge remote-tracking branch 'amlogic/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 22 ---------------------- + 1 file changed, 22 deletions(-) +Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (f5fde64706f0 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Auto-merging drivers/soc/Makefile +Auto-merging drivers/soc/Kconfig +Removing arch/arm/mach-at91/soc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.txt | 3 +- + MAINTAINERS | 1 - + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 + + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/sama5d2.dtsi | 5 + + arch/arm/mach-at91/Makefile | 1 - + arch/arm/mach-at91/at91rm9200.c | 15 +- + arch/arm/mach-at91/at91sam9.c | 46 +--- + arch/arm/mach-at91/sama5.c | 52 +---- + arch/arm/mach-at91/soc.c | 142 ------------- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/atmel/Kconfig | 6 + + drivers/soc/atmel/Makefile | 1 + + drivers/soc/atmel/soc.c | 231 +++++++++++++++++++++ + {arch/arm/mach-at91 => drivers/soc/atmel}/soc.h | 0 + 16 files changed, 252 insertions(+), 256 deletions(-) + delete mode 100644 arch/arm/mach-at91/soc.c + create mode 100644 drivers/soc/atmel/Kconfig + create mode 100644 drivers/soc/atmel/Makefile + create mode 100644 drivers/soc/atmel/soc.c + rename {arch/arm/mach-at91 => drivers/soc/atmel}/soc.h (100%) +Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (e8ba6e4b2558 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (2b6a9eabd44e Merge branch 'omap-for-v4.10/fixes' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-omap2/omap-headsmp.S | 3 ++- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 20 ++++++++++++++++++++ + 2 files changed, 22 insertions(+), 1 deletion(-) +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11) +$ git merge qcom/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' 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 (1001354ca341 Linux 4.9-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next) +$ git merge samsung-krzk/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (10e459de8497 Merge branch for-4.11/i2c into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (ffe7afd17135 arm64/kprobes: consistently handle MRS/MSR with XZR) +$ git merge arm64/for-next/core +Already up-to-date. +Merging clk/clk-next (f59de563358e clk: renesas: mstp: ensure register writes complete) +$ git merge clk/clk-next +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 46abcbcb99d1] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init()) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (73ec49463f89 m68k/defconfig: amcore board defconfig tuning) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amcore_defconfig | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) +Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (ada1bd978bf3 MIPS: Force o32 fp64 support on 32bit MIPS64r6 kernels) +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nios2/for-next (744606c76c4a nios2: add screen_info) +$ git merge nios2/for-next +Already up-to-date. +Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start) +$ git merge openrisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (d85daeae23d4 parisc: Enhance detection if cr16 clocksources are synchronous) +$ git merge parisc-hd/for-next +Auto-merging drivers/parisc/ccio-dma.c +Merge made by the 'recursive' strategy. + arch/parisc/include/asm/cacheflush.h | 2 - + arch/parisc/include/asm/processor.h | 2 + + arch/parisc/include/asm/uaccess.h | 6 +- + arch/parisc/kernel/cache.c | 18 ------ + arch/parisc/kernel/processor.c | 4 +- + arch/parisc/kernel/signal.c | 13 ++-- + arch/parisc/kernel/time.c | 24 +++++-- + arch/parisc/mm/fault.c | 4 +- + drivers/parisc/ccio-dma.c | 6 +- + drivers/parisc/eisa.c | 122 +++++++++++++++++++---------------- + 10 files changed, 108 insertions(+), 93 deletions(-) +Merging powerpc/next (3dbbaf200f53 powerpc/pseries: Advertise Hot Plug Event support to firmware) +$ git merge powerpc/next +Resolved 'arch/powerpc/kernel/asm-offsets.c' using previous resolution. +Auto-merging drivers/pci/hotplug/pnv_php.c +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging arch/powerpc/platforms/cell/spufs/file.c +Auto-merging arch/powerpc/kernel/prom_init.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging arch/powerpc/kernel/entry_32.S +Auto-merging arch/powerpc/kernel/asm-offsets.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/reg.h +Removing arch/powerpc/configs/85xx/kmp204x_defconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 898df5ca2732] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/boot/dts/fsl/kmcent2.dts | 303 + + arch/powerpc/boot/dts/fsl/kmcoge4.dts | 4 + + arch/powerpc/configs/85xx/kmp204x_defconfig | 220 - + arch/powerpc/configs/pseries_defconfig | 1 - + arch/powerpc/include/asm/bitops.h | 28 + + arch/powerpc/include/asm/pnv-pci.h | 2 + + arch/powerpc/include/asm/ppc_asm.h | 1 - + arch/powerpc/include/asm/processor.h | 2 +- + arch/powerpc/include/asm/prom.h | 1 + + arch/powerpc/include/asm/reg.h | 2 + + arch/powerpc/include/asm/reg_8xx.h | 11 + + arch/powerpc/include/asm/rtas.h | 2 + + arch/powerpc/kernel/asm-offsets.c | 772 +- + arch/powerpc/kernel/cputable.c | 17 + + arch/powerpc/kernel/entry_32.S | 19 +- + arch/powerpc/kernel/head_32.S | 3 - + arch/powerpc/kernel/head_8xx.S | 72 +- + arch/powerpc/kernel/hw_breakpoint.c | 6 +- + arch/powerpc/kernel/pci-common.c | 10 +- + arch/powerpc/kernel/process.c | 22 + + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/setup_64.c | 12 +- + arch/powerpc/mm/pgtable.c | 4 +- + arch/powerpc/mm/slb_low.S | 24 +- + arch/powerpc/perf/8xx-pmu.c | 173 + + arch/powerpc/perf/Makefile | 2 + + arch/powerpc/perf/core-book3s.c | 38 +- + arch/powerpc/perf/isa207-common.c | 94 +- + arch/powerpc/perf/isa207-common.h | 7 + + arch/powerpc/perf/power8-pmu.c | 35 +- + arch/powerpc/perf/power9-events-list.h | 3 + + arch/powerpc/perf/power9-pmu.c | 47 +- + arch/powerpc/platforms/85xx/Makefile | 1 + + arch/powerpc/platforms/85xx/corenet_generic.c | 1 + + arch/powerpc/platforms/85xx/t1042rdb_diu.c | 152 + + arch/powerpc/platforms/Kconfig.cputype | 7 + + arch/powerpc/platforms/cell/spufs/file.c | 65 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 3 - + arch/powerpc/platforms/powernv/Kconfig | 3 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 - + arch/powerpc/platforms/pseries/dlpar.c | 38 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 272 +- + arch/powerpc/xmon/ppc-dis.c | 260 +- + arch/powerpc/xmon/ppc-opc.c | 8999 ++++++++++++++--------- + arch/powerpc/xmon/ppc.h | 268 +- + arch/powerpc/xmon/xmon.c | 58 +- + drivers/misc/cxl/cxl.h | 5 +- + drivers/misc/cxl/main.c | 3 +- + drivers/misc/cxl/pci.c | 11 +- + drivers/misc/cxl/vphb.c | 18 +- + drivers/pci/hotplug/pnv_php.c | 81 +- + 53 files changed, 7855 insertions(+), 4341 deletions(-) + create mode 100644 arch/powerpc/boot/dts/fsl/kmcent2.dts + delete mode 100644 arch/powerpc/configs/85xx/kmp204x_defconfig + create mode 100644 arch/powerpc/perf/8xx-pmu.c + create mode 100644 arch/powerpc/platforms/85xx/t1042rdb_diu.c +Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx) +$ 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 (fb94a687d96c s390: TASK_SIZE for kernel threads) +$ git merge s390/features +Auto-merging drivers/crypto/Kconfig +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/configs/default_defconfig | 1 + + arch/s390/configs/performance_defconfig | 1 + + arch/s390/crypto/Makefile | 2 +- + arch/s390/crypto/paes_s390.c | 619 +++++++++++++++++ + arch/s390/defconfig | 1 + + arch/s390/include/asm/cpacf.h | 46 +- + arch/s390/include/asm/mmu_context.h | 4 +- + arch/s390/include/asm/pgtable.h | 14 +- + arch/s390/include/asm/pkey.h | 90 +++ + arch/s390/include/asm/processor.h | 19 +- + arch/s390/include/asm/uaccess.h | 23 +- + arch/s390/include/uapi/asm/Kbuild | 1 + + arch/s390/include/uapi/asm/pkey.h | 112 +++ + arch/s390/kernel/entry.S | 33 +- + arch/s390/kernel/entry.h | 1 + + arch/s390/kernel/nmi.c | 25 +- + arch/s390/kernel/process.c | 18 +- + arch/s390/mm/gmap.c | 6 +- + arch/s390/mm/hugetlbpage.c | 2 +- + drivers/crypto/Kconfig | 32 +- + drivers/s390/block/dasd_eckd.c | 2 +- + drivers/s390/cio/ioasm.c | 8 +- + drivers/s390/crypto/Makefile | 4 + + drivers/s390/crypto/ap_bus.c | 10 - + drivers/s390/crypto/ap_card.c | 24 +- + drivers/s390/crypto/ap_queue.c | 21 +- + drivers/s390/crypto/pkey_api.c | 1148 +++++++++++++++++++++++++++++++ + drivers/s390/crypto/zcrypt_api.c | 5 +- + drivers/s390/crypto/zcrypt_api.h | 2 + + 30 files changed, 2182 insertions(+), 93 deletions(-) + create mode 100644 arch/s390/crypto/paes_s390.c + create mode 100644 arch/s390/include/asm/pkey.h + create mode 100644 arch/s390/include/uapi/asm/pkey.h + create mode 100644 drivers/s390/crypto/pkey_api.c +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once) +$ git merge tile/master +Already up-to-date. +Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Auto-merging arch/unicore32/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 3 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 3 deletions(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. +Merging fscrypt/master (6f69f0ed6136 fscrypt: constify struct fscrypt_operations) +$ git merge fscrypt/master +Already up-to-date. +Merging befs/for-next (7ce7d89f4883 Linux 4.10-rc1) +$ git merge befs/for-next +Already up-to-date. +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (d46996f6537a Merge branch 'for-next-current-v4.10-20170220' into for-next-20170220) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Merge made by the 'recursive' strategy. + fs/btrfs/btrfs_inode.h | 31 ++-- + fs/btrfs/compression.c | 43 ++--- + fs/btrfs/compression.h | 30 ++- + fs/btrfs/ctree.c | 7 + + fs/btrfs/ctree.h | 39 ++-- + fs/btrfs/delayed-inode.c | 2 +- + fs/btrfs/dev-replace.c | 5 +- + fs/btrfs/dev-replace.h | 5 +- + fs/btrfs/dir-item.c | 6 +- + fs/btrfs/disk-io.c | 25 ++- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent-tree.c | 144 ++++++++------- + fs/btrfs/extent_io.c | 57 +++--- + fs/btrfs/extent_io.h | 25 ++- + fs/btrfs/file-item.c | 40 +++- + fs/btrfs/file.c | 139 +++++++------- + fs/btrfs/free-space-cache.c | 5 +- + fs/btrfs/inode-map.c | 2 +- + fs/btrfs/inode.c | 425 ++++++++++++++++++++++--------------------- + fs/btrfs/ioctl.c | 38 ++-- + fs/btrfs/lzo.c | 12 +- + fs/btrfs/ordered-data.c | 9 +- + fs/btrfs/ordered-data.h | 7 +- + fs/btrfs/relocation.c | 17 +- + fs/btrfs/scrub.c | 11 +- + fs/btrfs/send.c | 125 ++++++++++++- + fs/btrfs/tests/inode-tests.c | 46 ++--- + fs/btrfs/transaction.c | 6 +- + fs/btrfs/tree-log.c | 97 +++++----- + fs/btrfs/volumes.c | 18 +- + fs/btrfs/volumes.h | 12 +- + fs/btrfs/zlib.c | 9 +- + 32 files changed, 814 insertions(+), 625 deletions(-) +Merging ceph/master (54ea0046b6fe libceph, rbd, ceph: WRITE | ONDISK -> WRITE) +$ git merge ceph/master +Auto-merging net/ceph/osd_client.c +Auto-merging fs/ceph/addr.c +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.txt | 5 +- + drivers/block/rbd.c | 601 ++++++++++++++----------------------- + drivers/block/rbd_types.h | 10 +- + fs/ceph/addr.c | 19 +- + fs/ceph/cache.c | 2 +- + fs/ceph/caps.c | 40 ++- + fs/ceph/debugfs.c | 2 +- + fs/ceph/dir.c | 32 +- + fs/ceph/export.c | 3 +- + fs/ceph/file.c | 106 +------ + fs/ceph/inode.c | 172 +++++------ + fs/ceph/ioctl.c | 4 +- + fs/ceph/mds_client.c | 175 ++++++----- + fs/ceph/mds_client.h | 15 +- + fs/ceph/super.c | 9 +- + fs/ceph/super.h | 14 +- + include/linux/ceph/osd_client.h | 6 +- + include/linux/ceph/osdmap.h | 13 +- + include/linux/ceph/rados.h | 2 +- + include/linux/crush/crush.h | 41 ++- + include/linux/crush/mapper.h | 16 +- + net/ceph/cls_lock_client.c | 14 +- + net/ceph/crush/crush.c | 5 - + net/ceph/crush/mapper.c | 227 +++++++++----- + net/ceph/crypto.c | 1 + + net/ceph/osd_client.c | 130 +++----- + net/ceph/osdmap.c | 101 +++++-- + net/ceph/snapshot.c | 2 - + 28 files changed, 835 insertions(+), 932 deletions(-) +Merging cifs/for-next (f1ef09fde17f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge cifs/for-next +Already up-to-date. +Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (6c71100db53e fanotify: simplify the code of fanotify_merge) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (cab7076a185e Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (ae75f0ca76d8 f2fs: introduce free nid bitmap) +$ git merge f2fs/dev +Resolved 'fs/f2fs/super.c' using previous resolution. +Auto-merging fs/f2fs/super.c +CONFLICT (content): Merge conflict in fs/f2fs/super.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/dir.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0af18ecd06f1] Merge remote-tracking branch 'f2fs/dev' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/f2fs.txt | 7 +- + fs/f2fs/checkpoint.c | 70 ++-- + fs/f2fs/data.c | 190 ++++++++--- + fs/f2fs/debug.c | 31 +- + fs/f2fs/dir.c | 38 ++- + fs/f2fs/extent_cache.c | 52 ++- + fs/f2fs/f2fs.h | 644 ++++++++++++++++++++++--------------- + fs/f2fs/file.c | 33 +- + fs/f2fs/gc.c | 79 +++-- + fs/f2fs/inode.c | 4 +- + fs/f2fs/namei.c | 18 +- + fs/f2fs/node.c | 561 +++++++++++++++++++++++++------- + fs/f2fs/node.h | 33 +- + fs/f2fs/recovery.c | 17 +- + fs/f2fs/segment.c | 499 ++++++++++++++++++++-------- + fs/f2fs/segment.h | 40 ++- + fs/f2fs/super.c | 62 +++- + fs/f2fs/xattr.c | 151 +++++++-- + fs/f2fs/xattr.h | 7 +- + include/linux/f2fs_fs.h | 8 + + include/trace/events/f2fs.h | 144 +++++---- + 21 files changed, 1906 insertions(+), 782 deletions(-) +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (9a87ad3da905 fuse: release: private_data cannot be NULL) +$ git merge fuse/for-next +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/dir.c | 2 +- + fs/fuse/file.c | 28 ++++++++++++---------------- + fs/fuse/fuse_i.h | 1 - + 3 files changed, 13 insertions(+), 18 deletions(-) +Merging gfs2/for-next (5bcbe22ca47d Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge gfs2/for-next +Already up-to-date. +Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/resize.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (c470abd4fde4 Linux 4.10) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (7259f1dfe718 sunrpc: don't register UDP port with rpcbind when version needs congestion control) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Auto-merging net/sunrpc/xprtrdma/svc_rdma_backchannel.c +Auto-merging net/sunrpc/cache.c +Auto-merging include/linux/sunrpc/cache.h +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 2 + + fs/nfs/callback_xdr.c | 6 +- + fs/nfsd/export.c | 1 + + fs/nfsd/nfs2acl.c | 1 - + fs/nfsd/nfs3acl.c | 1 - + fs/nfsd/nfs3proc.c | 8 +- + fs/nfsd/nfs4callback.c | 19 +- + fs/nfsd/nfs4idmap.c | 8 + + fs/nfsd/nfs4proc.c | 88 +++++++-- + fs/nfsd/nfs4state.c | 12 +- + fs/nfsd/nfs4xdr.c | 29 +-- + fs/nfsd/nfsctl.c | 10 +- + fs/nfsd/nfsd.h | 6 +- + fs/nfsd/nfsproc.c | 8 +- + fs/nfsd/nfssvc.c | 2 + + fs/nfsd/state.h | 1 + + fs/nfsd/vfs.c | 104 +++++----- + fs/nfsd/vfs.h | 6 +- + include/linux/sunrpc/cache.h | 6 +- + include/linux/sunrpc/rpc_rdma.h | 9 + + include/linux/sunrpc/svc.h | 12 +- + include/linux/sunrpc/svc_rdma.h | 13 +- + include/linux/sunrpc/svc_xprt.h | 1 + + include/uapi/linux/nfsd/export.h | 5 +- + net/sunrpc/auth_gss/svcauth_gss.c | 4 +- + net/sunrpc/cache.c | 53 +++-- + net/sunrpc/svc.c | 24 ++- + net/sunrpc/svcsock.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 17 +- + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 299 ++++++++++------------------- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 20 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 22 ++- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 69 ++++--- + 33 files changed, 468 insertions(+), 399 deletions(-) +Merging orangefs/for-next (e98bdb3059cb Merge tag 'v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (51f8f3c4e225 ovl: drop CAP_SYS_RESOURCE from saved mounter's credentials) +$ git merge overlayfs/overlayfs-next +Auto-merging include/linux/fs.h +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/namei.c | 68 +++++++++++++++++++++++------------- + fs/open.c | 14 ++++---- + fs/overlayfs/copy_up.c | 91 +++++++++++++++++++++++++++++++++++------------- + fs/overlayfs/overlayfs.h | 11 ++++++ + fs/overlayfs/ovl_entry.h | 3 ++ + fs/overlayfs/super.c | 39 +++++++++++++++++++-- + fs/overlayfs/util.c | 30 ++++++++++++++++ + fs/read_write.c | 9 +++-- + include/linux/fs.h | 29 ++++++++------- + 9 files changed, 219 insertions(+), 75 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (8d242e932fb7 xfs: remove XFS_ALLOCTYPE_ANY_AG and XFS_ALLOCTYPE_START_AG) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (9e9c5ba8bd70 Merge branch 'work.statx' into for-next) +$ git merge vfs/for-next +Recorded preimage for 'fs/f2fs/f2fs.h' +Recorded preimage for 'fs/proc/base.c' +Auto-merging tools/testing/selftests/Makefile +Auto-merging net/unix/af_unix.c +Auto-merging net/socket.c +Auto-merging net/rds/rds.h +Auto-merging net/kcm/kcmsock.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/core/skbuff.c +Auto-merging net/ceph/messenger.c +Auto-merging mm/shmem.c +Auto-merging mm/nommu.c +Auto-merging mm/mmap.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/relay.c +Auto-merging ipc/shm.c +Auto-merging include/net/tcp.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/fs.h +Auto-merging fs/ubifs/ubifs.h +Auto-merging fs/splice.c +Auto-merging fs/proc/root.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/generic.c +Auto-merging fs/proc/base.c +CONFLICT (content): Merge conflict in fs/proc/base.c +Auto-merging fs/overlayfs/copy_up.c +Auto-merging fs/orangefs/orangefs-kernel.h +Auto-merging fs/orangefs/inode.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/nfsd/vfs.h +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/f2fs.h +CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/inode.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/aio.c +Auto-merging fs/afs/rxrpc.c +Auto-merging fs/afs/internal.h +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Auto-merging drivers/staging/lustre/lustre/llite/file.c +Auto-merging drivers/gpu/drm/vgem/vgem_drv.c +Auto-merging drivers/gpu/drm/i915/i915_gem_dmabuf.c +Auto-merging drivers/block/nbd.c +Auto-merging drivers/block/loop.c +Auto-merging drivers/block/drbd/drbd_main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/f2fs/f2fs.h'. +Recorded resolution for 'fs/proc/base.c'. +[master 1d936eafc210] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 3 +- + Documentation/filesystems/vfs.txt | 3 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + drivers/base/devtmpfs.c | 3 +- + drivers/block/drbd/drbd_main.c | 11 +- + drivers/block/loop.c | 7 +- + drivers/block/nbd.c | 76 +++--- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/kapi.c | 2 +- + drivers/staging/lustre/lustre/llite/file.c | 9 +- + .../staging/lustre/lustre/llite/llite_internal.h | 3 +- + drivers/target/iscsi/iscsi_target_util.c | 64 ++---- + drivers/usb/usbip/usbip_common.c | 32 +-- + fs/9p/fid.c | 10 +- + fs/9p/vfs_inode.c | 20 +- + fs/9p/vfs_inode_dotl.c | 25 +- + fs/afs/inode.c | 8 +- + fs/afs/internal.h | 2 +- + fs/afs/rxrpc.c | 15 +- + fs/aio.c | 4 +- + fs/bad_inode.c | 4 +- + fs/btrfs/inode.c | 6 +- + fs/ceph/inode.c | 6 +- + fs/ceph/super.h | 4 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/inode.c | 5 +- + fs/coda/coda_linux.h | 2 +- + fs/coda/file.c | 2 +- + fs/coda/inode.c | 7 +- + fs/ecryptfs/inode.c | 13 +- + fs/exportfs/expfs.c | 3 +- + fs/ext4/ext4.h | 3 +- + fs/ext4/inode.c | 6 +- + fs/f2fs/f2fs.h | 4 +- + fs/f2fs/file.c | 6 +- + fs/fat/fat.h | 4 +- + fs/fat/file.c | 5 +- + fs/fuse/dir.c | 6 +- + fs/gfs2/inode.c | 11 +- + fs/hfs/dir.c | 2 +- + fs/kernfs/inode.c | 8 +- + fs/kernfs/kernfs-internal.h | 4 +- + fs/libfs.c | 12 +- + fs/minix/inode.c | 11 +- + fs/minix/minix.h | 2 +- + fs/namei.c | 183 ++++++++------- + fs/ncpfs/sock.c | 111 ++++----- + fs/nfs/inode.c | 13 +- + fs/nfs/namespace.c | 9 +- + fs/nfsd/nfs4xdr.c | 4 +- + fs/nfsd/vfs.h | 3 +- + fs/ocfs2/file.c | 11 +- + fs/ocfs2/file.h | 4 +- + fs/orangefs/inode.c | 13 +- + fs/orangefs/orangefs-kernel.h | 5 +- + fs/overlayfs/copy_up.c | 6 +- + fs/overlayfs/dir.c | 10 +- + fs/overlayfs/inode.c | 7 +- + fs/proc/base.c | 12 +- + fs/proc/generic.c | 6 +- + fs/proc/internal.h | 2 +- + fs/proc/proc_net.c | 6 +- + fs/proc/proc_sysctl.c | 5 +- + fs/proc/root.c | 6 +- + fs/read_write.c | 121 ++++------ + fs/splice.c | 24 +- + fs/stat.c | 214 ++++++++++++++--- + fs/sync.c | 2 +- + fs/sysv/itree.c | 7 +- + fs/sysv/sysv.h | 2 +- + fs/ubifs/dir.c | 6 +- + fs/ubifs/ubifs.h | 4 +- + fs/udf/symlink.c | 5 +- + fs/xattr.c | 20 +- + fs/xfs/xfs_iops.c | 9 +- + include/linux/fs.h | 59 ++++- + include/linux/net.h | 2 +- + include/linux/nfs_fs.h | 2 +- + include/linux/skbuff.h | 3 +- + include/linux/splice.h | 4 +- + include/linux/stat.h | 24 +- + include/linux/syscalls.h | 3 + + include/net/9p/9p.h | 8 +- + include/net/9p/client.h | 18 +- + include/net/tcp.h | 2 +- + include/uapi/linux/fcntl.h | 5 + + include/uapi/linux/stat.h | 131 +++++++++++ + ipc/shm.c | 4 +- + kernel/relay.c | 1 - + kernel/trace/trace.c | 2 - + mm/mmap.c | 2 +- + mm/nommu.c | 4 +- + mm/shmem.c | 6 +- + net/9p/client.c | 18 +- + net/ceph/messenger.c | 44 ++-- + net/core/skbuff.c | 4 +- + net/ipv4/tcp.c | 7 +- + net/kcm/kcmsock.c | 5 +- + net/rds/page.c | 29 --- + net/rds/rds.h | 7 - + net/socket.c | 4 +- + net/unix/af_unix.c | 113 +-------- + samples/Kconfig | 5 + + samples/Makefile | 2 +- + samples/statx/Makefile | 10 + + samples/statx/test-statx.c | 254 +++++++++++++++++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/splice/Makefile | 8 + + .../selftests/splice/default_file_splice_read.c | 8 + + .../selftests/splice/default_file_splice_read.sh | 7 + + 113 files changed, 1267 insertions(+), 812 deletions(-) + create mode 100644 samples/statx/Makefile + create mode 100644 samples/statx/test-statx.c + create mode 100644 tools/testing/selftests/splice/Makefile + create mode 100644 tools/testing/selftests/splice/default_file_splice_read.c + create mode 100755 tools/testing/selftests/splice/default_file_splice_read.sh +$ git am -3 ../patches/0001-smc-merge-fix-for-switch-socket-splice_read-to-struc.patch +Applying: smc: merge fix for "switch socket ->splice_read() to struct file *" +$ git reset HEAD^ +Unstaged changes after reset: +M net/smc/af_smc.c +$ git add -A . +$ git commit -v -a --amend +[master 760f0df5492f] Merge remote-tracking branch 'vfs/for-next' + Date: Mon Feb 27 11:09:36 2017 +1100 +$ git am -3 ../patches/0001-statx-disable-the-sample-code-for-now.patch +Applying: statx: disable the sample code for now +$ git reset HEAD^ +Unstaged changes after reset: +M samples/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 03db7a93fd72] Merge remote-tracking branch 'vfs/for-next' + Date: Mon Feb 27 11:09:36 2017 +1100 +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up-to-date. +Merging printk/for-next (d9c23523ed98 printk: drop call_console_drivers() unused param) +$ git merge printk/for-next +Already up-to-date. +Merging pci/next (c4d052ce970e Merge branch 'pci/virtualization' into next) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (fc1b326efd27 MAINTAINERS: Adjust pstore git repo URI, add files) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (b03fa3ca9c90 Merge branch 'for-4.11/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/hid-over-i2c.txt | 5 +++ + drivers/hid/i2c-hid/i2c-hid.c | 45 ++++++++++++++++++++-- + include/linux/i2c/i2c-hid.h | 6 +++ + 3 files changed, 53 insertions(+), 3 deletions(-) +Merging i2c/i2c/for-next (ce3496c8d5ff Merge branch 'i2c/for-4.11' into i2c/for-next) +$ git merge i2c/i2c/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (0c744ea4f77d Linux 4.10-rc2) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (2f1736ff0664 hwmon: (sht15) Add device tree support) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging jc_docs/docs-next (bd8562626c8e docs / driver-api: Fix structure references in device_link.rst) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging v4l-dvb/master (e6b377dbbb94 Merge tag 'v4.10' into patchwork) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging v4l-dvb-next/master (432ac2d4acef Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb-next/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fbdev/fbdev-for-next (42f82367df2c video: fbdev: fsl-diu-fb: fix spelling mistake "palette") +$ git merge fbdev/fbdev-for-next +Already up-to-date. +Merging pm/linux-next (14a05f0baaf1 Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) +$ git merge idle/next +Merge made by the 'recursive' strategy. +Merging thermal/next (6fefe19f5836 Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next) +$ git merge thermal/next +Auto-merging drivers/thermal/devfreq_cooling.c +Auto-merging drivers/thermal/cpu_cooling.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/qoriq-thermal.txt | 7 + + .../bindings/thermal/rcar-gen3-thermal.txt | 56 ++++ + .../devicetree/bindings/thermal/zx2967-thermal.txt | 116 +++++++ + arch/powerpc/boot/dts/fsl/t1023si-post.dtsi | 4 +- + arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 4 +- + drivers/thermal/Kconfig | 17 ++ + drivers/thermal/Makefile | 2 + + drivers/thermal/clock_cooling.c | 50 +-- + drivers/thermal/cpu_cooling.c | 102 +++---- + drivers/thermal/devfreq_cooling.c | 53 +--- + drivers/thermal/imx_thermal.c | 4 + + drivers/thermal/intel_powerclamp.c | 4 - + drivers/thermal/mtk_thermal.c | 16 +- + drivers/thermal/rcar_gen3_thermal.c | 335 +++++++++++++++++++++ + drivers/thermal/samsung/exynos_tmu.c | 1 - + drivers/thermal/samsung/exynos_tmu.h | 1 - + drivers/thermal/thermal_core.c | 75 ++--- + drivers/thermal/ti-soc-thermal/Kconfig | 1 - + drivers/thermal/ti-soc-thermal/dra752-bandgap.h | 19 -- + .../thermal/ti-soc-thermal/dra752-thermal-data.c | 28 +- + drivers/thermal/zx2967_thermal.c | 258 ++++++++++++++++ + include/linux/thermal.h | 4 +- + 22 files changed, 890 insertions(+), 267 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/zx2967-thermal.txt + create mode 100644 drivers/thermal/rcar_gen3_thermal.c + create mode 100644 drivers/thermal/zx2967_thermal.c +Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/user.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Auto-merging drivers/xen/swiotlb-xen.c +Auto-merging arch/arm/xen/mm.c +Merge made by the 'recursive' strategy. + arch/arm/xen/mm.c | 2 ++ + drivers/xen/swiotlb-xen.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + include/xen/swiotlb-xen.h | 11 +++++++++++ + 3 files changed, 60 insertions(+) +Merging net-next/master (f1ef09fde17f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (7785bba299a8 esp: Add a software GRO codepath) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (ca78d3173cff Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge netfilter-next/master +Already up-to-date. +Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (4e33e3462510 tcp: use page_ref_inc() in tcp_sendmsg()) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (8f91566f99fa btmrvl: fix spelling mistake: "actived" -> "activated") +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (40beeb3c9b01 mac80211: shorten debug message) +$ git merge mac80211-next/master +Auto-merging net/mac80211/sta_info.h +Auto-merging net/mac80211/agg-rx.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/admtek/adm8211.c | 2 + + drivers/net/wireless/ath/ar5523/ar5523.c | 2 + + drivers/net/wireless/ath/ath10k/mac.c | 2 + + drivers/net/wireless/ath/ath5k/base.c | 2 + + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 + + drivers/net/wireless/ath/ath9k/init.c | 2 + + drivers/net/wireless/ath/carl9170/main.c | 2 + + drivers/net/wireless/ath/wcn36xx/main.c | 3 + + drivers/net/wireless/atmel/at76c50x-usb.c | 2 + + drivers/net/wireless/broadcom/b43/main.c | 2 + + drivers/net/wireless/broadcom/b43legacy/main.c | 2 + + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 + + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 + + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 + + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 + + drivers/net/wireless/mac80211_hwsim.c | 2 + + drivers/net/wireless/marvell/libertas_tf/main.c | 2 + + drivers/net/wireless/marvell/mwl8k.c | 2 + + drivers/net/wireless/mediatek/mt7601u/init.c | 2 + + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 3 + + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 2 + + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 + + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 2 + + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 2 + + include/linux/ieee80211.h | 1 + + include/net/cfg80211.h | 13 ++ + include/net/mac80211.h | 6 + + include/uapi/linux/nl80211.h | 9 +- + net/mac80211/agg-rx.c | 2 +- + net/mac80211/cfg.c | 28 +++++ + net/mac80211/mesh_hwmp.c | 21 +++- + net/mac80211/mesh_pathtbl.c | 3 + + net/mac80211/mlme.c | 24 ++++ + net/mac80211/sta_info.c | 4 +- + net/mac80211/sta_info.h | 5 +- + net/wireless/core.c | 21 +++- + net/wireless/core.h | 9 ++ + net/wireless/nl80211.c | 138 +++++++++++++++++++-- + net/wireless/rdev-ops.h | 12 ++ + net/wireless/trace.h | 22 ++++ + net/wireless/util.c | 10 +- + 42 files changed, 345 insertions(+), 35 deletions(-) +Merging rdma/for-next (9294000d6d89 IB/srp: Drain the send queue before destroying a QP) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe()) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe()) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (a4077ce58713 mtd: nand: Add Winbond manufacturer id) +$ git merge nand/nand/next +Already up-to-date. +Merging spi-nor/next (7fa2c7038cc0 mtd: spi-nor: cqspi: remove redundant dead code on error return check) +$ git merge spi-nor/next +Already up-to-date. +Merging crypto/master (12cb3a1c4184 crypto: xts - Add ECB dependency) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (d458079eb403 drm/tinydrm: fix mipi-dbi warning.) +$ git merge drm/drm-next +Merge made by the 'recursive' strategy. +Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (998d75730b40 drm/i915: Fix not finding the VBT when it overlaps with OPREGION_ASLE_EXT) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/for-linux-next (31788ca803a0 drm/vmwgfx: Work around drm removal of control nodes) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/rockchip/Kconfig | 1 + + drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +++- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 11 ++++++++++- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 ++-- + drivers/gpu/drm/zte/zx_plane.c | 4 ++-- + 5 files changed, 18 insertions(+), 6 deletions(-) +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (21c42da18ef1 drm/msm: return -EFAULT if copy_from_user() fails) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi/sunxi/for-next (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge sunxi/sunxi/for-next +Already up-to-date. +Merging kspp/for-next/kspp (965049b782ec Merge branch 'for-next/usercopy' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging scripts/Makefile.gcc-plugins +Auto-merging mm/util.c +Auto-merging mm/kasan/kasan.c +Auto-merging include/linux/printk.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging include/linux/audit.h +Auto-merging include/drm/drm_drv.h +Auto-merging include/acpi/acpixf.h +Auto-merging drivers/acpi/acpica/acutils.h +Auto-merging arch/x86/kernel/hpet.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + arch/Kconfig | 40 + + arch/arm/include/asm/string.h | 10 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/string.h | 25 +- + arch/powerpc/include/asm/string.h | 19 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/string_32.h | 25 +- + arch/x86/include/asm/string_64.h | 23 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/lib/Makefile | 4 + + drivers/acpi/acpica/acutils.h | 2 +- + fs/char_dev.c | 2 +- + fs/ntfs/debug.h | 6 +- + fs/ocfs2/cluster/masklog.h | 2 +- + include/acpi/acpixf.h | 2 +- + include/asm-generic/asm-prototypes.h | 8 +- + include/asm-generic/bug.h | 7 +- + include/asm-generic/vmlinux.lds.h | 2 + + include/drm/drm_drv.h | 2 +- + include/linux/audit.h | 5 +- + include/linux/compiler-gcc.h | 22 + + include/linux/compiler.h | 8 + + include/linux/fs.h | 8 +- + include/linux/printk.h | 2 +- + include/linux/ratelimit.h | 3 +- + include/linux/string.h | 75 +- + lib/string.c | 3 +- + lib/vsprintf.c | 6 +- + mm/kasan/kasan.c | 2 + + mm/util.c | 10 +- + scripts/Makefile.gcc-plugins | 14 + + scripts/gcc-plugins/initify_plugin.c | 1865 ++++++++++++++++++++++++++++++++++ + security/integrity/integrity.h | 2 +- + 33 files changed, 2090 insertions(+), 118 deletions(-) + create mode 100644 scripts/gcc-plugins/initify_plugin.c +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next) +$ git merge regmap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (44b46d739d35 ALSA: hda - Add Geminilake PCI ID) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (141dee78c40a Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next) +$ git merge sound-asoc/for-next +Already up-to-date. +Merging modules/modules-next (0d4ec7849f5a MAINTAINERS: add tree for modules) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (a685f48cf6bc Merge branch 'tsc2007' into next) +$ git merge input/next +Auto-merging drivers/input/touchscreen/tsc2007_core.c +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/ad7879.txt | 19 +++ + drivers/input/keyboard/tca8418_keypad.c | 2 - + drivers/input/touchscreen/Kconfig | 12 ++ + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/ad7879-i2c.c | 64 ++-------- + drivers/input/touchscreen/ad7879-spi.c | 124 +++--------------- + drivers/input/touchscreen/ad7879.c | 121 +++++++++--------- + drivers/input/touchscreen/ad7879.h | 13 +- + drivers/input/touchscreen/tsc2007.h | 101 +++++++++++++++ + .../touchscreen/{tsc2007.c => tsc2007_core.c} | 102 +++++---------- + drivers/input/touchscreen/tsc2007_iio.c | 140 +++++++++++++++++++++ + 11 files changed, 401 insertions(+), 299 deletions(-) + create mode 100644 drivers/input/touchscreen/tsc2007.h + rename drivers/input/touchscreen/{tsc2007.c => tsc2007_core.c} (83%) + create mode 100644 drivers/input/touchscreen/tsc2007_iio.c +Merging block/for-next (3695539290d7 Merge branch 'for-4.11/block' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (d67a5f4b5947 dm: flush queued bios when process blocks to avoid deadlock) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/next (8c7cdbf9272c mmc: core: add mmc prefix for blk_fixups) +$ git merge mmc/next +Already up-to-date. +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_io.c +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (2907ed0ca614 md: delete dead code) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.c | 8 -------- + drivers/md/md.h | 6 ------ + drivers/md/raid10.c | 19 ++++++++++++++++--- + 3 files changed, 16 insertions(+), 17 deletions(-) +Merging mfd/for-mfd-next (e93c10211d03 mfd: lpc_ich: Enable watchdog on Intel Apollo Lake PCH) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs) +$ git merge battery/for-next +Already up-to-date. +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (877fe823a0ad Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next) +$ git merge regulator/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging security/next (61841be6358c tpm: declare tpm2_get_pcr_allocation() as static) +$ git merge security/next +Already up-to-date. +Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/keys/keyctl.c +Auto-merging crypto/asymmetric_keys/x509_cert_parser.c +Auto-merging crypto/asymmetric_keys/public_key.c +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + 33 files changed, 1584 insertions(+), 52 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (61841be6358c tpm: declare tpm2_get_pcr_allocation() as static) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (61841be6358c tpm: declare tpm2_get_pcr_allocation() as static) +$ git merge tpmdd/next +Already up-to-date. +Merging watchdog/master (00ea1ceebe0d ipv6: release dst on error in ip6_dst_lookup_tail) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (8d2932dd0634 Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (d9d84780f17c vfio: fix a typo in comment of function vfio_pin_pages) +$ git merge vfio/next +Already up-to-date. +Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (fe8e52b9b910 audit: remove unnecessary curly braces from switch/case statements) +$ git merge audit/next +Already up-to-date. +Merging devicetree/for-next (4e29ccdb240e DT: add Faraday Tec. as vendor) +$ git merge devicetree/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (827498a19804 Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/topcliff-pch' into spi-next) +$ git merge spi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (571caca4ae9c Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging tools/perf/util/scripting-engines/trace-event-python.c +Auto-merging tools/lib/traceevent/event-parse.h +Auto-merging tools/lib/traceevent/event-parse.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/events/core.c +Auto-merging include/linux/compiler-gcc.h +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/x86/intel_rdt_ui.txt | 114 +++++++++ + Makefile | 24 +- + arch/x86/kernel/apic/apic.c | 8 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 4 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 6 +- + arch/x86/kernel/cpu/mcheck/threshold.c | 4 +- + arch/x86/kernel/irq.c | 4 +- + arch/x86/kernel/irq_work.c | 5 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/smp.c | 15 +- + arch/x86/kernel/vmlinux.lds.S | 1 + + include/linux/compiler-gcc.h | 13 +- + include/linux/refcount.h | 278 +-------------------- + kernel/events/core.c | 12 +- + kernel/sched/core.c | 29 ++- + lib/Kconfig.debug | 13 - + lib/Makefile | 2 +- + lib/refcount.c | 267 ++++++++++++++++++++ + tools/build/Makefile | 4 +- + tools/build/Makefile.include | 3 + + tools/lib/traceevent/event-parse.c | 4 +- + tools/lib/traceevent/event-parse.h | 2 +- + tools/objtool/arch.h | 5 +- + tools/objtool/arch/x86/decode.c | 3 - + tools/objtool/builtin-check.c | 60 ++++- + tools/perf/Documentation/perf-annotate.txt | 4 + + tools/perf/Documentation/perf-diff.txt | 4 + + tools/perf/Documentation/perf-record.txt | 2 +- + tools/perf/Documentation/perf-report.txt | 4 + + tools/perf/Documentation/perf-stat.txt | 2 +- + tools/perf/Makefile.config | 7 + + tools/perf/Makefile.perf | 4 +- + tools/perf/builtin-annotate.c | 4 + + tools/perf/builtin-diff.c | 14 +- + tools/perf/builtin-mem.c | 4 +- + tools/perf/builtin-record.c | 8 +- + tools/perf/builtin-report.c | 21 +- + tools/perf/builtin-sched.c | 12 +- + tools/perf/builtin-stat.c | 11 +- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-trace.c | 6 +- + tools/perf/pmu-events/json.c | 2 +- + tools/perf/tests/attr.c | 2 +- + tools/perf/tests/builtin-test.c | 2 +- + tools/perf/tests/code-reading.c | 2 +- + tools/perf/tests/fdarray.c | 2 +- + tools/perf/tests/llvm.c | 2 +- + tools/perf/tests/parse-events.c | 2 +- + tools/perf/tests/perf-record.c | 4 +- + tools/perf/tests/python-use.c | 2 +- + tools/perf/tests/thread-map.c | 6 +- + tools/perf/tests/topology.c | 4 +- + tools/perf/tests/vmlinux-kallsyms.c | 2 +- + tools/perf/ui/browsers/map.c | 6 +- + tools/perf/ui/hist.c | 2 +- + tools/perf/util/annotate.c | 2 +- + tools/perf/util/cpumap.c | 22 ++ + tools/perf/util/cpumap.h | 1 + + tools/perf/util/debug.c | 17 ++ + tools/perf/util/debug.h | 1 + + tools/perf/util/dso.c | 2 +- + tools/perf/util/env.c | 2 +- + tools/perf/util/header.c | 33 ++- + tools/perf/util/hist.c | 6 +- + tools/perf/util/parse-events.c | 71 +++--- + tools/perf/util/parse-events.h | 2 + + tools/perf/util/parse-events.y | 14 +- + tools/perf/util/pmu.c | 21 +- + tools/perf/util/probe-event.c | 2 +- + .../util/scripting-engines/trace-event-python.c | 4 +- + tools/perf/util/session.c | 2 +- + tools/perf/util/setup.py | 9 +- + tools/perf/util/sort.c | 8 +- + tools/perf/util/stat.c | 2 +- + tools/perf/util/symbol-elf.c | 2 +- + 76 files changed, 785 insertions(+), 473 deletions(-) + create mode 100644 lib/refcount.c +Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map()) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next) +$ git merge edac/linux_next +error: Could not parse conflict hunks in Documentation/admin-guide/ras.rst +Resolved 'Documentation/00-INDEX' using previous resolution. +Resolved 'drivers/edac/edac_device.c' using previous resolution. +Resolved 'drivers/edac/edac_mc.h' using previous resolution. +Resolved 'drivers/edac/edac_pci.c' using previous resolution. +Auto-merging drivers/edac/edac_pci.c +CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c +Auto-merging drivers/edac/edac_mc.h +CONFLICT (add/add): Merge conflict in drivers/edac/edac_mc.h +Auto-merging drivers/edac/edac_device.c +CONFLICT (content): Merge conflict in drivers/edac/edac_device.c +Auto-merging Documentation/admin-guide/ras.rst +CONFLICT (add/add): Merge conflict in Documentation/admin-guide/ras.rst +Auto-merging Documentation/00-INDEX +CONFLICT (content): Merge conflict in Documentation/00-INDEX +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e2a95a3fe9e9] Merge remote-tracking branch 'edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +Merging edac-amd/for-next (75bf2f6478ca EDAC, mce_amd: Print IPID and Syndrome on a separate line) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging ftrace/for-next (3962d9226404 Merge branch 'for-next/ftrace/core' into temp) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/jump_label.c +Auto-merging include/trace/events/timer.h +Auto-merging include/linux/timer.h +Auto-merging include/linux/jump_label.h +Auto-merging include/linux/compiler.h +Merge made by the 'recursive' strategy. + Documentation/static-keys.txt | 4 +- + include/linux/compiler.h | 27 +-- + include/linux/jump_label.h | 23 ++- + include/linux/timer.h | 2 + + include/trace/events/timer.h | 14 +- + kernel/jump_label.c | 153 ++++++++++++++--- + kernel/trace/ftrace.c | 372 +++++++++++++++++++++++++++-------------- + kernel/trace/trace.c | 1 + + kernel/trace/trace.h | 83 +++++---- + kernel/trace/trace_benchmark.c | 4 +- + kernel/trace/trace_branch.c | 83 +++++++-- + kernel/trace/trace_entries.h | 6 +- + kernel/trace/trace_hwlat.c | 39 ++--- + kernel/trace/trace_kprobe.c | 1 + + kernel/trace/trace_probe.c | 49 +++--- + kernel/trace/trace_uprobe.c | 4 +- + 16 files changed, 599 insertions(+), 266 deletions(-) +Merging rcu/rcu/next (31945aa9f140 Merge branches 'doc.2017.01.15b', 'dyntick.2017.01.23a', 'fixes.2017.01.23a', 'srcu.2017.01.25a' and 'torture.2017.01.15b' into HEAD) +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next (fd7e9a883484 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (7b6b46311a85 KVM: arm/arm64: Emulate the EL1 phys timer registers) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (bcd3bb63dbc8 KVM: PPC: Book3S HV: Disable HPT resizing on POWER9 for now) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (260a1d6afe2e KVM: s390: log runtime instrumentation enablement) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/priv.c +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + arch/s390/kvm/kvm-s390.c | 14 ++++++++------ + arch/s390/kvm/priv.c | 1 + + 2 files changed, 9 insertions(+), 6 deletions(-) +Merging xen-tip/linux-next (4610d240d691 xen/privcmd: add IOCTL_PRIVCMD_RESTRICT) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (a45463cbf3f9 workqueue: avoid clang warning) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drivers-x86/for-next (af050abb5c2e platform/x86: intel_turbo_max_3: make it explicitly non-modular) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (fb3d769173d2 leds: ledtrig-heartbeat: Make top brightness adjustable) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (eb994594bc22 ipmi: bt-bmc: Use a regmap for register access) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 2 +- + drivers/acpi/acpi_ipmi.c | 2 +- + drivers/char/ipmi/Kconfig | 3 +- + drivers/char/ipmi/bt-bmc.c | 80 +++++++++++++++++++++++++++---------- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/ipmi/ipmi_msghandler.c | 4 +- + drivers/char/ipmi/ipmi_powernv.c | 2 +- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + include/linux/ipmi.h | 2 +- + 9 files changed, 69 insertions(+), 30 deletions(-) +Merging driver-core/driver-core-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew)) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging usb/usb-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew)) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (beabdc3cd3e3 USB: serial: keyspan: drop header file) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (753dfd23612d usb: chipidea: msm: Fix return value check in ci_hdrc_msm_probe()) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label) +$ git merge phy-next/next +Already up-to-date. +Merging tty/tty-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew)) +$ git merge tty/tty-next +Already up-to-date. +Merging char-misc/char-misc-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew)) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (2f80adb138db extcon: int3496: Add GPIO ACPI mapping table) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + Documentation/extcon/intel-int3496.txt | 5 ++++ + drivers/extcon/extcon-arizona.c | 46 ++++++++++++++++++++++++++++++++++ + drivers/extcon/extcon-intel-int3496.c | 28 ++++++++++++++++++--- + drivers/extcon/extcon-palmas.c | 6 +++++ + drivers/extcon/extcon-usb-gpio.c | 7 +++--- + 5 files changed, 84 insertions(+), 8 deletions(-) +Merging staging/staging-next (bc49a7831b11 Merge branch 'akpm' (patches from Andrew)) +$ git merge staging/staging-next +Already up-to-date. +Merging slave-dma/next (235840692925 Merge branch 'fixes' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. +Merging cgroup/for-next (f83f3c515654 kernfs: fix locking around kernfs_ops->release() callback) +$ git merge cgroup/for-next +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging init/Kconfig +Auto-merging include/rdma/ib_verbs.h +Auto-merging fs/kernfs/kernfs-internal.h +Auto-merging fs/kernfs/file.c +Auto-merging fs/kernfs/dir.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/core_priv.h +Merge made by the 'recursive' strategy. + Documentation/cgroup-v1/rdma.txt | 109 ++ + Documentation/cgroup-v2.txt | 103 +- + drivers/infiniband/core/Makefile | 1 + + drivers/infiniband/core/cgroup.c | 62 + + drivers/infiniband/core/core_priv.h | 30 + + drivers/infiniband/core/device.c | 10 + + drivers/infiniband/core/uverbs_cmd.c | 102 +- + drivers/infiniband/core/uverbs_main.c | 20 + + fs/kernfs/dir.c | 2 +- + fs/kernfs/file.c | 62 +- + fs/kernfs/kernfs-internal.h | 2 +- + include/linux/cgroup-defs.h | 57 +- + include/linux/cgroup.h | 2 +- + include/linux/cgroup_rdma.h | 53 + + include/linux/cgroup_subsys.h | 4 + + include/linux/kernfs.h | 12 +- + include/rdma/ib_verbs.h | 14 + + init/Kconfig | 10 + + kernel/Makefile | 5 +- + kernel/cgroup/Makefile | 6 + + kernel/cgroup/cgroup-internal.h | 214 +++ + kernel/cgroup/cgroup-v1.c | 1395 ++++++++++++++++ + kernel/{ => cgroup}/cgroup.c | 2165 ++++--------------------- + kernel/{ => cgroup}/cpuset.c | 0 + kernel/{cgroup_freezer.c => cgroup/freezer.c} | 0 + kernel/cgroup/namespace.c | 155 ++ + kernel/{cgroup_pids.c => cgroup/pids.c} | 0 + kernel/cgroup/rdma.c | 619 +++++++ + kernel/events/core.c | 6 + + tools/perf/util/cgroup.c | 26 +- + 30 files changed, 3306 insertions(+), 1940 deletions(-) + create mode 100644 Documentation/cgroup-v1/rdma.txt + create mode 100644 drivers/infiniband/core/cgroup.c + create mode 100644 include/linux/cgroup_rdma.h + create mode 100644 kernel/cgroup/Makefile + create mode 100644 kernel/cgroup/cgroup-internal.h + create mode 100644 kernel/cgroup/cgroup-v1.c + rename kernel/{ => cgroup}/cgroup.c (72%) + rename kernel/{ => cgroup}/cpuset.c (100%) + rename kernel/{cgroup_freezer.c => cgroup/freezer.c} (100%) + create mode 100644 kernel/cgroup/namespace.c + rename kernel/{cgroup_pids.c => cgroup/pids.c} (100%) + create mode 100644 kernel/cgroup/rdma.c +Merging scsi/for-next (9880e90e1ab8 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/lpfc/lpfc_debugfs.c +Merge made by the 'recursive' strategy. + drivers/scsi/aacraid/aachba.c | 59 +- + drivers/scsi/aacraid/aacraid.h | 107 +- + drivers/scsi/aacraid/commctrl.c | 2 +- + drivers/scsi/aacraid/comminit.c | 2 +- + drivers/scsi/aacraid/commsup.c | 107 +- + drivers/scsi/aacraid/linit.c | 47 +- + drivers/scsi/aacraid/rx.c | 2 +- + drivers/scsi/aacraid/src.c | 48 +- + drivers/scsi/cxlflash/main.c | 4 + + drivers/scsi/cxlflash/main.h | 1 + + drivers/scsi/lpfc/Makefile | 11 +- + drivers/scsi/lpfc/lpfc.h | 162 +- + drivers/scsi/lpfc/lpfc_attr.c | 570 ++++++- + drivers/scsi/lpfc/lpfc_attr.h | 4 +- + drivers/scsi/lpfc/lpfc_bsg.c | 33 +- + drivers/scsi/lpfc/lpfc_bsg.h | 6 +- + drivers/scsi/lpfc/lpfc_compat.h | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 68 +- + drivers/scsi/lpfc/lpfc_ct.c | 388 +++-- + drivers/scsi/lpfc/lpfc_debugfs.c | 2300 +++++++++++++++++++------- + drivers/scsi/lpfc/lpfc_debugfs.h | 291 ++-- + drivers/scsi/lpfc/lpfc_disc.h | 24 +- + drivers/scsi/lpfc/lpfc_els.c | 366 ++++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 363 +++-- + drivers/scsi/lpfc/lpfc_hw.h | 86 +- + drivers/scsi/lpfc/lpfc_hw4.h | 506 +++++- + drivers/scsi/lpfc/lpfc_ids.h | 4 +- + drivers/scsi/lpfc/lpfc_init.c | 2889 ++++++++++++++++++++------------- + drivers/scsi/lpfc/lpfc_logmsg.h | 8 +- + drivers/scsi/lpfc/lpfc_mbox.c | 114 +- + drivers/scsi/lpfc/lpfc_mem.c | 278 +++- + drivers/scsi/lpfc/lpfc_nl.h | 4 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 257 ++- + drivers/scsi/lpfc/lpfc_nvme.c | 2464 ++++++++++++++++++++++++++++ + drivers/scsi/lpfc/lpfc_nvme.h | 103 ++ + drivers/scsi/lpfc/lpfc_nvmet.c | 1986 ++++++++++++++++++++++ + drivers/scsi/lpfc/lpfc_nvmet.h | 116 ++ + drivers/scsi/lpfc/lpfc_scsi.c | 111 +- + drivers/scsi/lpfc/lpfc_scsi.h | 22 +- + drivers/scsi/lpfc/lpfc_sli.c | 2195 ++++++++++++++++++++----- + drivers/scsi/lpfc/lpfc_sli.h | 42 +- + drivers/scsi/lpfc/lpfc_sli4.h | 98 +- + drivers/scsi/lpfc/lpfc_version.h | 10 +- + drivers/scsi/lpfc/lpfc_vport.c | 21 +- + drivers/scsi/lpfc/lpfc_vport.h | 4 +- + drivers/scsi/scsi_dh.c | 22 +- + drivers/scsi/scsi_lib.c | 23 + + drivers/scsi/smartpqi/smartpqi_init.c | 8 +- + drivers/scsi/ufs/ufs-qcom.c | 12 - + include/scsi/scsi_device.h | 1 + + 50 files changed, 13393 insertions(+), 2960 deletions(-) + create mode 100644 drivers/scsi/lpfc/lpfc_nvme.c + create mode 100644 drivers/scsi/lpfc/lpfc_nvme.h + create mode 100644 drivers/scsi/lpfc/lpfc_nvmet.c + create mode 100644 drivers/scsi/lpfc/lpfc_nvmet.h +$ git reset --hard HEAD^ +HEAD is now at 256c12177d0f Merge remote-tracking branch 'cgroup/for-next' +Merging next-20170222 version of scsi +$ git merge -m next-20170222/scsi 1d483bda11e8a63d31ed6636251320fb5eb0978c +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (2559a1ef688f scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m) +$ git merge scsi-mkp/for-next +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/cxlflash/superpipe.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + drivers/ata/libata-scsi.c | 12 +- + drivers/block/cciss.c | 32 +- + drivers/scsi/Kconfig | 4 +- + drivers/scsi/Makefile | 1 + + drivers/scsi/aacraid/aachba.c | 59 +- + drivers/scsi/aacraid/aacraid.h | 107 +- + drivers/scsi/aacraid/commctrl.c | 2 +- + drivers/scsi/aacraid/comminit.c | 2 +- + drivers/scsi/aacraid/commsup.c | 112 +- + drivers/scsi/aacraid/linit.c | 47 +- + drivers/scsi/aacraid/rx.c | 2 +- + drivers/scsi/aacraid/src.c | 48 +- + drivers/scsi/cxlflash/main.c | 4 + + drivers/scsi/cxlflash/main.h | 1 + + drivers/scsi/cxlflash/superpipe.c | 8 +- + drivers/scsi/cxlflash/vlun.c | 4 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 16 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 9 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 10 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 7 +- + drivers/scsi/lpfc/Makefile | 11 +- + drivers/scsi/lpfc/lpfc.h | 162 +- + drivers/scsi/lpfc/lpfc_attr.c | 570 ++++- + drivers/scsi/lpfc/lpfc_attr.h | 4 +- + drivers/scsi/lpfc/lpfc_bsg.c | 33 +- + drivers/scsi/lpfc/lpfc_bsg.h | 6 +- + drivers/scsi/lpfc/lpfc_compat.h | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 68 +- + drivers/scsi/lpfc/lpfc_ct.c | 388 +++- + drivers/scsi/lpfc/lpfc_debugfs.c | 2300 +++++++++++++----- + drivers/scsi/lpfc/lpfc_debugfs.h | 291 +-- + drivers/scsi/lpfc/lpfc_disc.h | 24 +- + drivers/scsi/lpfc/lpfc_els.c | 366 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 363 ++- + drivers/scsi/lpfc/lpfc_hw.h | 86 +- + drivers/scsi/lpfc/lpfc_hw4.h | 506 +++- + drivers/scsi/lpfc/lpfc_ids.h | 4 +- + drivers/scsi/lpfc/lpfc_init.c | 2889 +++++++++++++---------- + drivers/scsi/lpfc/lpfc_logmsg.h | 8 +- + drivers/scsi/lpfc/lpfc_mbox.c | 114 +- + drivers/scsi/lpfc/lpfc_mem.c | 278 ++- + drivers/scsi/lpfc/lpfc_nl.h | 4 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 257 ++- + drivers/scsi/lpfc/lpfc_nvme.c | 2464 ++++++++++++++++++++ + drivers/scsi/lpfc/lpfc_nvme.h | 103 + + drivers/scsi/lpfc/lpfc_nvmet.c | 1986 ++++++++++++++++ + drivers/scsi/lpfc/lpfc_nvmet.h | 116 + + drivers/scsi/lpfc/lpfc_scsi.c | 111 +- + drivers/scsi/lpfc/lpfc_scsi.h | 22 +- + drivers/scsi/lpfc/lpfc_sli.c | 2195 ++++++++++++++---- + drivers/scsi/lpfc/lpfc_sli.h | 42 +- + drivers/scsi/lpfc/lpfc_sli4.h | 98 +- + drivers/scsi/lpfc/lpfc_version.h | 10 +- + drivers/scsi/lpfc/lpfc_vport.c | 21 +- + drivers/scsi/lpfc/lpfc_vport.h | 4 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 105 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 2 - + drivers/scsi/osd/osd_uld.c | 3 +- + drivers/scsi/qedf/Kconfig | 11 + + drivers/scsi/qedf/Makefile | 5 + + drivers/scsi/qedf/qedf.h | 545 +++++ + drivers/scsi/qedf/qedf_attr.c | 165 ++ + drivers/scsi/qedf/qedf_dbg.c | 195 ++ + drivers/scsi/qedf/qedf_dbg.h | 154 ++ + drivers/scsi/qedf/qedf_debugfs.c | 460 ++++ + drivers/scsi/qedf/qedf_els.c | 949 ++++++++ + drivers/scsi/qedf/qedf_fip.c | 269 +++ + drivers/scsi/qedf/qedf_hsi.h | 422 ++++ + drivers/scsi/qedf/qedf_io.c | 2282 ++++++++++++++++++ + drivers/scsi/qedf/qedf_main.c | 3336 +++++++++++++++++++++++++++ + drivers/scsi/qedf/qedf_version.h | 15 + + drivers/scsi/qla2xxx/qla_isr.c | 7 +- + drivers/scsi/qla2xxx/qla_os.c | 16 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +- + drivers/scsi/scsi_common.c | 4 +- + drivers/scsi/scsi_dh.c | 22 +- + drivers/scsi/scsi_ioctl.c | 3 +- + drivers/scsi/scsi_lib.c | 113 +- + drivers/scsi/scsi_transport_spi.c | 24 +- + drivers/scsi/sd.c | 40 +- + drivers/scsi/smartpqi/smartpqi_init.c | 8 +- + drivers/scsi/sr_ioctl.c | 19 +- + drivers/scsi/ufs/ufs-qcom.c | 12 - + drivers/scsi/ufs/ufshcd.c | 10 +- + include/scsi/scsi_device.h | 14 +- + 86 files changed, 22400 insertions(+), 3213 deletions(-) + create mode 100644 drivers/scsi/lpfc/lpfc_nvme.c + create mode 100644 drivers/scsi/lpfc/lpfc_nvme.h + create mode 100644 drivers/scsi/lpfc/lpfc_nvmet.c + create mode 100644 drivers/scsi/lpfc/lpfc_nvmet.h + create mode 100644 drivers/scsi/qedf/Kconfig + create mode 100644 drivers/scsi/qedf/Makefile + create mode 100644 drivers/scsi/qedf/qedf.h + create mode 100644 drivers/scsi/qedf/qedf_attr.c + create mode 100644 drivers/scsi/qedf/qedf_dbg.c + create mode 100644 drivers/scsi/qedf/qedf_dbg.h + create mode 100644 drivers/scsi/qedf/qedf_debugfs.c + create mode 100644 drivers/scsi/qedf/qedf_els.c + create mode 100644 drivers/scsi/qedf/qedf_fip.c + create mode 100644 drivers/scsi/qedf/qedf_hsi.h + create mode 100644 drivers/scsi/qedf/qedf_io.c + create mode 100644 drivers/scsi/qedf/qedf_main.c + create mode 100644 drivers/scsi/qedf/qedf_version.h +Merging target-updates/for-next (c87ba9c49c1f target: Add counters for ABORT_TASK success + failure) +$ git merge target-updates/for-next +Auto-merging include/target/target_core_base.h +Auto-merging drivers/target/target_core_tpg.c +Auto-merging drivers/target/iscsi/iscsi_target_util.c +Auto-merging drivers/target/iscsi/iscsi_target_login.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla2xxx/qla_mr.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_gs.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_bsg.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_msg.h +Merge made by the 'recursive' strategy. + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 4 + + drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 3 + + drivers/scsi/qla2xxx/qla_bsg.c | 23 +- + drivers/scsi/qla2xxx/qla_def.h | 306 ++- + drivers/scsi/qla2xxx/qla_dfs.c | 11 +- + drivers/scsi/qla2xxx/qla_fw.h | 106 +- + drivers/scsi/qla2xxx/qla_gbl.h | 72 +- + drivers/scsi/qla2xxx/qla_gs.c | 726 +++++- + drivers/scsi/qla2xxx/qla_init.c | 1612 +++++++++---- + drivers/scsi/qla2xxx/qla_inline.h | 18 +- + drivers/scsi/qla2xxx/qla_iocb.c | 167 +- + drivers/scsi/qla2xxx/qla_isr.c | 317 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 232 +- + drivers/scsi/qla2xxx/qla_mr.c | 48 +- + drivers/scsi/qla2xxx/qla_os.c | 330 ++- + drivers/scsi/qla2xxx/qla_target.c | 2392 +++++++++----------- + drivers/scsi/qla2xxx/qla_target.h | 252 +-- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 256 ++- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 4 +- + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 30 +- + drivers/target/iscsi/cxgbit/cxgbit_lro.h | 5 +- + drivers/target/iscsi/cxgbit/cxgbit_main.c | 69 +- + drivers/target/iscsi/cxgbit/cxgbit_target.c | 173 +- + drivers/target/iscsi/iscsi_target.c | 138 +- + drivers/target/iscsi/iscsi_target_erl0.c | 6 +- + drivers/target/iscsi/iscsi_target_erl2.c | 6 +- + drivers/target/iscsi/iscsi_target_erl2.h | 2 +- + drivers/target/iscsi/iscsi_target_login.c | 2 +- + drivers/target/iscsi/iscsi_target_nego.c | 16 +- + drivers/target/iscsi/iscsi_target_tmr.c | 4 +- + drivers/target/iscsi/iscsi_target_util.c | 39 +- + drivers/target/target_core_device.c | 11 +- + drivers/target/target_core_sbc.c | 2 +- + drivers/target/target_core_stat.c | 36 + + drivers/target/target_core_tmr.c | 17 +- + drivers/target/target_core_tpg.c | 3 +- + drivers/target/target_core_transport.c | 164 +- + drivers/target/tcm_fc/tfc_cmd.c | 2 - + include/target/iscsi/iscsi_transport.h | 11 +- + include/target/target_core_base.h | 7 +- + include/target/target_core_fabric.h | 2 +- + include/uapi/linux/target_core_user.h | 22 +- + 43 files changed, 4790 insertions(+), 2858 deletions(-) +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging target-bva/for-next (762b6f00a995 uapi: fix linux/target_core_user.h userspace compilation errors) +$ git merge target-bva/for-next +Already up-to-date. +Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace) +$ git merge vhost/linux-next +Auto-merging include/uapi/linux/Kbuild +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_mmio.c | 2 +- + include/uapi/linux/Kbuild | 1 + + include/{ => uapi}/linux/virtio_mmio.h | 0 + 3 files changed, 2 insertions(+), 1 deletion(-) + rename include/{ => uapi}/linux/virtio_mmio.h (100%) +Merging rpmsg/for-next (349709ba5bea Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (3498d8694d41 gpio: reintroduce devm_get_gpiod_from_child()) +$ git merge gpio/for-next +Already up-to-date. +Merging pinctrl/for-next (baafacab092e pinctrl: samsung: Fix return value check in samsung_pinctrl_get_soc_data()) +$ git merge pinctrl/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (38b0a526ec33 Merge branch 'for-4.11/drivers' into for-next) +$ git merge pwm/for-next +Auto-merging drivers/pwm/Kconfig +Auto-merging drivers/acpi/acpi_lpss.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/imx-pwm.txt | 6 +- + drivers/acpi/acpi_lpss.c | 14 ++ + drivers/leds/leds-pwm.c | 16 +- + drivers/pwm/Kconfig | 4 +- + drivers/pwm/core.c | 70 +++--- + drivers/pwm/pwm-atmel-hlcdc.c | 1 - + drivers/pwm/pwm-atmel.c | 1 - + drivers/pwm/pwm-bcm-kona.c | 1 - + drivers/pwm/pwm-berlin.c | 1 - + drivers/pwm/pwm-bfin.c | 2 +- + drivers/pwm/pwm-brcmstb.c | 1 - + drivers/pwm/pwm-fsl-ftm.c | 1 - + drivers/pwm/pwm-imx.c | 272 ++++++++++------------ + drivers/pwm/pwm-lp3943.c | 1 - + drivers/pwm/pwm-lpss-pci.c | 22 ++ + drivers/pwm/pwm-lpss-platform.c | 21 ++ + drivers/pwm/pwm-lpss.c | 132 +++++------ + drivers/pwm/pwm-lpss.h | 4 - + drivers/pwm/pwm-mxs.c | 2 +- + drivers/pwm/pwm-pca9685.c | 176 ++++++++++++-- + drivers/pwm/pwm-pxa.c | 2 +- + drivers/pwm/pwm-sti.c | 1 - + drivers/pwm/pwm-sun4i.c | 1 - + drivers/pwm/pwm-twl-led.c | 1 - + drivers/pwm/pwm-twl.c | 1 - + drivers/pwm/pwm-vt8500.c | 2 +- + drivers/staging/greybus/pwm.c | 1 - + include/linux/pwm.h | 33 ++- + 28 files changed, 480 insertions(+), 310 deletions(-) +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d4a22e330f1d] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 +++++++++++ + 1 file changed, 11 insertions(+) +Merging userns/for-next (ace0c791e6c3 proc/sysctl: Don't grab i_lock under sysctl_lock.) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block) +$ git merge random/dev +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + drivers/char/random.c | 129 +++++++++++++++++++------------------------------ + include/linux/random.h | 18 +++++-- + init/main.c | 1 - + 3 files changed, 65 insertions(+), 83 deletions(-) +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (68bd42d97c30 selftests/powerpc: Fix remaining fallout from recent changes) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up-to-date. +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching) +$ git merge livepatching/for-next +Already up-to-date. +Merging coresight/next (dc83e0549ea1 coresight: Fixes coresight DT parse to get correct output port ID.) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-stm.c +Auto-merging drivers/hwtracing/coresight/coresight-etm-perf.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 2 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 80 ++++++++++++---------- + drivers/hwtracing/coresight/coresight-funnel.c | 4 +- + drivers/hwtracing/coresight/coresight-stm.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc.c | 2 +- + drivers/hwtracing/coresight/of_coresight.c | 2 +- + 7 files changed, 52 insertions(+), 42 deletions(-) +Merging rtc/rtc-next (d4f6c6f15a1f rtc: ds3232: Call device_init_wakeup before device_register) +$ git merge rtc/rtc-next +Removing include/linux/platform_data/rtc-m48t86.h +Auto-merging drivers/rtc/Kconfig +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-i2c-devices-bq32k | 7 + + .../devicetree/bindings/rtc/armada-380-rtc.txt | 8 +- + .../devicetree/bindings/rtc/cortina,gemini.txt | 14 + + .../devicetree/bindings/rtc/imxdi-rtc.txt | 5 +- + .../devicetree/bindings/rtc/maxim,ds3231.txt | 3 +- + Documentation/devicetree/bindings/rtc/pcf8563.txt | 3 +- + .../devicetree/bindings/rtc/st,stm32-rtc.txt | 27 + + .../devicetree/bindings/rtc/sun6i-rtc.txt | 10 + + arch/arm/mach-ep93xx/ts72xx.c | 40 +- + arch/arm/mach-ep93xx/ts72xx.h | 11 - + arch/arm/mach-orion5x/ts78xx-setup.c | 80 +-- + drivers/rtc/Kconfig | 18 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-armada38x.c | 318 +++++++-- + drivers/rtc/rtc-au1xxx.c | 2 +- + drivers/rtc/rtc-bfin.c | 2 +- + drivers/rtc/rtc-bq32k.c | 76 +++ + drivers/rtc/rtc-dm355evm.c | 2 +- + drivers/rtc/rtc-ds3232.c | 53 +- + drivers/rtc/rtc-gemini.c | 7 + + drivers/rtc/rtc-imxdi.c | 33 +- + drivers/rtc/rtc-ls1x.c | 2 +- + drivers/rtc/rtc-m48t86.c | 272 +++++--- + drivers/rtc/rtc-mcp795.c | 183 +++++- + drivers/rtc/rtc-mxc.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 15 +- + drivers/rtc/rtc-rx8010.c | 24 +- + drivers/rtc/rtc-sh.c | 2 +- + drivers/rtc/rtc-snvs.c | 1 + + drivers/rtc/rtc-stm32.c | 725 +++++++++++++++++++++ + drivers/rtc/rtc-sun6i.c | 182 +++++- + drivers/rtc/rtc-tegra.c | 41 +- + drivers/rtc/rtc-tps65910.c | 146 ++++- + include/linux/mfd/tps65910.h | 1 + + include/linux/platform_data/rtc-m48t86.h | 16 - + 35 files changed, 1956 insertions(+), 376 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-i2c-devices-bq32k + create mode 100644 Documentation/devicetree/bindings/rtc/cortina,gemini.txt + create mode 100644 Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt + create mode 100644 drivers/rtc/rtc-stm32.c + delete mode 100644 include/linux/platform_data/rtc-m48t86.h +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 (bfb34527a32a libnvdimm, pfn: fix memmap reservation size versus 4K alignment) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging idr/idr-4.11 (768dd325a382 radix tree test suite: Run iteration tests for longer) +$ git merge idr/idr-4.11 +Removing tools/testing/radix-tree/linux/types.h +Removing tools/testing/radix-tree/linux/mempool.h +Removing tools/testing/radix-tree/linux/export.h +Removing tools/testing/radix-tree/linux/bitops/non-atomic.h +Removing tools/testing/radix-tree/linux/bitops/le.h +Removing tools/testing/radix-tree/linux/bitops/hweight.h +Removing tools/testing/radix-tree/linux/bitops/fls64.h +Removing tools/testing/radix-tree/linux/bitops/fls.h +Removing tools/testing/radix-tree/linux/bitops/find.h +Removing tools/testing/radix-tree/linux/bitops/ffz.h +Removing tools/testing/radix-tree/linux/bitops/ffs.h +Removing tools/testing/radix-tree/linux/bitops/__ffs.h +Removing tools/testing/radix-tree/linux/bitops.h +Auto-merging tools/include/linux/compiler.h +Auto-merging net/mac80211/status.c +Auto-merging mm/workingset.c +Auto-merging lib/radix-tree.c +Auto-merging init/main.c +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/block/drbd/drbd_main.c +Merge made by the 'recursive' strategy. + drivers/atm/nicstar.c | 5 +- + drivers/block/drbd/drbd_main.c | 6 +- + drivers/firewire/core-cdev.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 10 +- + drivers/net/wireless/marvell/mwifiex/txrx.c | 4 +- + drivers/target/target_core_user.c | 4 +- + include/linux/idr.h | 148 ++- + include/linux/radix-tree.h | 85 +- + init/main.c | 3 +- + lib/idr.c | 1242 +++++--------------- + lib/radix-tree.c | 646 +++++++--- + mm/workingset.c | 6 +- + net/mac80211/status.c | 4 +- + tools/include/asm-generic/bitops/atomic.h | 3 + + tools/include/asm/bug.h | 8 + + tools/include/linux/bitmap.h | 1 + + tools/include/linux/bitops.h | 1 - + tools/include/linux/compiler.h | 4 + + tools/include/linux/spinlock.h | 5 + + tools/testing/radix-tree/.gitignore | 3 + + tools/testing/radix-tree/Makefile | 30 +- + tools/testing/radix-tree/benchmark.c | 6 +- + tools/testing/radix-tree/generated/autoconf.h | 2 - + tools/testing/radix-tree/idr-test.c | 444 +++++++ + tools/testing/radix-tree/iteration_check.c | 2 +- + tools/testing/radix-tree/linux.c | 39 +- + tools/testing/radix-tree/linux/bitops.h | 160 --- + tools/testing/radix-tree/linux/bitops/__ffs.h | 43 - + tools/testing/radix-tree/linux/bitops/ffs.h | 41 - + tools/testing/radix-tree/linux/bitops/ffz.h | 12 - + tools/testing/radix-tree/linux/bitops/find.h | 13 - + tools/testing/radix-tree/linux/bitops/fls.h | 41 - + tools/testing/radix-tree/linux/bitops/fls64.h | 14 - + tools/testing/radix-tree/linux/bitops/hweight.h | 11 - + tools/testing/radix-tree/linux/bitops/le.h | 53 - + tools/testing/radix-tree/linux/bitops/non-atomic.h | 110 -- + tools/testing/radix-tree/linux/export.h | 2 - + tools/testing/radix-tree/linux/gfp.h | 10 +- + tools/testing/radix-tree/linux/idr.h | 1 + + tools/testing/radix-tree/linux/init.h | 2 +- + tools/testing/radix-tree/linux/kernel.h | 49 +- + tools/testing/radix-tree/linux/mempool.h | 16 - + tools/testing/radix-tree/linux/percpu.h | 5 +- + tools/testing/radix-tree/linux/preempt.h | 10 + + tools/testing/radix-tree/linux/radix-tree.h | 23 + + tools/testing/radix-tree/linux/types.h | 23 - + tools/testing/radix-tree/main.c | 53 +- + tools/testing/radix-tree/multiorder.c | 39 +- + tools/testing/radix-tree/regression1.c | 4 +- + tools/testing/radix-tree/regression2.c | 10 +- + tools/testing/radix-tree/regression3.c | 28 +- + tools/testing/radix-tree/tag_check.c | 22 +- + tools/testing/radix-tree/test.c | 28 +- + tools/testing/radix-tree/test.h | 2 + + 55 files changed, 1576 insertions(+), 1967 deletions(-) + create mode 100644 tools/include/linux/spinlock.h + create mode 100644 tools/testing/radix-tree/idr-test.c + delete mode 100644 tools/testing/radix-tree/linux/bitops.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/__ffs.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/ffs.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/ffz.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/find.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/fls.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/fls64.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/hweight.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/le.h + delete mode 100644 tools/testing/radix-tree/linux/bitops/non-atomic.h + delete mode 100644 tools/testing/radix-tree/linux/export.h + create mode 100644 tools/testing/radix-tree/linux/idr.h + delete mode 100644 tools/testing/radix-tree/linux/mempool.h + delete mode 100644 tools/testing/radix-tree/linux/types.h +Merging akpm-current/current (f643bcaf971a scatterlist: do not disable IRQs in sg_copy_buffer) +$ git merge --no-ff akpm-current/current +Auto-merging ipc/shm.c +Auto-merging init/main.c +Auto-merging include/linux/compiler.h +Auto-merging block/genhd.c +Auto-merging arch/unicore32/include/asm/Kbuild +Auto-merging arch/openrisc/include/asm/Kbuild +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../filesystems/autofs4-mount-control.txt | 1 + + Documentation/filesystems/autofs4.txt | 39 +++++--- + MAINTAINERS | 1 + + arch/alpha/include/asm/Kbuild | 1 + + arch/arc/include/asm/kprobes.h | 6 +- + arch/arm/include/asm/kprobes.h | 4 + + arch/arm/include/asm/page.h | 2 + + arch/arm/probes/decode.h | 1 + + arch/arm64/include/asm/kprobes.h | 4 + + arch/arm64/kernel/armv8_deprecated.c | 1 + + arch/arm64/kernel/insn.c | 1 + + arch/arm64/kernel/probes/decode-insn.h | 2 + + arch/avr32/include/asm/kprobes.h | 7 +- + arch/blackfin/include/asm/Kbuild | 1 + + arch/c6x/include/asm/Kbuild | 1 + + arch/cris/include/asm/Kbuild | 1 + + arch/frv/include/asm/Kbuild | 1 + + arch/h8300/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/ia64/include/asm/kprobes.h | 12 ++- + arch/m32r/include/asm/Kbuild | 1 + + arch/m68k/include/asm/Kbuild | 1 + + arch/metag/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/Kbuild | 1 + + arch/mips/include/asm/kprobes.h | 6 +- + arch/mn10300/include/asm/kprobes.h | 7 +- + arch/nios2/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/kprobes.h | 3 + + arch/powerpc/lib/code-patching.c | 1 + + arch/s390/include/asm/kprobes.h | 7 +- + arch/score/include/asm/Kbuild | 1 + + arch/sh/include/asm/kprobes.h | 5 +- + arch/sparc/include/asm/kprobes.h | 10 +- + arch/tile/include/asm/kprobes.h | 6 +- + arch/um/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/Kbuild | 1 + + arch/x86/include/asm/kprobes.h | 9 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/xtensa/include/asm/Kbuild | 1 + + block/genhd.c | 2 +- + drivers/rapidio/devices/rio_mport_cdev.c | 11 +-- + fs/affs/affs.h | 22 +++-- + fs/affs/amigaffs.c | 42 ++++---- + fs/affs/inode.c | 9 +- + fs/affs/namei.c | 95 +++++++++++++----- + fs/affs/super.c | 3 +- + fs/autofs4/dev-ioctl.c | 2 - + fs/autofs4/root.c | 17 ++-- + fs/eventpoll.c | 2 +- + fs/hfs/mdb.c | 2 +- + fs/hfsplus/wrapper.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 66 +++++++++---- + fs/ocfs2/dlm/dlmrecovery.c | 40 +++----- + fs/proc/kcore.c | 5 +- + fs/reiserfs/super.c | 2 +- + include/asm-generic/kprobes.h | 25 +++++ + include/linux/compat.h | 4 +- + include/linux/compiler.h | 8 -- + include/linux/kexec.h | 2 + + include/linux/kprobes.h | 19 +--- + include/linux/pid.h | 4 +- + include/linux/sem.h | 2 +- + include/uapi/linux/auto_dev-ioctl.h | 10 +- + include/uapi/linux/auto_fs.h | 25 +++-- + include/uapi/linux/auto_fs4.h | 16 ++- + include/uapi/linux/sysctl.h | 4 + + init/initramfs.c | 2 + + init/main.c | 3 - + ipc/mqueue.c | 1 + + ipc/sem.c | 109 ++++++++++++--------- + ipc/shm.c | 13 ++- + kernel/configs/android-base.config | 2 + + kernel/configs/android-recommended.config | 1 + + kernel/signal.c | 11 ++- + lib/fonts/Kconfig | 16 +-- + lib/scatterlist.c | 28 ++++-- + mm/page_alloc.c | 5 + + mm/page_owner.c | 4 +- + mm/vmscan.c | 17 +++- + mm/zswap.c | 109 +++++++++++++++------ + scripts/gdb/linux/constants.py.in | 7 ++ + scripts/gdb/linux/proc.py | 73 ++++++++++++++ + tools/testing/selftests/sigaltstack/sas.c | 7 +- + 85 files changed, 696 insertions(+), 307 deletions(-) + create mode 100644 include/asm-generic/kprobes.h +$ 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: fs: add i_blocksize() +Using index info to reconstruct a base tree... +M fs/block_dev.c +M fs/ceph/addr.c +M fs/ext4/inode.c +M fs/ocfs2/file.c +M fs/stat.c +M include/linux/fs.h +Falling back to patching base and 3-way merge... +Auto-merging include/linux/fs.h +Auto-merging fs/stat.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/block_dev.c +Applying: truncate: use i_blocksize() +Applying: nilfs2: use nilfs_btree_node_size() +Applying: nilfs2: use i_blocksize() +Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances +Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances +Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances +Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances +Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances +Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances +Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances +Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances +Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances +Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances +Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances +Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances +Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances +Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances +Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances +Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances +Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances +Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances +Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances +Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances +Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances +Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances +Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances +Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances +Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances +Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances +Applying: scripts/spelling.txt: add some typo-words +Applying: lib/vsprintf.c: remove %Z support +Applying: checkpatch: warn when formats use %Z and suggest %z +Applying: checkpatchpl-warn-against-using-%z-fix +Applying: mm: add new mmgrab() helper +Applying: mm: add new mmget() helper +Applying: mm: use mmget_not_zero() helper +Applying: mm: clarify mm_struct.mm_{users,count} documentation +Applying: mm: add arch-independent testcases for RODATA +Applying: mm: testcases for RODATA: fix config dependency +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 64aeb3a55733...411a0d5101d6 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (411a0d5101d6 mm: testcases for RODATA: fix config dependency) +$ git merge --no-ff akpm/master +Removing arch/x86/kernel/test_rodata.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/libata.tmpl | 2 +- + Documentation/acpi/method-customizing.txt | 2 +- + Documentation/acpi/method-tracing.txt | 2 +- + Documentation/admin-guide/ras.rst | 2 +- + Documentation/blockdev/mflash.txt | 2 +- + Documentation/dev-tools/kcov.rst | 2 +- + Documentation/device-mapper/dm-raid.txt | 2 +- + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 2 +- + .../bindings/net/marvell-armada-370-neta.txt | 2 +- + Documentation/devicetree/bindings/opp/opp.txt | 2 +- + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 2 +- + .../devicetree/bindings/power/pd-samsung.txt | 2 +- + .../bindings/regulator/ti-abb-regulator.txt | 2 +- + .../devicetree/bindings/soc/rockchip/grf.txt | 4 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 4 +- + .../devicetree/bindings/sound/sun4i-codec.txt | 2 +- + .../devicetree/bindings/sound/sun4i-i2s.txt | 4 +- + Documentation/filesystems/quota.txt | 2 +- + Documentation/kselftest.txt | 4 +- + Documentation/media/dvb-drivers/ci.rst | 2 +- + .../media/uapi/dvb/dvb-frontend-parameters.rst | 4 +- + Documentation/memory-hotplug.txt | 4 +- + Documentation/networking/cdc_mbim.txt | 4 +- + Documentation/scsi/ChangeLog.megaraid_sas | 2 +- + Documentation/sound/hd-audio/notes.rst | 2 +- + Documentation/vm/userfaultfd.txt | 2 +- + arch/Kconfig | 2 +- + arch/alpha/kernel/smp.c | 2 +- + arch/arc/kernel/smp.c | 4 +- + arch/arc/kernel/unwind.c | 4 +- + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/include/asm/mach/flash.h | 2 +- + arch/arm/kernel/smp.c | 2 +- + arch/arm/mach-omap2/omap_twl.c | 2 +- + arch/arm/mm/cache-v7.S | 2 +- + arch/arm/mm/cache-v7m.S | 2 +- + arch/arm64/kernel/smp.c | 2 +- + arch/arm64/lib/copy_template.S | 2 +- + arch/blackfin/mach-common/smp.c | 4 +- + arch/cris/arch-v32/drivers/cryptocop.c | 2 +- + arch/frv/mm/mmu-context.c | 2 +- + arch/hexagon/kernel/smp.c | 2 +- + arch/ia64/kernel/setup.c | 2 +- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +- + arch/m32r/kernel/setup.c | 2 +- + arch/m68k/ifpsp060/src/isp.S | 2 +- + arch/metag/kernel/smp.c | 4 +- + arch/mips/kernel/traps.c | 2 +- + arch/mn10300/kernel/smp.c | 2 +- + arch/openrisc/kernel/entry.S | 6 +- + arch/openrisc/kernel/head.S | 6 +- + arch/openrisc/kernel/vmlinux.lds.S | 4 +- + arch/parisc/kernel/smp.c | 2 +- + arch/powerpc/boot/dts/fsl/mpc8569mds.dts | 2 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- + arch/powerpc/include/asm/fsl_hcalls.h | 2 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 2 +- + arch/powerpc/xmon/ppc-opc.c | 2 +- + arch/s390/kernel/processor.c | 2 +- + arch/s390/kernel/vtime.c | 2 +- + arch/score/kernel/traps.c | 2 +- + arch/sh/kernel/irq.c | 2 +- + arch/sh/kernel/smp.c | 4 +- + arch/sparc/include/asm/switch_to_32.h | 2 +- + arch/sparc/kernel/leon_smp.c | 2 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/sparc/kernel/sun4d_smp.c | 2 +- + arch/sparc/kernel/sun4m_smp.c | 2 +- + arch/sparc/kernel/traps_32.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/sparc/kernel/visemul.c | 2 +- + arch/tile/kernel/smpboot.c | 2 +- + arch/x86/Kconfig.debug | 8 --- + arch/x86/include/asm/cacheflush.h | 10 --- + arch/x86/include/asm/desc_defs.h | 2 +- + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/cpu/common.c | 4 +- + arch/x86/kernel/ftrace.c | 2 +- + arch/x86/kernel/test_rodata.c | 75 ---------------------- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/mm/init_32.c | 4 -- + arch/x86/mm/init_64.c | 5 -- + arch/xtensa/kernel/smp.c | 4 +- + block/blk-throttle.c | 2 +- + block/bsg.c | 6 +- + certs/blacklist.c | 2 +- + drivers/acpi/acpica/dbconvert.c | 2 +- + drivers/acpi/acpica/nspredef.c | 2 +- + drivers/acpi/acpica/nsxfeval.c | 4 +- + drivers/acpi/resource.c | 2 +- + drivers/acpi/spcr.c | 2 +- + drivers/ata/libata-eh.c | 2 +- + drivers/atm/ambassador.c | 7 +- + drivers/atm/eni.c | 6 +- + drivers/atm/firestream.c | 12 ++-- + drivers/atm/horizon.c | 7 +- + drivers/atm/iphase.c | 2 +- + drivers/atm/iphase.h | 2 +- + drivers/atm/lanai.c | 16 ++--- + drivers/block/loop.c | 2 +- + drivers/block/paride/pcd.c | 2 +- + drivers/block/paride/pd.c | 2 +- + drivers/block/paride/pf.c | 2 +- + drivers/block/paride/pg.c | 2 +- + drivers/block/paride/pt.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 4 +- + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/char/sonypi.c | 2 +- + drivers/crypto/caam/ctrl.c | 2 +- + drivers/crypto/ux500/cryp/cryp.c | 2 +- + drivers/devfreq/devfreq.c | 2 +- + drivers/extcon/extcon-rt8973a.c | 2 +- + drivers/firewire/core-device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- + drivers/gpu/drm/amd/include/atombios.h | 8 +-- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 2 +- + drivers/gpu/drm/drm_probe_helper.c | 4 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +- + drivers/gpu/drm/mga/mga_drv.h | 4 +- + drivers/gpu/drm/radeon/atombios.h | 6 +- + drivers/hid/hid-kye.c | 2 +- + drivers/hv/channel.c | 2 +- + drivers/hwmon/g762.c | 2 +- + drivers/ide/ide-acpi.c | 2 +- + drivers/ide/ide-tape.c | 4 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/sw/rdmavt/mad.c | 6 +- + drivers/input/touchscreen/cyttsp4_core.c | 62 +++++++++--------- + drivers/iommu/intel-svm.c | 2 +- + drivers/isdn/hardware/eicon/debug.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 2 +- + drivers/isdn/hisax/st5481_b.c | 2 +- + drivers/isdn/mISDN/dsp_core.c | 2 +- + drivers/media/dvb-core/dvb_ringbuffer.h | 4 +- + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 12 ++-- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 16 ++--- + drivers/media/dvb-frontends/drx39xyj/drxj.h | 4 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/dvb-frontends/helene.c | 2 +- + drivers/media/dvb-frontends/or51132.c | 2 +- + drivers/media/dvb-frontends/tda10048.c | 2 +- + drivers/media/i2c/adv7183_regs.h | 2 +- + drivers/media/pci/saa7164/saa7164-fw.c | 2 +- + drivers/media/platform/exynos4-is/fimc-core.h | 2 +- + drivers/media/tuners/xc5000.c | 2 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 4 +- + drivers/media/usb/gspca/t613.c | 6 +- + drivers/media/usb/tm6000/tm6000-input.c | 2 +- + drivers/media/v4l2-core/tuner-core.c | 4 +- + drivers/misc/vmw_vmci/vmci_context.c | 2 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 2 +- + drivers/mmc/host/mmci_qcom_dml.c | 2 +- + drivers/mtd/spi-nor/spi-nor.c | 2 +- + drivers/net/arcnet/arcnet.c | 2 +- + drivers/net/can/flexcan.c | 2 +- + drivers/net/ethernet/adi/bfin_mac.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 2 +- + drivers/net/ethernet/cadence/macb.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 2 +- + drivers/net/ethernet/micrel/ksz884x.c | 8 +-- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +- + drivers/net/ethernet/qlogic/qlge/qlge.h | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 8 +-- + drivers/net/ethernet/sfc/mcdi_pcol.h | 2 +- + drivers/net/ethernet/sis/sis900.c | 2 +- + drivers/net/gtp.c | 2 +- + drivers/net/usb/kalmia.c | 2 +- + drivers/net/usb/rndis_host.c | 2 +- + drivers/net/usb/sierra_net.c | 2 +- + drivers/net/wimax/i2400m/usb-fw.c | 2 +- + drivers/net/wireless/ath/ath9k/ani.c | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 4 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 30 ++++----- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 16 ++--- + drivers/net/wireless/marvell/mwifiex/wmm.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 2 +- + drivers/net/wireless/ti/wl18xx/main.c | 2 +- + drivers/net/wireless/ti/wlcore/init.c | 2 +- + drivers/nfc/pn533/pn533.c | 2 +- + drivers/nvme/host/rdma.c | 2 +- + drivers/parport/ieee1284_ops.c | 2 +- + drivers/parport/parport_pc.c | 2 +- + drivers/pci/quirks.c | 2 +- + drivers/pinctrl/bcm/Kconfig | 2 +- + drivers/power/avs/smartreflex.c | 6 +- + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 2 +- + drivers/scsi/bfa/bfi_ms.h | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 18 +++--- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 2 +- + drivers/scsi/osd/osd_initiator.c | 4 +- + drivers/scsi/osst.c | 6 +- + drivers/scsi/qla2xxx/qla_init.c | 10 +-- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/storvsc_drv.c | 2 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 4 +- + drivers/staging/wilc1000/linux_wlan.c | 2 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +- + drivers/tty/n_hdlc.c | 2 +- + drivers/tty/serial/ioc4_serial.c | 2 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 5 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 4 +- + drivers/usb/gadget/udc/renesas_usb3.c | 4 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/xhci.c | 4 +- + drivers/usb/misc/adutux.c | 6 +- + drivers/usb/misc/legousbtower.c | 2 +- + drivers/usb/misc/uss720.c | 8 +-- + drivers/usb/usbip/usbip_common.c | 2 +- + drivers/video/fbdev/aty/radeon_monitor.c | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/metronomefb.c | 2 +- + drivers/watchdog/bcm2835_wdt.c | 6 +- + fs/afs/dir.c | 14 ++-- + fs/block_dev.c | 2 +- + fs/btrfs/file.c | 2 +- + fs/buffer.c | 12 ++-- + fs/ceph/addr.c | 2 +- + fs/direct-io.c | 2 +- + fs/ecryptfs/kthread.c | 2 +- + fs/ext4/extents_status.c | 2 +- + fs/ext4/inode.c | 6 +- + fs/ext4/mballoc.c | 2 +- + fs/ext4/move_extent.c | 2 +- + fs/inode.c | 2 +- + fs/iomap.c | 10 +-- + fs/jfs/super.c | 4 +- + fs/mpage.c | 2 +- + fs/ncpfs/sock.c | 4 +- + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nfs/filelayout/filelayout.c | 4 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 4 +- + fs/nfs/objlayout/objlayout.c | 2 +- + fs/nfsd/blocklayout.c | 6 +- + fs/nfsd/nfscache.c | 2 +- + fs/nilfs2/alloc.c | 2 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btree.c | 4 +- + fs/nilfs2/inode.c | 4 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/orangefs/orangefs-utils.c | 4 +- + fs/proc/base.c | 8 +-- + fs/proc/task_mmu.c | 4 +- + fs/proc/task_nommu.c | 2 +- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/inode.c | 2 +- + fs/stat.c | 2 +- + fs/udf/inode.c | 2 +- + fs/userfaultfd.c | 8 +-- + fs/xfs/xfs_aops.c | 16 ++--- + fs/xfs/xfs_file.c | 4 +- + fs/xfs/xfs_log_recover.c | 2 +- + include/dt-bindings/sound/cs42l42.h | 2 +- + include/linux/dcache.h | 4 +- + include/linux/fs.h | 5 ++ + include/linux/kconfig.h | 2 +- + include/linux/mm_types.h | 23 ++++++- + include/linux/mtd/qinfo.h | 2 +- + include/linux/regulator/machine.h | 2 +- + include/linux/rodata_test.h | 24 +++++++ + include/linux/sched.h | 43 +++++++++++++ + include/linux/spi/flash.h | 2 +- + include/media/v4l2-ctrls.h | 4 +- + include/net/cfg80211.h | 2 +- + include/net/irda/timer.h | 2 +- + include/net/mac80211.h | 2 +- + include/xen/interface/grant_table.h | 2 +- + init/main.c | 6 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/events/core.c | 2 +- + kernel/events/uprobes.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 4 +- + kernel/futex.c | 2 +- + kernel/irq/manage.c | 2 +- + kernel/relay.c | 2 +- + kernel/sched/core.c | 4 +- + kernel/torture.c | 2 +- + kernel/trace/trace_stack.c | 2 +- + lib/vsprintf.c | 8 +-- + mm/Kconfig.debug | 7 ++ + mm/Makefile | 1 + + mm/dmapool.c | 2 +- + mm/khugepaged.c | 2 +- + mm/ksm.c | 2 +- + mm/mmu_context.c | 2 +- + mm/mmu_notifier.c | 2 +- + mm/oom_kill.c | 4 +- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 2 +- + mm/percpu.c | 2 +- + mm/rodata_test.c | 56 ++++++++++++++++ + mm/swapfile.c | 12 ++-- + mm/truncate.c | 2 +- + net/appletalk/ddp.c | 4 +- + net/atm/mpc.c | 2 +- + net/bluetooth/hci_sock.c | 6 +- + net/bridge/netfilter/ebt_among.c | 2 +- + net/ieee802154/socket.c | 4 +- + net/ipv4/fib_trie.c | 2 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- + net/ipv4/netfilter/nf_log_arp.c | 2 +- + net/ipv6/netfilter/nf_log_ipv6.c | 2 +- + net/irda/irnet/irnet_ppp.c | 12 ++-- + net/l2tp/l2tp_core.c | 4 +- + net/mac80211/mesh.c | 2 +- + net/netfilter/ipvs/ip_vs_conn.c | 2 +- + net/netfilter/ipvs/ip_vs_dh.c | 4 +- + net/netfilter/ipvs/ip_vs_lblc.c | 4 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 4 +- + net/netfilter/ipvs/ip_vs_sh.c | 4 +- + net/netfilter/ipvs/ip_vs_sync.c | 2 +- + net/netfilter/nf_conntrack_ftp.c | 2 +- + net/netfilter/nfnetlink_cthelper.c | 2 +- + net/netfilter/x_tables.c | 2 +- + net/sctp/output.c | 2 +- + net/sctp/transport.c | 4 +- + net/sunrpc/auth_gss/auth_gss.c | 2 +- + net/sunrpc/svc.c | 2 +- + net/sunrpc/svcsock.c | 4 +- + net/sunrpc/xprtsock.c | 8 +-- + scripts/checkpatch.pl | 29 ++++++--- + scripts/recordmcount.pl | 2 +- + scripts/spelling.txt | 47 ++++++++++++++ + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/policydb.c | 2 +- + sound/pci/ac97/ac97_patch.c | 2 +- + sound/pci/cs46xx/cs46xx_dsp_task_types.h | 2 +- + sound/pci/hda/patch_ca0132.c | 2 +- + sound/pci/ice1712/wm8766.c | 2 +- + sound/pci/ice1712/wm8776.c | 2 +- + sound/pci/korg1212/korg1212.c | 4 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 2 +- + sound/pcmcia/vx/vxp_ops.c | 2 +- + sound/ppc/snd_ps3.c | 2 +- + sound/soc/amd/acp-pcm-dma.c | 4 +- + sound/soc/codecs/wm_hubs.c | 2 +- + sound/soc/fsl/fsl_asrc.c | 2 +- + sound/soc/qcom/lpass.h | 2 +- + sound/soc/soc-core.c | 2 +- + sound/soc/soc-topology.c | 4 +- + tools/lguest/lguest.c | 2 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/bpf.c | 2 +- + tools/lib/traceevent/Makefile | 2 +- + tools/lib/traceevent/event-parse.h | 2 +- + tools/perf/Documentation/tips.txt | 2 +- + tools/perf/util/dso.c | 2 +- + tools/perf/util/probe-finder.c | 4 +- + tools/perf/util/sort.h | 2 +- + virt/kvm/async_pf.c | 2 +- + virt/kvm/kvm_main.c | 2 +- + 382 files changed, 829 insertions(+), 738 deletions(-) + delete mode 100644 arch/x86/kernel/test_rodata.c + create mode 100644 include/linux/rodata_test.h + create mode 100644 mm/rodata_test.c |