OSDN Git Service

Merge branch 'topic/objtool' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 8 Dec 2022 12:57:47 +0000 (23:57 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 8 Dec 2022 12:57:47 +0000 (23:57 +1100)
Merge the powerpc objtool support, which we were keeping in a topic
branch in case of any merge conflicts.

1  2 
arch/powerpc/Kconfig
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/head_40x.S
arch/powerpc/kernel/head_64.S
arch/powerpc/kernel/head_85xx.S
arch/powerpc/kernel/head_8xx.S
arch/powerpc/kernel/head_book3s_32.S
arch/powerpc/kernel/misc_64.S
arch/powerpc/kvm/book3s_hv_rmhandlers.S
drivers/crypto/vmx/Makefile

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge