Merge branch 'ps3-queue-v5.12'

Signed-off-by: Geoff Levand <geoff@infradead.org>