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

From: Stephen Rothwell
Date: Wed May 22 2013 - 00:21:34 EST

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

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature