projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2636455 2241ab5)
Merge 6.2-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Jan 2023 14:25:46 +0000 (15:25 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Jan 2023 14:25:46 +0000 (15:25 +0100)
commit54573f3ef96bfa346c62b6ce7835c6691c844fe6
tree2e450b3059857249e659f5996abffbc2941dee19tree | snapshot
parent2636455b28cb477a1b74c570023ac505ff1a3890commit | diff
parent2241ab53cbb5cdb08a6b2d4688feb13971058f65commit | diff
Merge 6.2-rc5 into staging-next

We need the staging fixes in here, and it resolves a merge conflict in:
drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Domain: System / Kernel;