linux-kernel - linux-next: manual merge of the vhost 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>] [day] [month] [year] [list]

Message-Id: <20130522142118.d4d7145822496b54819bb97b@canb.auug.org.au>
Date:	Wed, 22 May 2013 14:21:18 +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 the rr-fixes tree

Hi Michael,

Today's linux-next merge of the vhost tree got conflicts in
include/linux/uio.h and lib/iovec.c between commit d2f83e9078b8 ("Hoist
memcpy_fromiovec/memcpy_toiovec into lib/") from the rr-fixes tree and
commit 48f0d22c9a46 ("Hoist memcpy_fromiovec into lib/") from the vhost
tree.

The latter was an older version of the former, so I just use the former
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