Merge branch 'core/locking' into tracing/ftrace

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/slab.c
Simple merge

diff --cc mm/slob.c
index f9cc246,1264799..5961529
--- 1/mm/slob.c
--- 2/mm/slob.c
+++ b/mm/slob.c
@@@ -464,8 -463,9 +464,10 @@@ void *__kmalloc_node(size_t size, gfp_
  {
        unsigned int *m;
        int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
 +      void *ret;
  
+       lockdep_trace_alloc(flags);
+ 
        if (size < PAGE_SIZE - align) {
                if (!size)
                        return ZERO_SIZE_PTR;

diff --cc mm/slub.c
Simple merge

diff --cc mm/vmscan.c
Simple merge