linux-next: manual merge of the slab tree with the origin tree

[broonie]

Hi all,

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

  mm/zsmalloc.c

between commits:

  ffedd09fa9b06 ("zsmalloc: Stop using slab fields in struct page")
  a41ec880aa7be ("zsmalloc: move huge compressed obj from page to zspage")

from the origin tree and commit:

  a593db30a7365 ("zsmalloc: Stop using slab fields in struct page")

from the slab tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

[Used the origin version again]