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)
commitdfbc1534eac550b37df592a8a0b550cd47539d0b
treeec2f50ac271be0bad556e5e22a204bddc1f63a9a
parent7eeafbcab47fe9860e5106286db83d60e3f35644
parent163f9eb95a10371ead59b62087e0d4e7ce53112e
Merge branch 'debugfs_automount' of git://git./linux/kernel/git/viro/vfs into trace/ftrace/tracefs

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.
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_events.c