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 protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
