Merge drm/drm-next into drm-intel-next-queued

This is needed to get the fourcc code merged without conflicts. Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2026-10-16 22:39:48 +00:00 · 2019-03-27 18:23:53 +02:00 · 2019-03-27 18:23:53 +02:00 · 0e2f54f88b
commit 0e2f54f88b
parent 96fd2c6633 0bec6219e5
10468 changed files with 501471 additions and 249103 deletions
--- a/include/acpi/acbuffer.h
+++ b/include/acpi/acbuffer.h
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
--- a/include/acpi/acpi.h
+++ b/include/acpi/acpi.h
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
--- a/include/acpi/actbl3.h
+++ b/include/acpi/actbl3.h
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
--- a/include/acpi/acuuid.h
+++ b/include/acpi/acuuid.h
--- a/include/acpi/cppc_acpi.h
+++ b/include/acpi/cppc_acpi.h
--- a/include/acpi/ghes.h
+++ b/include/acpi/ghes.h
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
--- a/include/acpi/platform/acenvex.h
+++ b/include/acpi/platform/acenvex.h
--- a/include/acpi/platform/acgcc.h
+++ b/include/acpi/platform/acgcc.h
--- a/include/acpi/platform/acgccex.h
+++ b/include/acpi/platform/acgccex.h
--- a/include/acpi/platform/acintel.h
+++ b/include/acpi/platform/acintel.h
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
--- a/include/acpi/platform/aclinuxex.h
+++ b/include/acpi/platform/aclinuxex.h
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
--- a/include/asm-generic/atomic-instrumented.h
+++ b/include/asm-generic/atomic-instrumented.h
--- a/include/asm-generic/atomic-long.h
+++ b/include/asm-generic/atomic-long.h
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
--- a/include/asm-generic/iomap.h
+++ b/include/asm-generic/iomap.h
--- a/include/asm-generic/page.h
+++ b/include/asm-generic/page.h
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
--- a/include/asm-generic/uaccess.h
+++ b/include/asm-generic/uaccess.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
--- a/include/crypto/arc4.h
+++ b/include/crypto/arc4.h
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
--- a/include/crypto/internal/cryptouser.h
+++ b/include/crypto/internal/cryptouser.h
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
--- a/include/crypto/internal/skcipher.h
+++ b/include/crypto/internal/skcipher.h
--- a/include/crypto/morus1280_glue.h
+++ b/include/crypto/morus1280_glue.h
--- a/include/crypto/morus640_glue.h
+++ b/include/crypto/morus640_glue.h
--- a/include/crypto/morus_common.h
+++ b/include/crypto/morus_common.h
--- a/include/crypto/streebog.h
+++ b/include/crypto/streebog.h
--- a/include/crypto/xts.h
+++ b/include/crypto/xts.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_bridge.h
+++ b/include/drm/drm_bridge.h
--- a/include/drm/drm_cache.h
+++ b/include/drm/drm_cache.h
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
--- a/include/drm/drm_dsc.h
+++ b/include/drm/drm_dsc.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
--- a/include/drm/drm_gem_shmem_helper.h
+++ b/include/drm/drm_gem_shmem_helper.h
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
--- a/include/drm/drm_utils.h
+++ b/include/drm/drm_utils.h
--- a/include/drm/drm_writeback.h
+++ b/include/drm/drm_writeback.h
--- a/include/drm/tinydrm/mipi-dbi.h
+++ b/include/drm/tinydrm/mipi-dbi.h
--- a/include/drm/tinydrm/tinydrm-helpers.h
+++ b/include/drm/tinydrm/tinydrm-helpers.h
--- a/include/drm/tinydrm/tinydrm.h
+++ b/include/drm/tinydrm/tinydrm.h
--- a/include/dt-bindings/clk/lochnagar.h
+++ b/include/dt-bindings/clk/lochnagar.h
--- a/include/dt-bindings/clock/actions,s500-cmu.h
+++ b/include/dt-bindings/clock/actions,s500-cmu.h
--- a/include/dt-bindings/clock/ath79-clk.h
+++ b/include/dt-bindings/clock/ath79-clk.h
--- a/include/dt-bindings/clock/axg-aoclkc.h
+++ b/include/dt-bindings/clock/axg-aoclkc.h
--- a/include/dt-bindings/clock/exynos5433.h
+++ b/include/dt-bindings/clock/exynos5433.h
--- a/include/dt-bindings/clock/g12a-aoclkc.h
+++ b/include/dt-bindings/clock/g12a-aoclkc.h
--- a/include/dt-bindings/clock/g12a-clkc.h
+++ b/include/dt-bindings/clock/g12a-clkc.h
--- a/include/dt-bindings/clock/gxbb-aoclkc.h
+++ b/include/dt-bindings/clock/gxbb-aoclkc.h
--- a/include/dt-bindings/clock/imx5-clock.h
+++ b/include/dt-bindings/clock/imx5-clock.h
--- a/include/dt-bindings/clock/imx8mm-clock.h
+++ b/include/dt-bindings/clock/imx8mm-clock.h
--- a/include/dt-bindings/clock/imx8mq-clock.h
+++ b/include/dt-bindings/clock/imx8mq-clock.h
--- a/include/dt-bindings/clock/marvell,mmp2.h
+++ b/include/dt-bindings/clock/marvell,mmp2.h
--- a/include/dt-bindings/clock/meson8b-clkc.h
+++ b/include/dt-bindings/clock/meson8b-clkc.h
--- a/include/dt-bindings/clock/mt2712-clk.h
+++ b/include/dt-bindings/clock/mt2712-clk.h
--- a/include/dt-bindings/clock/mt8173-clk.h
+++ b/include/dt-bindings/clock/mt8173-clk.h
--- a/include/dt-bindings/clock/qcom,rpmcc.h
+++ b/include/dt-bindings/clock/qcom,rpmcc.h
--- a/include/dt-bindings/clock/qcom,rpmh.h
+++ b/include/dt-bindings/clock/qcom,rpmh.h
--- a/include/dt-bindings/clock/r8a774a1-cpg-mssr.h
+++ b/include/dt-bindings/clock/r8a774a1-cpg-mssr.h
--- a/include/dt-bindings/clock/r8a774c0-cpg-mssr.h
+++ b/include/dt-bindings/clock/r8a774c0-cpg-mssr.h
--- a/include/dt-bindings/clock/r8a7778-clock.h
+++ b/include/dt-bindings/clock/r8a7778-clock.h
--- a/include/dt-bindings/clock/stm32mp1-clks.h
+++ b/include/dt-bindings/clock/stm32mp1-clks.h
--- a/include/dt-bindings/gpio/gpio.h
+++ b/include/dt-bindings/gpio/gpio.h
--- a/include/dt-bindings/iio/adc/ingenic,adc.h
+++ b/include/dt-bindings/iio/adc/ingenic,adc.h
--- a/include/dt-bindings/interconnect/qcom,sdm845.h
+++ b/include/dt-bindings/interconnect/qcom,sdm845.h
--- a/include/dt-bindings/mfd/st,stpmic1.h
+++ b/include/dt-bindings/mfd/st,stpmic1.h
--- a/include/dt-bindings/pinctrl/at91.h
+++ b/include/dt-bindings/pinctrl/at91.h
--- a/include/dt-bindings/pinctrl/lochnagar.h
+++ b/include/dt-bindings/pinctrl/lochnagar.h
--- a/include/dt-bindings/power/mt8173-power.h
+++ b/include/dt-bindings/power/mt8173-power.h
--- a/include/dt-bindings/power/qcom-rpmpd.h
+++ b/include/dt-bindings/power/qcom-rpmpd.h
--- a/include/dt-bindings/power/xlnx-zynqmp-power.h
+++ b/include/dt-bindings/power/xlnx-zynqmp-power.h
--- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
+++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
--- a/include/dt-bindings/reset/g12a-aoclkc.h
+++ b/include/dt-bindings/reset/g12a-aoclkc.h
--- a/include/dt-bindings/reset/imx8mq-reset.h
+++ b/include/dt-bindings/reset/imx8mq-reset.h
--- a/include/dt-bindings/reset/xlnx-zynqmp-resets.h
+++ b/include/dt-bindings/reset/xlnx-zynqmp-resets.h
--- a/include/dt-bindings/soc/bcm2835-pm.h
+++ b/include/dt-bindings/soc/bcm2835-pm.h
--- a/include/keys/system_keyring.h
+++ b/include/keys/system_keyring.h
--- a/Show more
+++ b/Show more