archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Rusty Russell <>
	Amit Shah <>
Subject: linux-next: manual merge of the virtio tree with the rr-fixes tree
Date: Tue, 2 Apr 2013 14:17:39 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]

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).

Stephen Rothwell          

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) {
  		while (!virtqueue_get_buf(vq, &len))

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-04-02  3:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-02  3:17 Stephen Rothwell [this message]
2013-04-02  5:29 ` linux-next: manual merge of the virtio tree with the rr-fixes tree Amit Shah

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).