linux-kernel - linux-next: manual merge of the vhost 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: <20130509120438.6112e2d5b559eb62ac0caa18@canb.auug.org.au>
Date:	Thu, 9 May 2013 12:04:38 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Michael S. Tsirkin" <mst@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rusty Russell <rusty@...tcorp.com.au>
Subject: 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 Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped