Merge 5.17-rc4 into staging-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Feb 2022 08:02:51 +0000 (09:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Feb 2022 08:02:51 +0000 (09:02 +0100)
commit1e7f32f776089af32b6ec9b801fe976778c8448b
treef836aacfcae8443c6ca55855e2107714e6a75e65
parentf2c461536226eb0852a241e72b9125685d6741b4
parent754e0b0e35608ed5206d6a67a791563c631cec07
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>
drivers/staging/fbtft/fbtft.h
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c