[lkml]   [2015]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the vhost tree with the virtio tree
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 ...

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2015-04-20 07:21    [W:0.064 / U:0.928 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site