Skip to content
Snippets Groups Projects
Commit a13fee31 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge v6.7-rc3 into drm-next


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

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

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 221d6546 2cc14f52
No related branches found
No related tags found
Loading
Showing
with 91 additions and 50 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment