Skip to content
Snippets Groups Projects
Commit 223beeae authored by Alex Deucher's avatar Alex Deucher
Browse files

Merge branch 'amd-drm-next-5.18' into drm-next 


Main conflict here is that reset semaphore moved.

s/adev->reset_sem/adev->reset_domain->sem/g

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parents 6c64ae22 111aeed2
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 452 additions and 464 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment