[lkml]   [2015]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-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 modified by the
latter) and can carry the fix as necessary (no action is required).

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2015-04-13 09:41    [W:0.056 / U:31.392 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site