Subject: linux-next: manual merge of the notifications tree with the vfs tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 15 May 2020 19:25:41 +1000

Hi all,

Today's linux-next merge of the notifications tree got a conflict in:

  fs/mount.h

between commit:

  9f6c61f96f2d ("proc/mounts: add cursor")

from the vfs tree and commit:

  cd7109637b0b ("watch_queue: Implement mount topology and attribute change notifications")

from the notifications tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/mount.h
index c7abb7b394d8,9a49ea1e7365..000000000000
--- a/fs/mount.h
+++ b/fs/mount.h
@@@ -158,4 -161,16 +165,18 @@@ static inline bool is_anon_ns(struct mn
  	return ns->seq == 0;
  }
  
 +extern void mnt_cursor_del(struct mnt_namespace *ns, struct mount *cursor);
++
+ #ifdef CONFIG_MOUNT_NOTIFICATIONS
+ extern void notify_mount(struct mount *triggered,
+ 			 struct mount *aux,
+ 			 enum mount_notification_subtype subtype,
+ 			 u32 info_flags);
+ #else
+ static inline void notify_mount(struct mount *triggered,
+ 				struct mount *aux,
+ 				enum mount_notification_subtype subtype,
+ 				u32 info_flags)
+ {
+ }
+ #endif