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:
bb5f33c
595d153
)
Merge branch 'fixes' into next
author
Michael Ellerman
<mpe@ellerman.id.au>
Tue, 26 May 2020 12:56:03 +0000
(22:56 +1000)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Tue, 26 May 2020 12:56:03 +0000
(22:56 +1000)
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.
1
2
arch/powerpc/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/include/asm/book3s/32/kup.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/exceptions-64s.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kernel/setup_64.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/platforms/Kconfig.cputype
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/Kconfig
Simple merge
diff --cc
arch/powerpc/include/asm/book3s/32/kup.h
Simple merge
diff --cc
arch/powerpc/kernel/exceptions-64s.S
Simple merge
diff --cc
arch/powerpc/kernel/setup_64.c
Simple merge
diff --cc
arch/powerpc/platforms/Kconfig.cputype
Simple merge