Backmerge the 4.8 pull request state from Dave - conflicts were
getting out of hand, and Chris has some patches which outright don't
apply without everything merged together again.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -rw-r--r-- | .mailmap | 6 | |
| -rw-r--r-- | CREDITS | 1 | |
| -rw-r--r-- | Documentation/ABI/testing/configfs-usb-gadget-uvc | 58 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt | 26 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/bridge/analogix_dp.txt | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/bridge/toshiba,tc358767.txt | 53 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/fsl,dcu.txt | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/msm/dsi.txt | 117 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/msm/mdp.txt | 59 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/msm/mdp4.txt | 112 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/msm/mdp5.txt | 160 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/lg,lp079qx1-sp0v.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/lg,lp097qx1-spa1.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/samsung,lsn122dl01-c01.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/sharp,lq101k1ly04.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/sharp,lq123p1jx31.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/panel/starry,kr122ea0sra.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt | 13 | |
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/ina2xx.txt | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt | 3 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-mux-pinctrl.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt | 8 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-dpaux-padctl.txt | 60 | |
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 3 | |
| -rw-r--r-- | Documentation/gdb-kernel-debugging.txt | 21 | |
| -rw-r--r-- | Documentation/gpu/drm-internals.rst | 19 | |
| -rw-r--r-- | Documentation/gpu/drm-kms.rst | 7 | |
| -rw-r--r-- | Documentation/gpu/vga-switcheroo.rst | 8 | |
| -rw-r--r-- | Documentation/leds/leds-class.txt | 4 | |
| -rw-r--r-- | Documentation/scsi/scsi_eh.txt | 8 | |
| -rw-r--r-- | Documentation/x86/intel_mpx.txt | 6 | |
| -rw-r--r-- | Documentation/x86/tlb.txt | 4 | |
| -rw-r--r-- | Documentation/x86/x86_64/machinecheck | 2 | |
| -rw-r--r-- | MAINTAINERS | 98 | |
| -rw-r--r-- | Makefile | 4 | |
| -rw-r--r-- | arch/Kconfig | 7 | |
| -rw-r--r-- | arch/alpha/include/asm/pgalloc.h | 4 | |
| -rw-r--r-- | arch/arc/Kconfig | 31 | |
| -rw-r--r-- | arch/arc/Makefile | 4 | |
| -rw-r--r-- | arch/arc/boot/dts/abilis_tb100.dtsi | 2 | |
| -rw-r--r-- | arch/arc/boot/dts/abilis_tb101.dtsi | 2 | |
| -rw-r--r-- | arch/arc/boot/dts/axc001.dtsi | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/axc003.dtsi | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/axc003_idu.dtsi | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/eznps.dts | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/nsim_700.dts | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/nsimosci.dts | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/nsimosci_hs.dts | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/nsimosci_hs_idu.dts | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/skeleton.dtsi | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/skeleton_hs.dtsi | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/skeleton_hs_idu.dtsi | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/vdk_axc003.dtsi | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/vdk_axc003_idu.dtsi | 1 | |
| -rw-r--r-- | arch/arc/include/asm/atomic.h | 45 | |
| -rw-r--r-- | arch/arc/include/asm/entry-compact.h | 4 | |
| -rw-r--r-- | arch/arc/include/asm/mmu_context.h | 2 | |
| -rw-r--r-- | arch/arc/include/asm/pgalloc.h | 4 | |
| -rw-r--r-- | arch/arc/include/asm/pgtable.h | 2 | |
| -rw-r--r-- | arch/arc/include/asm/processor.h | 2 | |
| -rw-r--r-- | arch/arc/include/asm/smp.h | 2 | |
| -rw-r--r-- | arch/arc/include/asm/spinlock.h | 292 | |
| -rw-r--r-- | arch/arc/include/asm/thread_info.h | 2 | |
| -rw-r--r-- | arch/arc/include/asm/uaccess.h | 2 | |
| -rw-r--r-- | arch/arc/include/uapi/asm/swab.h | 2 | |
| -rw-r--r-- | arch/arc/kernel/entry-compact.S | 18 | |
| -rw-r--r-- | arch/arc/kernel/intc-compact.c | 6 | |
| -rw-r--r-- | arch/arc/kernel/perf_event.c | 2 | |
| -rw-r--r-- | arch/arc/kernel/setup.c | 2 | |
| -rw-r--r-- | arch/arc/kernel/signal.c | 2 | |
| -rw-r--r-- | arch/arc/kernel/stacktrace.c | 2 | |
| -rw-r--r-- | arch/arc/kernel/troubleshoot.c | 2 | |
| -rw-r--r-- | arch/arc/mm/cache.c | 6 | |
| -rw-r--r-- | arch/arc/mm/dma.c | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/am437x-sk-evm.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/am57xx-idk-common.dtsi | 32 | |
| -rw-r--r-- | arch/arm/boot/dts/armada-385-linksys.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/dm8148-evm.dts | 8 | |
| -rw-r--r-- | arch/arm/boot/dts/dm8148-t410.dts | 9 | |
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/dra74x.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-snow-common.dtsi | 13 | |
| -rw-r--r-- | arch/arm/boot/dts/exynos5420-peach-pit.dts | 13 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-evm-37xx.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-igep.dtsi | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-igep0020-common.dtsi | 11 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-n950-n9.dtsi | 6 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-zoom3.dts | 6 | |
| -rw-r--r-- | arch/arm/boot/dts/omap5-board-common.dtsi | 48 | |
| -rw-r--r-- | arch/arm/boot/dts/omap5-igep0050.dts | 26 | |
| -rw-r--r-- | arch/arm/boot/dts/omap5-uevm.dts | 10 | |
| -rw-r--r-- | arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/stih407-family.dtsi | 3 | |
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 21 | |
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a10s.dtsi | 11 | |
| -rw-r--r-- | arch/arm/boot/dts/sun5i-r8-chip.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/sun7i-a20.dtsi | 13 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra30-beaver.dts | 3 | |
| -rw-r--r-- | arch/arm/configs/exynos_defconfig | 1 | |
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | |
| -rw-r--r-- | arch/arm/include/asm/pgalloc.h | 2 | |
| -rw-r--r-- | arch/arm/include/asm/pgtable-2level.h | 1 | |
| -rw-r--r-- | arch/arm/include/asm/pgtable-3level.h | 5 | |
| -rw-r--r-- | arch/arm/include/asm/pgtable.h | 1 | |
| -rw-r--r-- | arch/arm/kernel/smp.c | 2 | |
| -rw-r--r-- | arch/arm/kvm/arm.c | 1 | |
| -rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | |
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6ul.c | 2 | |
| -rw-r--r-- | arch/arm/mach-mvebu/Makefile | 10 | |
| -rw-r--r-- | arch/arm/mach-mvebu/coherency.c | 23 | |
| -rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq-handler.S | 6 | |
| -rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq.c | 5 | |
| -rw-r--r-- | arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | 2 | |
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 12 | |
| -rw-r--r-- | arch/arm/mach-omap2/omap-secure.h | 1 | |
| -rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 48 | |
| -rw-r--r-- | arch/arm/mach-omap2/powerdomain.c | 9 | |
| -rw-r--r-- | arch/arm/mach-omap2/powerdomains7xx_data.c | 76 | |
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 7 | |
| -rw-r--r-- | arch/arm/mach-vexpress/spc.c | 2 | |
| -rw-r--r-- | arch/arm/plat-samsung/devs.c | 2 | |
| -rw-r--r-- | arch/arm64/Makefile | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/lg/lg1312.dtsi | 2 | |
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 | |
