linux-next: manual merge of the vhost tree with Linus' tree

2019-01-02 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the vhost tree got a conflict in: drivers/virtio/virtio_ring.c between commit: 138fd2514863 ("virtio_ring: add _split suffix for split ring functions") and various other commits from Linus' tree and commit: 7f86a211fabe ("virtio: use

linux-next: manual merge of the vhost tree with Linus' tree

2015-07-23 Thread Stephen Rothwell
Hi Michael, Today's linux-next merge of the vhost tree got a conflict in: drivers/vhost/vhost.c between commit: 4de7255f7d2b ("vhost: extend memory regions allocation to vmalloc") from Linus' tree and commit: a4883f62470c ("vhost: extend memory regions allocation to vmalloc") from the

linux-next: manual merge of the vhost tree with Linus' tree

2015-07-23 Thread Stephen Rothwell
Hi Michael, Today's linux-next merge of the vhost tree got a conflict in: drivers/vhost/vhost.c between commit: 4de7255f7d2b (vhost: extend memory regions allocation to vmalloc) from Linus' tree and commit: a4883f62470c (vhost: extend memory regions allocation to vmalloc) from the

linux-next: manual merge of the vhost tree with Linus' tree

2015-07-07 Thread Stephen Rothwell
Hi Michael, Today's linux-next merge of the vhost tree got a conflict in: MAINTAINERS between commit: 4ad6ee91aa9f ("Add MAINTAINERS entry for virtio-gpu") from Linus' tree and commit: f2dbda3b4fc2 ("MAINTAINERS: separate section for s390 virtio drivers") from the vhost tree. I fixed

linux-next: manual merge of the vhost tree with Linus' tree

2015-07-07 Thread Stephen Rothwell
Hi Michael, Today's linux-next merge of the vhost tree got a conflict in: MAINTAINERS between commit: 4ad6ee91aa9f (Add MAINTAINERS entry for virtio-gpu) from Linus' tree and commit: f2dbda3b4fc2 (MAINTAINERS: separate section for s390 virtio drivers) from the vhost tree. I fixed it

linux-next: manual merge of the vhost tree with Linus' tree

2013-05-08 Thread Stephen Rothwell
Hi Michael, Today's linux-next merge of the vhost tree got a conflict in drivers/vhost/test.c between commit 73640c991e2f ("tools/virtio: fix build for 3.8") from Linus' tree and commit 30954cbc5818 ("vhost-test: fix up test module after API change") from the vhost tree. I fixed it up (the

linux-next: manual merge of the vhost tree with Linus' tree

2013-05-08 Thread Stephen Rothwell
Hi Michael, Today's linux-next merge of the vhost tree got a conflict in drivers/vhost/test.c between commit 73640c991e2f (tools/virtio: fix build for 3.8) from Linus' tree and commit 30954cbc5818 (vhost-test: fix up test module after API change) from the vhost tree. I fixed it up (the former