]> 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)
commit90f8e2750dc330fb1a3aa230548c67834bb1f21b
tree7f10a8c28df8136841cae359ded4c321cb1a81ad
parent35c667049a1a1c0b194ed20f375bd1f08eb18e2f
parent5bc9220a7da8cf056fa41e8efb7cccc5201f174d
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