From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Cornelia Huck <cornelia.huck@de.ibm.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Gleb Natapov <gleb@redhat.com>
Subject: linux-next: manual merge of the vhost tree with the kvm tree
Date: Fri, 5 Apr 2013 15:09:01 +1100 [thread overview]
Message-ID: <20130405150901.6dd07f52c3a0c6a70864708c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 749 bytes --]
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@canb.auug.org.au
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 #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-04-05 4:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 4:09 Stephen Rothwell [this message]
2013-04-05 4:12 linux-next: manual merge of the vhost tree with the kvm tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130405150901.6dd07f52c3a0c6a70864708c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cornelia.huck@de.ibm.com \
--cc=gleb@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).