Merge branch 'kvm-ppc-fixes' into kvm-ppc-next

Browse source

This merges in a couple of fixes from the kvm-ppc-fixes branch that
modify the same areas of code as some commits from the kvm-ppc-next
branch, in order to resolve the conflicts.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

...

This commit is contained in:

Paul Mackerras 2017-11-09 14:30:24 +11:00

parent c01015091a 38c53af853

commit 072df8130c

5 changed files with 63 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

arch/powerpc/kvm/book3s_64_mmu_hv.c

View file

23

arch/powerpc/kvm/book3s_64_vio.c

View file

49

arch/powerpc/kvm/book3s_hv.c

View file

13

arch/powerpc/kvm/book3s_hv_rmhandlers.S

View file

2

arch/powerpc/kvm/powerpc.c

View file