Merge branch 'slab/next' into slab/for-linus

Fix up a trivial merge conflict with commit baaf1dd4

 ("mm/slob: use
min_t() to compare ARCH_SLAB_MINALIGN") that did not go through the slab
tree.

Conflicts:
	mm/slob.c

Signed-off-by: Pekka Enberg <penberg@kernel.org>