]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1505f564f616c8cb9c7cc9659f26f4994c49f1de
tree7f10a8c28df8136841cae359ded4c321cb1a81ad
parent8dbbea31e5937d36c08e564db933bf174d32ff92
parentd6f7360a40a11d3e9b29a56f15a0eee49aa7b623
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