linux-next: manual merge of the akpm tree with the vhost tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpn tree got a conflict in
arch/x86/Kconfig between commit 4673ca8eb369 ("lib: move GENERIC_IOMAP to
lib/Kconfig") from the vhost tree and commit c7b45fe332ee ("mm,slub,x86:
decouple size of struct page from CONFIG_CMPXCHG_LOCAL") from the akpm
tree.

Just overlapping additions.  I fixed it up and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature