]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 221d654 2cc14f5)
Merge v6.7-rc3 into drm-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 28 Nov 2023 10:52:51 +0000 (11:52 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 28 Nov 2023 10:55:56 +0000 (11:55 +0100)
commita13fee31f56449fc600d9e064c7b32302f92dcef
tree9b543da3d21a29998eb39054ecb56167d7f276d5tree
parent221d6546bd16e08a4b18d67698e624459dab1795commit | diff
parent2cc14f52aeb78ce3f29677c2de1f06c0e91471abcommit | diff
Merge v6.7-rc3 into drm-next

Thomas Zimermann needs 8d6ef26501 ("drm/ast: Disconnect BMC if
physical connector is connected") for further ast work in -next.

Minor conflicts in ivpu between 3de6d9597892 ("accel/ivpu: Pass D0i3
residency time to the VPU firmware") and 3f7c0634926d
("accel/ivpu/37xx: Fix hangs related to MMIO reset") changing adjacent
lines.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
MAINTAINERS diff1 | diff2 | blob | history
drivers/accel/ivpu/ivpu_hw_37xx.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_driver.c diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror