linux-kernel - linux-next: manual merge of the virtio tree with Linus' 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>] [day] [month] [year] [list]

Message-ID: <20150318124036.2a71a232@canb.auug.org.au>
Date:	Wed, 18 Mar 2015 12:40:36 +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,
	"Michael S. Tsirkin" <mst@...hat.com>
Subject: linux-next: manual merge of the virtio tree with Linus' tree

Hi Rusty,

Today's linux-next merge of the virtio tree got a conflict in
net/9p/trans_virtio.c between commit 8051a2a518fc ("9p/trans_virtio:
fix hot-unplug") from Linus' tree and commit 1991755689ad
("9p/trans_virtio: fix hot-unplug") from the virtio tree.

I fixed it up (the latter is an older version the former, which is now
in Linus' tree) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped