Merge tag 'v4.18-rc6' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 6 Aug 2018 15:31:36 +0000 (17:31 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 6 Aug 2018 15:31:36 +0000 (17:31 +0200)
Pull bug fixes into the KVM development tree to avoid nasty conflicts.

1  2 
arch/powerpc/kvm/book3s_64_vio.c

Simple merge