Messages in this thread | | | Date | Wed, 22 May 2013 14:21:18 +1000 | From | Stephen Rothwell <> | 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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |