Subject: linux-next: manual merge of the vhost tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 24 Jul 2015 13:59:21 +1000

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in:

  drivers/vhost/vhost.c

between commit:

  4de7255f7d2b ("vhost: extend memory regions allocation to vmalloc")

from Linus' tree and commit:

  a4883f62470c ("vhost: extend memory regions allocation to vmalloc")

from the vhost tree.

These are two slightly different versions of the same patch.  I used
the version from Linus' tree.  Please clean your tree up.

-- 
Cheers,
Stephen Rothwell                    [email-masked]