Merge branch 'slub/lockless' into for-linus

Conflicts:
	include/linux/slub_def.h

diff --cc include/linux/slub_def.h
index ae0093cc518942b00fe4220b50193995a3d018aa,009b0020079d97edea54882ce835d9778ad445e3..90fbb6d87e11d3408db6cd3d3b6a1eedbcd68fe7
--- 1/include/linux/slub_def.h
--- 2/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@@ -83,8 -87,6 +87,7 @@@ struct kmem_cache 
        void (*ctor)(void *);
        int inuse;              /* Offset to metadata */
        int align;              /* Alignment */
-       unsigned long min_partial;
 +      int reserved;           /* Reserved bytes at the end of slabs */
        const char *name;       /* Name (only for display!) */
        struct list_head list;  /* List of slab caches */
  #ifdef CONFIG_SYSFS

diff --cc mm/slub.c
Simple merge