linux-next: manual merge of the ftrace tree with the vfs tree

Hi Steven, Today's linux-next merge of the ftrace tree got a conflict in kernel/trace/trace.c between commit aa1083274669 ("VFS: kernel/: d_inode() annotations") from the vfs tree and various commits from the ftrace from the ftrace tree. I fixed it up (the latter removed a lot of the code modifie

linux-next: manual merge of the ftrace tree with the vfs tree

Hi Steven, Today's linux-next merge of the ftrace tree got a conflict in kernel/trace/trace.c between commit 2c13b111e15c ("VFS: (Scripted) Convert ->d_inode to fs_inode() in kernel/trace/") from the vfs tree and commit eae473581cf9 ("tracing: Have mkdir and rmdir be part of tracefs") from the ftr