]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge 6.10-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jul 2024 12:19:36 +0000 (14:19 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jul 2024 12:19:36 +0000 (14:19 +0200)
commitd67f063101f551dde4fb67f17cafcd98064238ee
tree1f07ad86cf61c335276a3fcef7b5ae3f5899e375
parentd11cbdee25953d528ccbeaab1a03733c4e07399e
parent22a40d14b572deb80c0648557f4bd502d7e83826
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>
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c