linux-next: manual merge of the vhost tree with the kvm tree

[Stephen Rothwell]

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in
include/linux/kvm_host.h between commit 060f0ce6ff97 ("KVM: Introduce
KVM_VIRTIO_CCW_NOTIFY_BUS") from the kvm tree and commit 4697e2cddfe6
("kvm: add PV MMIO EVENTFD") from the vhost tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/kvm_host.h
index 0f4941a,35b74cd..0000000
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@@ -149,7 -149,7 +149,8 @@@ struct kvm_io_bus 
  enum kvm_bus {
  	KVM_MMIO_BUS,
  	KVM_PIO_BUS,
 +	KVM_VIRTIO_CCW_NOTIFY_BUS,
+ 	KVM_PV_MMIO_BUS,
  	KVM_NR_BUSES
  };

Attachment: pgp00000.pgp
Description: PGP signature