Dave asked me to do the backmerge before sending him the revised pull
request, so here we go. Nothing fancy in the conflicts, just a few
things changed right next to each another.
Conflicts:
drivers/gpu/drm/drm_irq.c
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -rw-r--r-- | include/acpi/acconfig.h | 18 | |
| -rw-r--r-- | include/acpi/acnames.h | 1 | |
| -rw-r--r-- | include/acpi/acpi_bus.h | 42 | |
| -rw-r--r-- | include/acpi/acpiosxf.h | 31 | |
| -rw-r--r-- | include/acpi/acpixf.h | 54 | |
| -rw-r--r-- | include/acpi/actbl.h | 12 | |
| -rw-r--r-- | include/acpi/actbl1.h | 58 | |
| -rw-r--r-- | include/acpi/actbl2.h | 14 | |
| -rw-r--r-- | include/acpi/actbl3.h | 118 | |
| -rw-r--r-- | include/acpi/actypes.h | 19 | |
| -rw-r--r-- | include/acpi/apei.h | 4 | |
| -rw-r--r-- | include/acpi/ghes.h | 2 | |
| -rw-r--r-- | include/acpi/platform/acenv.h | 53 | |
| -rw-r--r-- | include/acpi/platform/aclinux.h | 12 | |
| -rw-r--r-- | include/acpi/platform/aclinuxex.h | 22 | |
| -rw-r--r-- | include/asm-generic/gpio.h | 3 | |
| -rw-r--r-- | include/asm-generic/io-64-nonatomic-hi-lo.h | 14 | |
| -rw-r--r-- | include/asm-generic/io-64-nonatomic-lo-hi.h | 14 | |
| -rw-r--r-- | include/asm-generic/pci-dma-compat.h | 8 | |
| -rw-r--r-- | include/asm-generic/percpu.h | 410 | |
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 3 | |
| -rw-r--r-- | include/clocksource/pxa.h | 18 | |
| -rw-r--r-- | include/crypto/aead.h | 4 | |
| -rw-r--r-- | include/crypto/algapi.h | 6 | |
| -rw-r--r-- | include/crypto/des.h | 3 | |
| -rw-r--r-- | include/crypto/drbg.h | 290 | |
| -rw-r--r-- | include/crypto/hash.h | 4 | |
| -rw-r--r-- | include/crypto/internal/skcipher.h | 3 | |
| -rw-r--r-- | include/crypto/pkcs7.h | 36 | |
| -rw-r--r-- | include/crypto/public_key.h | 4 | |
| -rw-r--r-- | include/crypto/scatterwalk.h | 6 | |
| -rw-r--r-- | include/crypto/skcipher.h | 4 | |
| -rw-r--r-- | include/drm/drmP.h | 271 | |
| -rw-r--r-- | include/drm/drm_agpsupport.h | 26 | |
| -rw-r--r-- | include/drm/drm_buffer.h | 148 | |
| -rw-r--r-- | include/drm/drm_crtc.h | 30 | |
| -rw-r--r-- | include/drm/drm_fb_helper.h | 1 | |
| -rw-r--r-- | include/drm/drm_memory.h | 59 | |
| -rw-r--r-- | include/drm/drm_mipi_dsi.h | 21 | |
| -rw-r--r-- | include/drm/drm_modeset_lock.h | 16 | |
| -rw-r--r-- | include/drm/drm_panel.h | 58 | |
| -rw-r--r-- | include/drm/drm_pciids.h | 7 | |
| -rw-r--r-- | include/drm/drm_usb.h | 15 | |
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 47 | |
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 34 | |
| -rw-r--r-- | include/drm/ttm/ttm_execbuf_util.h | 22 | |
| -rw-r--r-- | include/dt-bindings/clock/clps711x-clock.h | 27 | |
| -rw-r--r-- | include/dt-bindings/clock/exynos4.h | 25 | |
| -rw-r--r-- | include/dt-bindings/clock/exynos5250.h | 2 | |
| -rw-r--r-- | include/dt-bindings/clock/exynos5420.h | 2 | |
| -rw-r--r-- | include/dt-bindings/clock/exynos5440.h | 2 | |
| -rw-r--r-- | include/dt-bindings/clock/imx1-clock.h | 40 | |
| -rw-r--r-- | include/dt-bindings/clock/imx21-clock.h | 80 | |
| -rw-r--r-- | include/dt-bindings/clock/imx27-clock.h | 108 | |
| -rw-r--r-- | include/dt-bindings/clock/imx6qdl-clock.h | 224 | |
| -rw-r--r-- | include/dt-bindings/clock/qcom,gcc-apq8084.h | 351 | |
| -rw-r--r-- | include/dt-bindings/clock/qcom,gcc-ipq806x.h | 293 | |
| -rw-r--r-- | include/dt-bindings/clock/qcom,gcc-msm8960.h | 11 | |
| -rw-r--r-- | include/dt-bindings/clock/qcom,mmcc-apq8084.h | 183 | |
| -rw-r--r-- | include/dt-bindings/clock/qcom,mmcc-msm8960.h | 8 | |
| -rw-r--r-- | include/dt-bindings/clock/r8a7790-clock.h | 27 | |
| -rw-r--r-- | include/dt-bindings/clock/r8a7791-clock.h | 27 | |
| -rw-r--r-- | include/dt-bindings/clock/rk3066a-cru.h | 35 | |
| -rw-r--r-- | include/dt-bindings/clock/rk3188-cru-common.h | 249 | |
| -rw-r--r-- | include/dt-bindings/clock/rk3188-cru.h | 51 | |
| -rw-r--r-- | include/dt-bindings/clock/rk3288-cru.h | 278 | |
| -rw-r--r-- | include/dt-bindings/clock/s5pv210-audss.h | 34 | |
| -rw-r--r-- | include/dt-bindings/clock/s5pv210.h | 239 | |
| -rw-r--r-- | include/dt-bindings/clock/vf610-clock.h | 4 | |
| -rw-r--r-- | include/dt-bindings/dma/nbpfaxi.h | 20 | |
| -rw-r--r-- | include/dt-bindings/mfd/as3722.h | 2 | |
| -rw-r--r-- | include/dt-bindings/mfd/palmas.h | 18 | |
| -rw-r--r-- | include/dt-bindings/phy/phy-miphy365x.h | 14 | |
| -rw-r--r-- | include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h | 7 | |
| -rw-r--r-- | include/dt-bindings/reset/qcom,gcc-apq8084.h | 109 | |
| -rw-r--r-- | include/dt-bindings/reset/qcom,gcc-ipq806x.h | 132 | |
| -rw-r--r-- | include/dt-bindings/reset/qcom,gcc-msm8960.h | 16 | |
| -rw-r--r-- | include/dt-bindings/reset/qcom,mmcc-apq8084.h | 64 | |
| -rw-r--r-- | include/dt-bindings/reset/qcom,mmcc-msm8960.h | 8 | |
| -rw-r--r-- | include/keys/big_key-type.h | 3 | |
| -rw-r--r-- | include/keys/system_keyring.h | 10 | |
| -rw-r--r-- | include/keys/user-type.h | 3 | |
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 14 | |
| -rw-r--r-- | include/kvm/arm_vgic.h | 115 | |
| -rw-r--r-- | include/linux/acct.h | 4 | |
| -rw-r--r-- | include/linux/acpi.h | 17 | |
| -rw-r--r-- | include/linux/aer.h | 2 | |
| -rw-r--r-- | include/linux/ahci_platform.h | 5 | |
| -rw-r--r-- | include/linux/amd-iommu.h | 7 | |
| -rw-r--r-- | include/linux/arcdevice.h | 10 | |
| -rw-r--r-- | include/linux/atmel-pwm-bl.h | 43 | |
| -rw-r--r-- | include/linux/atmel-ssc.h | 13 | |
| -rw-r--r-- | include/linux/atmel_pwm.h | 70 | |
| -rw-r--r-- | include/linux/bcma/bcma.h | 27 | |
| -rw-r--r-- | include/linux/bcma/bcma_driver_pcie2.h | 158 | |
| -rw-r--r-- | include/linux/bio.h | 1 | |
| -rw-r--r-- | include/linux/bitmap.h | 62 | |
| -rw-r--r-- | include/linux/blkdev.h | 4 | |
| -rw-r--r-- | include/linux/brcmphy.h | 1 | |
| -rw-r--r-- | include/linux/byteorder/generic.h | 2 | |
| -rw-r--r-- | include/linux/capability.h | 5 | |
| -rw-r--r-- | include/linux/ceph/messenger.h | 14 | |
| -rw-r--r-- | include/linux/ceph/osd_client.h | 18 | |
| -rw-r--r-- | include/linux/cgroup.h | 165 | |
| -rw-r--r-- | include/linux/clk-provider.h | 5 | |
| -rw-r--r-- | include/linux/clk/clk-conf.h | 20 | |
| -rw-r--r-- | include/linux/clocksource.h | 2 | |
| -rw-r--r-- | include/linux/cma.h | 27 | |
| -rw-r--r-- | include/linux/cper.h | 32 | |
| -rw-r--r-- | include/linux/cpufreq.h | 1 | |
| -rw-r--r-- | include/linux/crc32.h | 20 | |
| -rw-r--r-- | include/linux/cred.h | 9 | |
| -rw-r--r-- | include/linux/crypto.h | 8 | |
| -rw-r--r-- | include/linux/dcache.h | 1 | |
| -rw-r--r-- | include/linux/decompress/bunzip2.h | 8 | |
| -rw-r--r-- | include/linux/decompress/generic.h | 10 | |
| -rw-r--r-- | include/linux/decompress/inflate.h | 8 | |
| -rw-r--r-- | include/linux/decompress/unlz4.h | 8 | |
| -rw-r--r-- | include/linux/decompress/unlzma.h | 8 | |
| -rw-r--r-- | include/linux/decompress/unlzo.h | 8 | |
| -rw-r--r-- | include/linux/decompress/unxz.h | 8 | |
| -rw-r--r-- | include/linux/device.h | 8 | |
| -rw-r--r-- | include/linux/dma-buf.h | 21 | |
| -rw-r--r-- | include/linux/dma-contiguous.h | 11 | |
| -rw-r--r-- | include/linux/dmaengine.h | 6 | |
| -rw-r--r-- | include/linux/dmar.h | 50 | |
| -rw-r--r-- | include/linux/drbd.h | 4 | |
| -rw-r--r-- | include/linux/drbd_genl.h | 4 | |
| -rw-r--r-- | include/linux/drbd_limits.h | 6 | |
| -rw-r--r-- | include/linux/edac.h | 5 | |
| -rw-r--r-- | include/linux/efi.h | 82 | |
| -rw-r--r-- | include/linux/extcon/sm5502.h | 287 | |
| -rw-r--r-- | include/linux/fb.h | 2 | |
| -rw-r--r-- | include/linux/fence.h | 360 | |
| -rw-r--r-- | include/linux/filter.h | 112 | |
| -rw-r--r-- | include/linux/firmware.h | 15 | |
| -rw-r--r-- | |
