Merge drm/drm-next into drm-intel-gt-next

Backmerging to pull in the new dma_resv iterators requested by Maarten and Matt. Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
2026-10-14 05:55:17 +00:00 · 2021-10-22 13:10:02 +03:00 · 2021-10-22 13:10:02 +03:00 · ef3e619221
commit ef3e619221
parent 777226dac0 6f2f7c8330
950 changed files with 71865 additions and 22189 deletions
--- a/Documentation/admin-guide/README.rst
+++ b/Documentation/admin-guide/README.rst
--- a/Documentation/devicetree/bindings/arm/tegra.yaml
+++ b/Documentation/devicetree/bindings/arm/tegra.yaml
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
--- a/Documentation/devicetree/bindings/display/panel/boe,tv101wum-nl6.yaml
+++ b/Documentation/devicetree/bindings/display/panel/boe,tv101wum-nl6.yaml
--- a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
+++ b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml
--- a/Documentation/devicetree/bindings/display/panel/panel-edp.yaml
+++ b/Documentation/devicetree/bindings/display/panel/panel-edp.yaml
--- a/Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
+++ b/Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
--- a/Documentation/devicetree/bindings/display/renesas,du.yaml
+++ b/Documentation/devicetree/bindings/display/renesas,du.yaml
--- a/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
+++ b/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
--- a/Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml
+++ b/Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml
--- a/Documentation/driver-api/dma-buf.rst
+++ b/Documentation/driver-api/dma-buf.rst
--- a/Documentation/gpu/amdgpu.rst
+++ b/Documentation/gpu/amdgpu.rst
--- a/Documentation/gpu/drm-kms-helpers.rst
+++ b/Documentation/gpu/drm-kms-helpers.rst
--- a/Documentation/gpu/drm-mm.rst
+++ b/Documentation/gpu/drm-mm.rst
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
--- a/Documentation/gpu/todo.rst
+++ b/Documentation/gpu/todo.rst
--- a/Documentation/locking/ww-mutex-design.rst
+++ b/Documentation/locking/ww-mutex-design.rst
--- a/Documentation/networking/dsa/sja1105.rst
+++ b/Documentation/networking/dsa/sja1105.rst
--- a/Documentation/process/changes.rst
+++ b/Documentation/process/changes.rst
--- a/Documentation/translations/zh_CN/admin-guide/README.rst
+++ b/Documentation/translations/zh_CN/admin-guide/README.rst
--- a/Documentation/translations/zh_TW/admin-guide/README.rst
+++ b/Documentation/translations/zh_TW/admin-guide/README.rst
--- a/21
+++ b/21
--- a/8
+++ b/8
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/include/asm/asm-prototypes.h
+++ b/arch/alpha/include/asm/asm-prototypes.h
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
--- a/arch/alpha/include/asm/jensen.h
+++ b/arch/alpha/include/asm/jensen.h
--- a/arch/alpha/include/asm/setup.h
+++ b/arch/alpha/include/asm/setup.h
--- a/arch/alpha/include/uapi/asm/setup.h
+++ b/arch/alpha/include/uapi/asm/setup.h
--- a/arch/alpha/kernel/sys_jensen.c
+++ b/arch/alpha/kernel/sys_jensen.c
--- a/arch/alpha/lib/Makefile
+++ b/arch/alpha/lib/Makefile
--- a/arch/alpha/lib/udiv-qrnnd.S
+++ b/arch/alpha/lib/udiv-qrnnd.S
--- a/arch/alpha/math-emu/Makefile
+++ b/arch/alpha/math-emu/Makefile
--- a/arch/alpha/math-emu/math.c
+++ b/arch/alpha/math-emu/math.c
--- a/arch/arm/configs/at91_dt_defconfig
+++ b/arch/arm/configs/at91_dt_defconfig
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
--- a/arch/arm/configs/lpc32xx_defconfig
+++ b/arch/arm/configs/lpc32xx_defconfig
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
--- a/arch/arm/configs/vexpress_defconfig
+++ b/arch/arm/configs/vexpress_defconfig
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
--- a/arch/m68k/include/asm/raw_io.h
+++ b/arch/m68k/include/asm/raw_io.h
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
--- a/arch/parisc/include/asm/page.h
+++ b/arch/parisc/include/asm/page.h
--- a/arch/parisc/lib/iomap.c
+++ b/arch/parisc/lib/iomap.c
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
--- a/arch/powerpc/include/asm/asm-const.h
+++ b/arch/powerpc/include/asm/asm-const.h
--- a/arch/powerpc/kernel/interrupt.c
+++ b/arch/powerpc/kernel/interrupt.c
--- a/arch/powerpc/kernel/interrupt_64.S
+++ b/arch/powerpc/kernel/interrupt_64.S
--- a/arch/powerpc/kernel/mce.c
+++ b/arch/powerpc/kernel/mce.c
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
--- a/arch/s390/configs/debug_defconfig
+++ b/arch/s390/configs/debug_defconfig
--- a/arch/s390/configs/defconfig
+++ b/arch/s390/configs/defconfig
--- a/arch/s390/pci/pci_mmio.c
+++ b/arch/s390/pci/pci_mmio.c
--- a/arch/sh/boot/Makefile
+++ b/arch/sh/boot/Makefile
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/Makefile_32.cpu
+++ b/arch/x86/Makefile_32.cpu
--- a/arch/x86/hyperv/hv_apic.c
+++ b/arch/x86/hyperv/hv_apic.c
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
--- a/arch/x86/kernel/cpu/mce/amd.c
+++ b/arch/x86/kernel/cpu/mce/amd.c
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
--- a/arch/x86/mm/pat/memtype.c
+++ b/arch/x86/mm/pat/memtype.c
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
--- a/arch/x86/xen/mmu_pv.c
+++ b/arch/x86/xen/mmu_pv.c
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
--- a/drivers/base/arch_numa.c
+++ b/drivers/base/arch_numa.c
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
--- a/drivers/cpufreq/cpufreq_governor_attr_set.c
+++ b/drivers/cpufreq/cpufreq_governor_attr_set.c
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
--- a/drivers/cpufreq/vexpress-spc-cpufreq.c
+++ b/drivers/cpufreq/vexpress-spc-cpufreq.c
--- a/drivers/dma-buf/Makefile
+++ b/drivers/dma-buf/Makefile
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
--- a/drivers/dma-buf/dma-fence.c
+++ b/drivers/dma-buf/dma-fence.c
--- a/Show more
+++ b/Show more