OSDN Git Service

Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Tue, 26 May 2020 12:56:03 +0000 (22:56 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 26 May 2020 12:56:03 +0000 (22:56 +1000)
commitbaddc87d6824cda18037881352fe97382fdb0867
tree7f10a8c28df8136841cae359ded4c321cb1a81ad
parentbb5f33c069402035a3d6a2091ee68cac6999d774
parent595d153dd1022392083ac93a1550382cbee127e0
Merge branch 'fixes' into next

Merge our fixes branch from this cycle. It contains several important
fixes we need in next for testing purposes, and also some that will
conflict with upcoming changes.
arch/powerpc/Kconfig
arch/powerpc/include/asm/book3s/32/kup.h
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/setup_64.c
arch/powerpc/platforms/Kconfig.cputype