The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.
I've included the patch into the merge to fix the build.
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | Documentation/ABI/obsolete/sysfs-block-zram | 119 | |
| -rw-r--r-- | Documentation/ABI/stable/sysfs-devices | 10 | |
| -rw-r--r-- | Documentation/ABI/testing/configfs-usb-gadget-printer | 9 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-block-dm | 22 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-block-zram | 25 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio | 137 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-cxl | 2 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-led-flash | 80 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-net | 8 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-net-queues | 8 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-hid | 10 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff | 45 | |
| -rw-r--r-- | Documentation/CodingStyle | 162 | |
| -rw-r--r-- | Documentation/DocBook/crypto-API.tmpl | 860 | |
| -rw-r--r-- | Documentation/DocBook/drm.tmpl | 2 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/biblio.xml | 11 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/dev-sliced-vbi.xml | 2 | |
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-sliced-vbi-cap.xml | 2 | |
| -rw-r--r-- | Documentation/IRQ-domain.txt | 3 | |
| -rw-r--r-- | Documentation/PCI/MSI-HOWTO.txt | 21 | |
| -rw-r--r-- | Documentation/PCI/pci-error-recovery.txt | 2 | |
| -rw-r--r-- | Documentation/PCI/pci.txt | 12 | |
| -rw-r--r-- | Documentation/PCI/pcieaer-howto.txt | 4 | |
| -rw-r--r-- | Documentation/SubmittingPatches | 4 | |
| -rw-r--r-- | Documentation/acpi/apei/einj.txt | 196 | |
| -rw-r--r-- | Documentation/acpi/enumeration.txt | 26 | |
| -rw-r--r-- | Documentation/arm/Booting | 9 | |
| -rw-r--r-- | Documentation/arm/README | 15 | |
| -rw-r--r-- | Documentation/atomic_ops.txt | 45 | |
| -rw-r--r-- | Documentation/blackfin/Makefile | 2 | |
| -rw-r--r-- | Documentation/block/biodoc.txt | 36 | |
| -rw-r--r-- | Documentation/blockdev/nbd.txt | 48 | |
| -rw-r--r-- | Documentation/blockdev/zram.txt | 87 | |
| -rw-r--r-- | Documentation/cgroups/cpusets.txt | 10 | |
| -rw-r--r-- | Documentation/cgroups/memory.txt | 8 | |
| -rw-r--r-- | Documentation/cma/debugfs.txt | 21 | |
| -rw-r--r-- | Documentation/crypto/crypto-API-userspace.txt | 205 | |
| -rw-r--r-- | Documentation/device-mapper/dm-crypt.txt | 4 | |
| -rw-r--r-- | Documentation/device-mapper/log-writes.txt | 140 | |
| -rw-r--r-- | Documentation/device-mapper/switch.txt | 4 | |
| -rw-r--r-- | Documentation/device-mapper/thin-provisioning.txt | 3 | |
| -rw-r--r-- | Documentation/device-mapper/verity.txt | 21 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/freescale/fsl,vf610-mscm-cpucfg.txt | 14 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/freescale/fsl,vf610-mscm-ir.txt | 33 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/gic.txt | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/omap/crossbar.txt | 18 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/pmu.txt | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/samsung/pmu.txt | 17 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/ata/ahci-st.txt | 47 | |
| -rw-r--r-- | Documentation/devicetree/bindings/clock/pistachio-clock.txt | 123 | |
| -rw-r--r-- | Documentation/devicetree/bindings/crypto/img-hash.txt | 27 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-altera.txt | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio-fan.txt | 19 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/gpio.txt | 30 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpio/mrvl-gpio.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/hwrng/brcm,iproc-rng200.txt | 12 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-davinci.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-digicolor.txt | 25 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-jz4780.txt | 35 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt | 22 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/trivial-devices.txt | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt | 16 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/mcp320x.txt | 30 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/mcp3422.txt | 17 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt | 18 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/st-sensors.txt | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt | 108 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/qcom,pm8941-pwrkey.txt | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/brcm,iproc-touchscreen.txt | 76 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt | 46 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/goodix.txt | 29 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/sun4i.txt | 22 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/sx8654.txt | 16 | |
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt | 41 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7038-l1-intc.txt | 52 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.txt | 12 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-mx.txt | 18 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/cdns,xtensa-pic.txt | 25 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt | 5 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/nvidia,tegra-ictlr.txt | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/st,sti-irq-syscfg.txt | 35 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/ti,omap4-wugen-mpu | 33 | |
| -rw-r--r-- | Documentation/devicetree/bindings/leds/common.txt | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/leds/leds-gpio.txt | 12 | |
| -rw-r--r-- | Documentation/devicetree/bindings/leds/leds-pm8941-wled.txt | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mailbox/arm-mhu.txt | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/arizona.txt | 41 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/axp20x.txt | 96 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/da9150.txt | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/mt6397.txt | 70 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt | 19 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 218 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/sky81452.txt | 35 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt | 37 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mips/brcm/soc.txt | 12 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mips/img/pistachio.txt | 42 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt | 23 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/mmc-card.txt | 31 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/sdhci-st.txt | 100 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/apm-xgene-enet.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/ethernet.txt | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt | 8 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/ieee802154/cc2520.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/keystone-netcp.txt | 34 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/macb.txt | 5 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/nfc/nxp-nci.txt | 35 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/stmmac.txt | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt | 63 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/dm816x-phy.txt | 24 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/phy-miphy365x.txt | 8 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/samsung-phy.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/phy/sun9i-usb-phy.txt | 38 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/brcm,cygnus-gpio.txt | 98 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/brcm,cygnus-pinmux.txt | 132 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/marvell,armada-39x-pinctrl.txt | 78 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/nvidia,tegra210-pinmux.txt | 166 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt | 39 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 145 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/power/da9150-charger.txt | 26 | |
| -rw-r--r-- | |
