projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
02ef6dd
76b03dc
)
Merge branch 'topic/ppc-kvm' into next
author
Michael Ellerman
<mpe@ellerman.id.au>
Sun, 21 Jan 2018 11:43:43 +0000
(22:43 +1100)
committer
Michael Ellerman
<mpe@ellerman.id.au>
Sun, 21 Jan 2018 11:43:43 +0000
(22:43 +1100)
Merge the topic branch we share with kvm-ppc, this brings in two xive
commits, one from Paul to rework HMI handling, and a minor cleanup to
drop an unused flag.
1
2
arch/powerpc/include/asm/reg.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kvm/book3s_hv_ras.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/kvm/book3s_hv_rmhandlers.S
patch
|
diff1
|
diff2
|
blob
|
history
arch/powerpc/sysdev/xive/common.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/powerpc/include/asm/reg.h
Simple merge
diff --cc
arch/powerpc/kvm/book3s_hv_ras.c
Simple merge
diff --cc
arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge
diff --cc
arch/powerpc/sysdev/xive/common.c
Simple merge