linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Howells <dhowells@redhat.com>, Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Miklos Szeredi <mszeredi@redhat.com>
Subject: linux-next: manual merge of the notifications tree with the vfs tree
Date: Fri, 15 May 2020 19:25:41 +1000	[thread overview]
Message-ID: <20200515192541.41b263e9@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1404 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2020-05-15  9:25 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-15  9:25 Stephen Rothwell [this message]
2020-05-15  9:40 Stephen Rothwell
2020-05-25  9:26 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200515192541.41b263e9@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=dhowells@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mszeredi@redhat.com \
    --cc=viro@ZenIV.linux.org.uk \
    --subject='Re: linux-next: manual merge of the notifications tree with the vfs tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).