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

Browse source

Work that needs to land in drm-intel-gt-next depends on two patches only
present in drm-intel-next, absence of which is causing a merge conflict:

  3b918f4f0c ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS")
  ac765b7018 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

...

This commit is contained in:

Tvrtko Ursulin 2023-10-24 09:50:22 +01:00

parent 7eeaedf799 11ae5eb516

commit a1c613ae4c

15668 changed files with 856708 additions and 325923 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

.gitignore vendored

View file

106

.mailmap

View file

11

CREDITS

View file

2

Documentation/ABI/stable/sysfs-block

View file

4

Documentation/ABI/stable/sysfs-bus-mhi

View file

2

Documentation/ABI/stable/sysfs-class-infiniband

View file

2

Documentation/ABI/stable/sysfs-driver-dma-idxd

View file

53

Documentation/ABI/stable/sysfs-driver-mlxreg-io

View file

2

Documentation/ABI/stable/sysfs-platform-wmi-bmof

View file

54

Documentation/ABI/testing/configfs-usb-gadget-midi2

View file

84

Documentation/ABI/testing/debugfs-driver-habanalabs

View file

61

Documentation/ABI/testing/debugfs-driver-qat

View file

31

Documentation/ABI/testing/debugfs-tpmi

View file

6

Documentation/ABI/testing/ima_policy

View file

2

Documentation/ABI/testing/procfs-diskstats

View file

2

Documentation/ABI/testing/sysfs-bus-coreboot

View file

8

Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x

View file

2

Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x

View file

8

Documentation/ABI/testing/sysfs-bus-counter

View file

15

Documentation/ABI/testing/sysfs-bus-cxl

View file

4

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

View file

160

Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_gpci

View file

6

Documentation/ABI/testing/sysfs-bus-fsi-devices-sbefifo

View file

2

Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480

View file

16

Documentation/ABI/testing/sysfs-bus-iio

View file

2

Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818

View file

2

Documentation/ABI/testing/sysfs-bus-nfit

View file

4

Documentation/ABI/testing/sysfs-bus-nvdimm

View file

2

Documentation/ABI/testing/sysfs-bus-papr-pmem

View file

38

Documentation/ABI/testing/sysfs-bus-thunderbolt

View file

28

Documentation/ABI/testing/sysfs-bus-umc

View file

34

Documentation/ABI/testing/sysfs-bus-usb

View file

2

Documentation/ABI/testing/sysfs-class

View file

4

Documentation/ABI/testing/sysfs-class-cxl

View file

14

Documentation/ABI/testing/sysfs-class-firmware

View file

101

Documentation/ABI/testing/sysfs-class-firmware-attributes

View file

9

Documentation/ABI/testing/sysfs-class-led

View file

20

Documentation/ABI/testing/sysfs-class-led-trigger-netdev

View file

2

Documentation/ABI/testing/sysfs-class-mtd

View file

2

Documentation/ABI/testing/sysfs-class-net

View file

2

Documentation/ABI/testing/sysfs-class-net-queues

View file

2

Documentation/ABI/testing/sysfs-class-power-wilco

View file

2

Documentation/ABI/testing/sysfs-class-remoteproc

View file

2

Documentation/ABI/testing/sysfs-class-thermal

View file

156

Documentation/ABI/testing/sysfs-class-uwb_rc

View file

57

Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc

View file

8

Documentation/ABI/testing/sysfs-devices-memory

View file

2

Documentation/ABI/testing/sysfs-devices-online

View file

81

Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs

View file

24

Documentation/ABI/testing/sysfs-devices-system-cpu

View file

18

Documentation/ABI/testing/sysfs-driver-ccp

View file

17

Documentation/ABI/testing/sysfs-driver-chromeos-acpi

View file

2

Documentation/ABI/testing/sysfs-driver-ge-achc

View file

64

Documentation/ABI/testing/sysfs-driver-habanalabs

View file

2

Documentation/ABI/testing/sysfs-driver-tegra-fuse

View file

247

Documentation/ABI/testing/sysfs-driver-ufs

View file

2

Documentation/ABI/testing/sysfs-firmware-acpi

View file

4

Documentation/ABI/testing/sysfs-firmware-sgi_uv

View file

14

Documentation/ABI/testing/sysfs-fs-f2fs

View file

42

Documentation/ABI/testing/sysfs-kernel-mm-damon

View file

4

Documentation/ABI/testing/sysfs-memory-page-offline

View file

11

Documentation/ABI/testing/sysfs-module

View file

88

Documentation/ABI/testing/sysfs-platform-asus-wmi

View file

2

Documentation/ABI/testing/sysfs-platform-dell-laptop

View file

2

Documentation/ABI/testing/sysfs-platform-dfl-fme

View file

2

Documentation/ABI/testing/sysfs-platform-hidma

View file

20

Documentation/ABI/testing/sysfs-platform-hidma-mgmt

View file

2

Documentation/ABI/testing/sysfs-platform-kim

View file

66

Documentation/ABI/testing/sysfs-platform-mellanox-bootctl

View file

12

Documentation/ABI/testing/sysfs-platform-power-on-reason

View file

2

Documentation/ABI/testing/sysfs-platform-sst-atom

View file

101

Documentation/ABI/testing/sysfs-wusb_cbaf

View file

16

Documentation/Makefile

View file

12

Documentation/PCI/pci-error-recovery.rst

View file

14

Documentation/PCI/pciebus-howto.rst

View file

2

Documentation/RCU/lockdep-splat.rst

View file

38

Documentation/RCU/rculist_nulls.rst

View file

10

Documentation/accel/qaic/qaic.rst

View file

2

Documentation/accounting/psi.rst

View file

2

Documentation/admin-guide/cgroup-v1/memcg_test.rst

View file

15

Documentation/admin-guide/cgroup-v1/memory.rst

View file

2

Documentation/admin-guide/cgroup-v2.rst

View file

16

Documentation/admin-guide/devices.txt

View file

5

Documentation/admin-guide/dynamic-debug-howto.rst

View file

109

Documentation/admin-guide/hw-vuln/gather_data_sampling.rst

View file

14

Documentation/admin-guide/hw-vuln/index.rst

View file

11

Documentation/admin-guide/hw-vuln/spectre.rst

View file

150

Documentation/admin-guide/hw-vuln/srso.rst

View file

20

Documentation/admin-guide/kdump/vmcoreinfo.rst

View file

25

Documentation/admin-guide/kernel-parameters.rst

View file

250

Documentation/admin-guide/kernel-parameters.txt

View file

6

Documentation/admin-guide/media/qcom_camss.rst

View file

80

Documentation/admin-guide/mm/damon/usage.rst

View file

27

Documentation/admin-guide/mm/ksm.rst

View file

22

Documentation/admin-guide/mm/memory-hotplug.rst

View file

2

Documentation/admin-guide/mm/numa_memory_policy.rst

View file

15

Documentation/admin-guide/mm/userfaultfd.rst

View file

14

Documentation/admin-guide/mm/zswap.rst

View file

2

Documentation/admin-guide/module-signing.rst

View file

5

Documentation/admin-guide/perf/alibaba_pmu.rst

View file

Some files were not shown because too many files have changed in this diff Show more