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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130402141739.0d0b45f519be505a7da471ac@canb.auug.org.au>
Date:	Tue, 2 Apr 2013 14:17:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Amit Shah <amit.shah@...hat.com>
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                    sfr@...b.auug.org.au

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();

Content of type "application/pgp-signature" skipped