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: NPekka Enberg <penberg@kernel.org>
Showing
想要评论请 注册 或 登录