linux-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 u

linux-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 7f8998200dcb ("virtio_balloon: annotate possible sleep waiting for event") from the virtio tree and commit 2426d3b03d07 ("virtio-balloon: do not call blocking ops when !TASK_RUNN

linux-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/vhost/Makefile between commit 4d8dc8b44748 ("vringh: host-side implementation of virtio rings") from the virtio tree and commit 0b87bfefde9a ("vhost-blk: Add vhost-blk support v6") from the vhost tree. I fixed it up