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:
716cb11
c3c7470
)
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
author
Paul Mackerras
<paulus@ozlabs.org>
Fri, 22 Feb 2019 02:52:30 +0000
(13:52 +1100)
committer
Paul Mackerras
<paulus@ozlabs.org>
Fri, 22 Feb 2019 02:52:30 +0000
(13:52 +1100)
This merges in the "ppc-kvm" topic branch of the powerpc tree to get a
series of commits that touch both general arch/powerpc code and KVM
code. These commits will be merged both via the KVM tree and the
powerpc tree.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
1
2
arch/powerpc/include/asm/kvm_ppc.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kvm/book3s.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kvm/book3s_hv.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kvm/book3s_hv_rmhandlers.S
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/include/asm/kvm_ppc.h
Simple merge
diff --cc
arch/powerpc/kvm/book3s.c
Simple merge
diff --cc
arch/powerpc/kvm/book3s_hv.c
Simple merge
diff --cc
arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge