Commit 40226d79 authored by Carlos Llamas's avatar Carlos Llamas Committed by Treehugger Robot
Browse files

Merge 260f6f4f ("Merge tag 'drm-next-2025-07-30' of...

Merge 260f6f4f ("Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel"

) into android-mainline

Steps on the way to v6.17-rc1

Resolve merge conflicts in:
	drivers/dma-buf/heaps/system_heap.c

Cc: John Stultz <jstultz@google.com>
Change-Id: I091bc3daf3fefae11287bc79c80351f882ae51be
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
parents 37a69c07 260f6f4f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment