Merge branches 'slab/next' and 'slub/partial' into slab/for-linus

diff --cc include/linux/mm_types.h
Simple merge

diff --cc mm/slub.c
index 7c54fe8,943f490,e06f72c..95215aa
--- 1/mm/slub.c
--- 2/mm/slub.c
--- 3/mm/slub.c
+++ b/mm/slub.c
@@@@ -2377,7 -2351,7 -2536,7 +2510,7 @@@@ static void __slab_free(struct kmem_cac
                 */
                if (unlikely(!prior)) {
                        remove_full(s, page);
-                       add_partial(n, page, 1);
  -                     add_partial(n, page, 0);
+ +                     add_partial(n, page, DEACTIVATE_TO_TAIL);
                        stat(s, FREE_ADD_PARTIAL);
                }
        }

diff --cc tools/slub/slabinfo.c
Simple merge