Merge 5.17-rc4 into staging-testing

We need the staging driver fixes in here as well.

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

diff --cc drivers/staging/fbtft/fbtft.h
Simple merge

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