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
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
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
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
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
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
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
7 matches
Mail list logo