Merge 5.15-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Oct 2021 07:36:59 +0000 (09:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Oct 2021 07:36:59 +0000 (09:36 +0200)
commit4a8033ec560c9fedaaddaf9c8a3e4b6244d8d61a
tree1de0adb542ed7769ff6d80ca1999357b373cdffa
parent502408a61f4b7eb4713f44bd77f4a48e6cb1b59a
parent519d81956ee277b4419c723adfb154603c2565ba
Merge 5.15-rc6 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/hal/hal_intf.c
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c