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

Browse source

We need
4ba4f1afb6 ("perf: Generic hotplug support for a PMU with a scope")
in order to land a i915 PMU simplification and a fix. That landed in 6.12
and we are stuck at 6.9 so lets bump things forward.

Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>

...

This commit is contained in:

Tvrtko Ursulin 2025-02-05 09:29:14 +00:00

parent 4a82ceb04a 2014c95afe

commit c771600c6a

37537 changed files with 2955129 additions and 1271132 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

41

.clang-format

View file

11

.clippy.toml

View file

3

.editorconfig

View file

1

.get_maintainer.ignore

View file

13

.gitignore vendored

View file

104

.mailmap

View file

114

CREDITS

View file

3

Documentation/ABI/testing/sysfs-class-cxl → Documentation/ABI/obsolete/sysfs-class-cxl

View file

12

Documentation/ABI/obsolete/sysfs-selinux-user

View file

12

Documentation/ABI/removed/sysfs-firmware-efi-vars

View file

85

Documentation/ABI/stable/sysfs-block

View file

13

Documentation/ABI/stable/sysfs-bus-mhi

View file

30

Documentation/ABI/stable/sysfs-bus-nvmem

View file

7

Documentation/ABI/stable/sysfs-class-backlight

View file

9

Documentation/ABI/stable/sysfs-class-bluetooth

View file

25

Documentation/ABI/stable/sysfs-driver-misc-cp500

View file

79

Documentation/ABI/stable/sysfs-firmware-efi-vars

View file

8

Documentation/ABI/stable/vdso

View file

63

Documentation/ABI/testing/configfs-tsm

View file

7

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

View file

8

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

View file

11

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

View file

64

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

View file

7

Documentation/ABI/testing/debugfs-cxl

View file

12

Documentation/ABI/testing/debugfs-driver-habanalabs

View file

7

Documentation/ABI/testing/debugfs-hisi-hpre

View file

25

Documentation/ABI/testing/debugfs-hisi-migration

View file

7

Documentation/ABI/testing/debugfs-hisi-sec

View file

7

Documentation/ABI/testing/debugfs-hisi-zip

View file

39

Documentation/ABI/testing/debugfs-iio-ad9467

View file

20

Documentation/ABI/testing/debugfs-iio-backend

View file

14

Documentation/ABI/testing/debugfs-msi-wmi-platform

View file

9

Documentation/ABI/testing/debugfs-tpmi

View file

7

Documentation/ABI/testing/sysfs-block-zram

View file

9

Documentation/ABI/testing/sysfs-bus-auxiliary

View file

15

Documentation/ABI/testing/sysfs-bus-coresight-devices-dummy-source

View file

2

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

View file

2

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

View file

2

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

View file

24

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

View file

8

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

View file

113

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

View file

25

Documentation/ABI/testing/sysfs-bus-event_source-devices-vpa-pmu

View file

113

Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

View file

190

Documentation/ABI/testing/sysfs-bus-iio

View file

19

Documentation/ABI/testing/sysfs-bus-iio-ad9739a

View file

23

Documentation/ABI/testing/sysfs-bus-iio-adc-ad-sigma-delta

View file

46

Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130

View file

24

Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192

View file

17

Documentation/ABI/testing/sysfs-bus-iio-adc-max9611

View file

14

Documentation/ABI/testing/sysfs-bus-iio-chemical-sgp40

View file

61

Documentation/ABI/testing/sysfs-bus-iio-dac

View file

31

Documentation/ABI/testing/sysfs-bus-iio-dac-ltc2688

View file

2

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

View file

9

Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc

View file

18

Documentation/ABI/testing/sysfs-bus-iio-inv_icm42600

View file

83

Documentation/ABI/testing/sysfs-bus-pci

View file

10

Documentation/ABI/testing/sysfs-bus-pci-drivers-xhci_hcd

View file

12

Documentation/ABI/testing/sysfs-bus-platform-drivers-amd_x3d_vcache

View file

9

Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-dev

View file

8

Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub

View file

81

Documentation/ABI/testing/sysfs-bus-wmi

View file

3

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

View file

10

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

View file

48

Documentation/ABI/testing/sysfs-class-platform-profile

View file

76

Documentation/ABI/testing/sysfs-class-power

View file

32

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

View file

15

Documentation/ABI/testing/sysfs-class-tee

View file

27

Documentation/ABI/testing/sysfs-class-typec

View file

2

Documentation/ABI/testing/sysfs-class-watchdog

View file

113

Documentation/ABI/testing/sysfs-devices-hisi_ptt

View file

6

Documentation/ABI/testing/sysfs-devices-memory

View file

45

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

View file

41

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

View file

38

Documentation/ABI/testing/sysfs-driver-hid-corsair-void

View file

8

Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon

View file

10

Documentation/ABI/testing/sysfs-driver-panthor-profiling

View file

4

Documentation/ABI/testing/sysfs-driver-qat

View file

20

Documentation/ABI/testing/sysfs-driver-spi-intel

View file

41

Documentation/ABI/testing/sysfs-driver-ufs

View file

4

Documentation/ABI/testing/sysfs-firmware-opal-powercap

View file

4

Documentation/ABI/testing/sysfs-firmware-opal-psr

View file

4

Documentation/ABI/testing/sysfs-firmware-opal-sensor-groups

View file

10

Documentation/ABI/testing/sysfs-firmware-papr-energy-scale-info

View file

11

Documentation/ABI/testing/sysfs-fs-erofs

View file

71

Documentation/ABI/testing/sysfs-fs-f2fs

View file

26

Documentation/ABI/testing/sysfs-fs-xfs

View file

18

Documentation/ABI/testing/sysfs-kernel-fadump

View file

17

Documentation/ABI/testing/sysfs-kernel-livepatch

View file

38

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

View file

18

Documentation/ABI/testing/sysfs-kernel-mm-transparent-hugepage

View file

26

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

View file

64

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

View file

5

Documentation/ABI/testing/sysfs-platform_profile

View file

43

Documentation/ABI/testing/sysfs-pps-gen

View file

33

Documentation/ABI/testing/sysfs-timecard

View file

17

Documentation/Makefile

View file

1

Documentation/PCI/endpoint/index.rst

View file

33

Documentation/PCI/endpoint/pci-endpoint.rst

View file

13

Documentation/PCI/endpoint/pci-nvme-function.rst

View file

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