Merge branch 'topic/failslab' into for-linus

Conflicts:

	mm/slub.c

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

diff --cc mm/slab.c
Simple merge

diff --cc mm/slub.c
index ca95e45f04c3e41473001303df7c2f596ccba47d,640fde7e354c3e10dd975b304dcac2063498466d..6cb7ad10785227f2b889bcff96d6610ddeabe37a
--- 1/mm/slub.c
--- 2/mm/slub.c
+++ b/mm/slub.c
@@@ -1595,7 -1592,9 +1596,11 @@@ static __always_inline void *slab_alloc
        unsigned long flags;
        unsigned int objsize;
  
 +      might_sleep_if(gfpflags & __GFP_WAIT);
++
+       if (should_failslab(s->objsize, gfpflags))
+               return NULL;
+ 
        local_irq_save(flags);
        c = get_cpu_slab(s, smp_processor_id());
        objsize = c->objsize;