]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>
Mon, 2 Feb 2015 16:47:31 +0000 (11:47 -0500)
committerSteven Rostedt <rostedt@goodmis.org>
Mon, 2 Feb 2015 16:47:31 +0000 (11:47 -0500)
Pull in Al Viro's changes to debugfs that implement the new primitive:
debugfs_create_automount(), that creates a directory in debugfs that will
safely mount another file system automatically when debugfs is mounted.

This will let tracefs automount itself on top of debugfs/tracing directory.

1  2 
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_events.c

Simple merge
Simple merge
Simple merge