Commit d4e5cb0c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 0764df6b ("drm/rockchip: vop2: Check linear format for Cluster...


Merge 0764df6b ("drm/rockchip: vop2: Check linear format for Cluster windows on rk3566/8") into android14-6.1-lts

Steps on the way to 6.1.129

Resolves merge conflicts in:
	kernel/sched/fair.c

Change-Id: I875e1c0846dd439a019d0d5b81f09cdac4a5c74e
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b3026e7c 0764df6b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment