]> git.itanic.dy.fi Git - linux-stable/commit
Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 01:58:06 +0000 (11:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 01:58:06 +0000 (11:58 +1000)
commit858ae575bb5c9c7b23bc5ce85284bc737df57e01
tree523c9b95aa9bd56acc8ac803f251032e8a3b4e86
parentcb40cfa077f4fa7a200a7ecf17c6ba685e7da511
parent869e54d4d54b1b0ee16c98c2149f5785eea08c02
Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel

# Conflicts:
# drivers/gpu/drm/xe/xe_device_types.h
# drivers/gpu/drm/xe/xe_vm.c
# drivers/gpu/drm/xe/xe_vm_types.h
drivers/gpu/drm/i915/i915_hwmon.c
drivers/gpu/drm/xe/Makefile
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
drivers/gpu/drm/xe/xe_device_types.h
drivers/gpu/drm/xe/xe_pci.c
drivers/gpu/drm/xe/xe_ttm_vram_mgr.c