projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fcd4f3c
8cf4ecc
)
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
author
Paul Mackerras
<paulus@ozlabs.org>
Tue, 31 Jan 2017 08:21:26 +0000
(19:21 +1100)
committer
Paul Mackerras
<paulus@ozlabs.org>
Tue, 31 Jan 2017 08:21:26 +0000
(19:21 +1100)
This merges in the POWER9 radix MMU host and guest support, which
was put into a topic branch because it touches both powerpc and
KVM code.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
1
2
arch/powerpc/include/uapi/asm/kvm.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kvm/book3s_hv.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kvm/book3s_hv_rm_xics.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/include/uapi/asm/kvm.h
Simple merge
diff --cc
arch/powerpc/kvm/book3s_hv.c
Simple merge
diff --cc
arch/powerpc/kvm/book3s_hv_rm_xics.c
Simple merge