From: Greg Kroah-Hartman Date: Mon, 23 Jan 2023 14:25:46 +0000 (+0100) Subject: Merge 6.2-rc5 into staging-next X-Git-Tag: v6.6.7~3436^2~109 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54573f3ef96bfa346c62b6ce7835c6691c844fe6;p=platform%2Fkernel%2Flinux-starfive.git Merge 6.2-rc5 into staging-next We need the staging fixes in here, and it resolves a merge conflict in: drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h Signed-off-by: Greg Kroah-Hartman --- 54573f3ef96bfa346c62b6ce7835c6691c844fe6