Merge 6.10-rc6 into staging-next

We need the staging driver fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
Simple merge

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
Simple merge

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
Simple merge