Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 18 May 2022 14:11:51 +0000 (00:11 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 18 May 2022 14:11:51 +0000 (00:11 +1000)
commita5fc286f69fc9590c22995fe05dca461fd6295b1
tree358fb26ef57cef5ad7c88009c83c5dc977624b9b
parentb6b1c3ce06ca438eb24e0f45bf0e63ecad0369f5
parentee8348496c77e3737d0a6cda307a521f2cff954f
Merge branch 'fixes' into next

Merge our fixes branch from this cycle. In particular this brings in a
papr_scm.c change which a subsequent patch has a dependency on.
arch/powerpc/platforms/pseries/vas-sysfs.c
arch/powerpc/platforms/pseries/vas.c