2013-04-02 03:17:51

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: manual merge of the virtio tree with the rr-fixes tree

---

Hi Rusty,

Today's linux-next merge of the virtio tree got a conflict in
drivers/char/virtio_console.c between commit 9ba5c80b1aea ("virtio:
console: add locking around c_ovq operations") from the rr-fixes tree and
commit 6797999d9958 ("virtio_console: use simplified virtqueue
accessors") from the virtio tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell [email protected]

diff --cc drivers/char/virtio_console.c
index ce5f3fc,6d59f16..0000000
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@@ -570,9 -569,7 +570,9 @@@ static ssize_t __send_control_msg(struc
vq = portdev->c_ovq;

sg_init_one(sg, &cpkt, sizeof(cpkt));
+
+ spin_lock(&portdev->c_ovq_lock);
- if (virtqueue_add_buf(vq, sg, 1, 0, &cpkt, GFP_ATOMIC) == 0) {
+ if (virtqueue_add_outbuf(vq, sg, 1, &cpkt, GFP_ATOMIC) == 0) {
virtqueue_kick(vq);
while (!virtqueue_get_buf(vq, &len))
cpu_relax();

---

Attachments:

(No filename) (0.98 kB)
(No filename) (836.00 B)
Download all attachments

2013-04-02 05:29:45

by Amit Shah

[permalink] [raw]

Subject: Re: linux-next: manual merge of the virtio tree with the rr-fixes tree

---

On (Tue) 02 Apr 2013 [14:17:39], Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next merge of the virtio tree got a conflict in
> drivers/char/virtio_console.c between commit 9ba5c80b1aea ("virtio:
> console: add locking around c_ovq operations") from the rr-fixes tree and
> commit 6797999d9958 ("virtio_console: use simplified virtqueue
> accessors") from the virtio tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks OK, just a context change.

Thanks,

Amit