linux-next: manual merge of the vhost tree with Linus' tree
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 dependent_ptr_mb")
from the vhost tree.
I fixed it up (I think, basically I added the changes form the latter
to the _split and _packed versions of the function - see below) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index cd7e755484e3..982e1ed4ecdf 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -676,6 +676,7 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue
*_vq,
void *ret;
unsigned int i;
u16 last_used;
+ bool more;
START_USE(vq);
@@ -684,14 +685,15 @@ static void *virtqueue_get_buf_ctx_split(struct virtqueue
*_vq,
return NULL;
}
- if (!more_used_split(vq)) {
+ more = more_used_split(vq);
+ if (!more) {
pr_debug("No more buffers in queue\n");
END_USE(vq);
return NULL;
}
/* Only get used array entries after they have been exposed by host. */
- virtio_rmb(vq->weak_barriers);
+ vq = dependent_ptr_mb(vq, more);
last_used = (vq->last_used_idx & (vq->split.vring.num - 1));
i = virtio32_to_cpu(_vq->vdev,
@@ -1340,6 +1342,7 @@ static void *virtqueue_get_buf_ctx_packed(struct
virtqueue *_vq,
struct vring_virtqueue *vq = to_vvq(_vq);
u16 last_used, id;
void *ret;
+ bool more;
START_USE(vq);
@@ -1348,14 +1351,15 @@ static void *virtqueue_get_buf_ctx_packed(struct
virtqueue *_vq,
return NULL;
}
- if (!more_used_packed(vq)) {
+ more = more_used_packed(vq);
+ if (!more) {
pr_debug("No more buffers in queue\n");
END_USE(vq);
return NULL;
}
/* Only get used elements after they have been exposed by host. */
- virtio_rmb(vq->weak_barriers);
+ vq = dependent_ptr_mb(vq, more);
last_used = vq->last_used_idx;
id = le16_to_cpu(vq->packed.vring.desc[last_used].id);
pgpJKuRMAjN9k.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the vhost tree with Linus' tree
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 vhost tree.
These are two slightly different versions of the same patch. I used
the version from Linus' tree. Please clean your tree up.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the vhost tree with Linus' tree
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 vhost tree. These are two slightly different versions of the same patch. I used the version from Linus' tree. Please clean your tree up. -- Cheers, Stephen Rothwells...@canb.auug.org.au -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the vhost tree with Linus' tree
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 up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc MAINTAINERS
index d558d280fdc1,fbef7d0a4dd5..
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10895,15 -10570,15 +10894,24 @@@ F:drivers/block/virtio_blk.
F:include/linux/virtio_*.h
F:include/uapi/linux/virtio_*.h
+ VIRTIO DRIVERS FOR S390
+ M:Christian Borntraeger
+ M:Cornelia Huck
+ L:linux-s...@vger.kernel.org
+ L:virtualizat...@lists.linux-foundation.org
+ L:k...@vger.kernel.org
+ S:Supported
+ F:drivers/s390/virtio/
+
+VIRTIO GPU DRIVER
+M:David Airlie
+M:Gerd Hoffmann
+L:dri-de...@lists.freedesktop.org
+L:virtualizat...@lists.linux-foundation.org
+S:Maintained
+F:drivers/gpu/drm/virtio/
+F:include/uapi/linux/virtio_gpu.h
+
VIRTIO HOST (VHOST)
M:"Michael S. Tsirkin"
L:k...@vger.kernel.org
pgpKILSDDbBt9.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the vhost tree with Linus' tree
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 up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc MAINTAINERS index d558d280fdc1,fbef7d0a4dd5.. --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -10895,15 -10570,15 +10894,24 @@@ F:drivers/block/virtio_blk. F:include/linux/virtio_*.h F:include/uapi/linux/virtio_*.h + VIRTIO DRIVERS FOR S390 + M:Christian Borntraeger borntrae...@de.ibm.com + M:Cornelia Huck cornelia.h...@de.ibm.com + L:linux-s...@vger.kernel.org + L:virtualizat...@lists.linux-foundation.org + L:k...@vger.kernel.org + S:Supported + F:drivers/s390/virtio/ + +VIRTIO GPU DRIVER +M:David Airlie airl...@linux.ie +M:Gerd Hoffmann kra...@redhat.com +L:dri-de...@lists.freedesktop.org +L:virtualizat...@lists.linux-foundation.org +S:Maintained +F:drivers/gpu/drm/virtio/ +F:include/uapi/linux/virtio_gpu.h + VIRTIO HOST (VHOST) M:Michael S. Tsirkin m...@redhat.com L:k...@vger.kernel.org pgpKILSDDbBt9.pgp Description: OpenPGP digital signature
linux-next: manual merge of the vhost tree with Linus' tree
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 was a superset of the latter for the
conflicting area, so I used that) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgpr7P0qvD6U9.pgp
Description: PGP signature
linux-next: manual merge of the vhost tree with Linus' tree
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 was a superset of the latter for the conflicting area, so I used that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpr7P0qvD6U9.pgp Description: PGP signature
