linux-next: manual merge of the fsnotify tree with the vfs tree
From: Stephen Rothwell
Date: Wed Mar 03 2010 - 23:46:52 EST
Today's linux-next merge of the fsnotify tree got a conflict in
include/linux/fsnotify.h between commit
cccc6bba3f771ef29b33e4f79e70ebc3dba245b0 ("Lose the first argument of
audit_inode_child()") from the vfs tree and commits
a65c9effb4c7b86d032b5188ddbd0e2e583cb81b ("inotify: remove inotify in
kernel interface"), 76864b426a99a3d08aa53e554ddc748ac49ca633 ("Lose the
first argument of audit_inode_child()") and
7278f4df3bfbc7934fc590d8a5707d3a8ee3d866 ("fsnotify: use unsigned char *
for dentry->d_name.name") from the fsnotify tree.
This has come about partly because, when you rebased and linearized your
tree, you included inline the two patches from Al that he had put in a
separate branch for you to merge. You should have just remerged Al's
for-fsnotify branch at the appropriate place in your tree.
I fixed it up (again) and can carry this for a while.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature