]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bbc382 4e896e2)
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)
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.

1  2 
arch/powerpc/platforms/pseries/vas-sysfs.c patch | diff1 | diff2 | blob | history
arch/powerpc/platforms/pseries/vas.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/platforms/pseries/vas.c
Simple merge
Linux Kernel Source Tree.