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

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
fs/notify/inotify/inotify_user.c between commit
9f009a78fb3b54976cfe8173d05ef483dbda4571 ("switch inotify_user to
anon_inode") from the vfs tree and commit
9036fe89f12afba49cd3e5b44b2f94fbd3269269 ("inotify: rename mark_entry to
just mark") from the fsnotify tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/notify/inotify/inotify_user.c
index 472cdf2,bc1f395..0000000
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@@ -767,7 -873,17 +836,7 @@@ out
   */
  static int __init inotify_user_setup(void)
  {
- 	inotify_inode_mark_cachep = KMEM_CACHE(inotify_inode_mark_entry, SLAB_PANIC);
 -	int ret;
 -
 -	ret = register_filesystem(&inotify_fs_type);
 -	if (unlikely(ret))
 -		panic("inotify: register_filesystem returned %d!\n", ret);
 -
 -	inotify_mnt = kern_mount(&inotify_fs_type);
 -	if (IS_ERR(inotify_mnt))
 -		panic("inotify: kern_mount ret %ld!\n", PTR_ERR(inotify_mnt));
 -
+ 	inotify_inode_mark_cachep = KMEM_CACHE(inotify_inode_mark, SLAB_PANIC);
  	event_priv_cachep = KMEM_CACHE(inotify_event_private_data, SLAB_PANIC);
  
  	inotify_max_queued_events = 16384;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/