Merge branch 'kvm-mips-fixes' into HEAD

Browse source

Merge MIPS patches destined to both 4.7 and kvm/next, to avoid
unnecessary conflicts.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

...

This commit is contained in:

Paolo Bonzini 2016-06-14 11:00:16 +02:00

parent c1b8bfb08f 6df82a7b88

commit 0699fdb380

5 changed files with 27 additions and 8 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

3

arch/mips/include/asm/kvm_host.h

View file

19

arch/mips/kvm/emulate.c

View file

1

arch/mips/kvm/interrupt.h

View file

1

arch/mips/kvm/locore.S

View file

11

arch/mips/kvm/mips.c

View file