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>

diff --cc mm/slab.c
index d264d90b3682221a47205d77fd4831b666204d7d,8524923966b568838b0ef0f8743a9167a0173a30..a99f71a39bafd5f74c67dc0b56cb4f19a7dd65d7
--- 1/mm/slab.c
--- 2/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

diff --cc mm/slob.c
Simple merge

diff --cc mm/slub.c
Simple merge