From: Pekka Enberg <penberg@kernel.org>
Date: Sun, 20 Mar 2011 16:13:26 +0000 (+0200)
Subject: Merge branch 'slub/lockless' into for-linus
X-Git-Tag: firefly_0821_release~7613^2~2116^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e8c500c2b64b6e237e67ecba7249e72363c47047;p=firefly-linux-kernel-4.4.55.git

Merge branch 'slub/lockless' into for-linus

Conflicts:
	include/linux/slub_def.h
---

e8c500c2b64b6e237e67ecba7249e72363c47047
diff --cc include/linux/slub_def.h
index ae0093cc5189,009b0020079d..90fbb6d87e11
--- a/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 */
 +	int reserved;		/* Reserved bytes at the end of slabs */
- 	unsigned long min_partial;
  	const char *name;	/* Name (only for display!) */
  	struct list_head list;	/* List of slab caches */
  #ifdef CONFIG_SYSFS