Skip to content
  • Linus Torvalds's avatar
    Merge branch 'kmemtrace-for-linus' of... · 12fe32e4
    Linus Torvalds authored
    Merge branch 'kmemtrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'kmemtrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      kmemtrace: trace kfree() calls with NULL or zero-length objects
      kmemtrace: small cleanups
      kmemtrace: restore original tracing data binary format, improve ABI
      kmemtrace: kmemtrace_alloc() must fill type_id
      kmemtrace: use tracepoints
      kmemtrace, rcu: don't include unnecessary headers, allow kmemtrace w/ tracepoints
      kmemtrace, rcu: fix rcupreempt.c data structure dependencies
      kmemtrace, rcu: fix rcu_tree_trace.c data structure dependencies
      kmemtrace, rcu: fix linux/rcutree.h and linux/rcuclassic.h dependencies
      kmemtrace, mm: fix slab.h dependency problem in mm/failslab.c
      kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_unlzma.c
      kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_bunzip2.c
      kmemtrace, kbuild: fix slab.h dependency problem in lib/decompress_inflate.c
      kmemtrace, squashfs: fix slab.h dependency problem in squasfs
      kmemtrace, befs: fix slab.h dependency problem
      kmemtrace, security: fix linux/key.h header file dependencies
      kmemtrace, fs: fix linux/fdtable.h header file dependencies
      kmemtrace, fs: uninline simple_transaction_set()
      kmemtrace, fs, security: move alloc_secdata() and free_secdata() to linux/security.h
    12fe32e4