From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat•com>,
Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the vhost tree with the virtio tree
Date: Mon, 20 Apr 2015 14:54:18 +1000 [thread overview]
Message-ID: <20150420145418.730f0520@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
drivers/virtio/virtio_balloon.c between commit df81b29c7b81
("virtio_balloon: transitional interface") from the virtio tree and
commit 263f23c089f2 ("virtio_balloon: transitional interface") from the
vhost tree.
I fixed it up (by using the version of the files from the virtio tree)
and can carry the fix as necessary. Please clean up this mess ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-04-20 4:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-20 4:54 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-03-06 3:36 linux-next: manual merge of the vhost tree with the virtio tree Stephen Rothwell
2013-02-20 5:00 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=20150420145418.730f0520@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=rusty@rustcorp$(echo .)com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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