From: Pekka Enberg <penberg@kernel.org>
Date: Wed, 3 Oct 2012 06:56:37 +0000 (+0300)
Subject: Merge branch 'slab/common-for-cgroups' into slab/for-linus
X-Git-Tag: v3.7-rc1~106^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f4178cdddd4cb860a17f363fe13264fff03da7f2;p=~emulex%2Finfiniband.git

Merge branch 'slab/common-for-cgroups' into slab/for-linus

Fix up a trivial conflict with NUMA_NO_NODE cleanups.

Conflicts:
	mm/slob.c

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

f4178cdddd4cb860a17f363fe13264fff03da7f2
diff --cc mm/slab.c
index d264d90b368,8524923966b..a99f71a39ba
--- a/mm/slab.c
+++ b/mm/slab.c
@@@ -803,8 -812,8 +804,9 @@@ static void __slab_error(const char *fu
  	printk(KERN_ERR "slab error in %s(): cache `%s': %s\n",
  	       function, cachep->name, msg);
  	dump_stack();
 +	add_taint(TAINT_BAD_PAGE);
  }
+ #endif
  
  /*
   * By default on NUMA we use alien caches to stage the freeing of