OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
64fdcbc
a39818a
)
Merge branch 'topic/objtool' into next
author
Michael Ellerman
<mpe@ellerman.id.au>
Thu, 8 Dec 2022 12:57:47 +0000
(23:57 +1100)
committer
Michael 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
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/entry_32.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/exceptions-64s.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/head_40x.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/head_64.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/head_85xx.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/head_8xx.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/head_book3s_32.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/misc_64.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kvm/book3s_hv_rmhandlers.S
patch
|
diff1
|
diff2
|
blob
|
history
drivers/crypto/vmx/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/Kconfig
Simple merge
diff --cc
arch/powerpc/kernel/entry_32.S
Simple merge
diff --cc
arch/powerpc/kernel/exceptions-64s.S
Simple merge
diff --cc
arch/powerpc/kernel/head_40x.S
Simple merge
diff --cc
arch/powerpc/kernel/head_64.S
Simple merge
diff --cc
arch/powerpc/kernel/head_85xx.S
Simple merge
diff --cc
arch/powerpc/kernel/head_8xx.S
Simple merge
diff --cc
arch/powerpc/kernel/head_book3s_32.S
Simple merge
diff --cc
arch/powerpc/kernel/misc_64.S
Simple merge
diff --cc
arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge
diff --cc
drivers/crypto/vmx/Makefile
Simple merge