Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
hexdump: avoid warning in test function
fs: take i_mutex during prepare_binprm for set[ug]id executables
smp: Fix error case handling in smp_call_function_*()
iommu-common: Fix PARISC compile-time warnings
sparc: Make LDC use common iommu poll management functions
sparc: Make sparc64 use scalable lib/iommu-common.c functions
Break up monolithic iommu table/lock into finer graularity pools and lock
sparc: Revert generic IOMMU allocator.
tools/power turbostat: correct dumped pkg-cstate-limit value
tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
tools/power turbostat: Initial Skylake support
tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
tools/power turbostat: modprobe msr, if needed
tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
Bluetooth: hidp: Fix regression with older userspace and flags validation
config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
...
That solves several merge conflicts:
Documentation/DocBook/media/v4l/subdev-formats.xml
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/staging/media/mn88473/mn88473.c
include/linux/kconfig.h
include/uapi/linux/media-bus-format.h
The ones at subdev-formats.xml and media-bus-format.h are not trivial.
That's why we opted to merge from DRM.
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt (renamed from Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt (renamed from Documentation/devicetree/bindings/arm/bcm/bcm11351.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt (renamed from Documentation/devicetree/bindings/arm/bcm/bcm21664.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,bcm2835.txt (renamed from Documentation/devicetree/bindings/arm/bcm2835.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt (renamed from Documentation/devicetree/bindings/arm/bcm4708.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,bcm63138.txt (renamed from Documentation/devicetree/bindings/arm/bcm/bcm63138.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt (renamed from Documentation/devicetree/bindings/arm/brcm-brcmstb.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.txt (renamed from Documentation/devicetree/bindings/arm/bcm/cygnus.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/arm/exynos/power_domain.txt | 2 | |
-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/sti.txt | 4 | |
-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/bus/brcm,bus-axi.txt (renamed from Documentation/devicetree/bindings/bus/bcma.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/clock/brcm,kona-ccu.txt (renamed from Documentation/devicetree/bindings/clock/bcm-kona-clock.txt) | 0 | |
-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/dma/brcm,bcm2835-dma.txt (renamed from Documentation/devicetree/bindings/dma/bcm2835-dma.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/drm/imx/ldb.txt | 62 | |
-rw-r--r-- | Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt (renamed from Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt) | 0 | |
-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/brcm,kona-i2c.txt (renamed from Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt) | 0 | |
-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-imx.txt | 1 | |
-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/brcm,bcm59056.txt (renamed from Documentation/devicetree/bindings/mfd/bcm590xx.txt) | 0 | |
-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/bcm3384-intc.txt | 37 | |
-rw-r--r-- | Documentation/devicetree/bindings/mips/brcm/brcm,bmips.txt (renamed from Documentation/devicetree/bindings/mips/brcm/bmips.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/mips/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/misc/brcm,kona-smc.txt (renamed from Documentation/devicetree/bindings/misc/smc.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt (renamed from Documentation/devicetree/bindings/mmc/kona-sdhci.txt) | 0 | |
-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/amd-xgbe-phy.txt | 4 | |
-rw-r--r-- | Documentation/devicetree/bindings/net/apm-xgene-enet.txt | 12 | |
-rw-r--r-- | Documentation/devicetree/bindings/net/brcm,bcm7445-switch-v4.0.txt (renamed from Documentation/devicetree/bindings/net/broadcom-sf2.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/net/brcm,bcmgenet.txt (renamed from Documentation/devicetree/bindings/net/broadcom-bcmgenet.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/net/brcm,systemport.txt (renamed from Documentation/devicetree/bindings/net/broadcom-systemport.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt (renamed from Documentation/devicetree/bindings/net/broadcom-mdio-unimac.txt) | 0 | |
-rw-r--r-- | Documentation/devicetree/bindings/net/dsa/dsa.txt | 4 | |
-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/panel/ampire,am800480r3tmqwa1h.txt | 7 | |
-rw-r--r-- | Documentation/devicetree/bindings/panel/auo,b101ean01.txt | 7 | |
-rw-r--r-- | Documentation/devicetree/bindings/panel/innolux,at043tn24.txt | 7 | |
-rw-r--r-- | Documentation/devicetree/bindings/panel/innolux,zj070na-01p.txt | 7 | |
-rw-r--r-- | Documentation/devicetree/bindings/panel/ortustech,com43h4m85ulc.txt | 7 | |
-rw-r--r-- | Documentation/devicetree/bindings/panel/samsung,ltn140at29-301.txt | 7 | |
-rw-r--r-- | Documentation/devicetree/bindings/panel/shelly,sca07010-bfn-lnn.txt | 7 | |
-rw-r--r-- | Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt | 63 | |
-rw-r--r-- | Documentation/devicetree/bindings/phy/brcm,kona-usb2-phy.txt (renamed from Documentation/devicetree/bindings/phy/bcm-phy.txt) | 0 | |
-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/pin |