All of
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: David Howells <>,
	Christian Brauner <>
Cc: Christian Brauner <>,
	Linux Kernel Mailing List <>,
	Linux Next Mailing List <>
Subject: linux-next: manual merge of the fscache tree with the pidfd tree
Date: Mon, 6 Dec 2021 09:07:55 +1100	[thread overview]
Message-ID: <> (raw)

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

Hi all,

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


between commit:

  bb49e9e730c2 ("fs: add is_idmapped_mnt() helper")

from the pidfd tree and commit:

  d18c9010376b ("cachefiles: Delete the cachefiles driver pending rewrite")

from the fscache tree.

I fixed it up (the latter deleted the file, so I did that and then added
the following patch) 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.

From: Stephen Rothwell <>
Date: Mon, 6 Dec 2021 09:05:07 +1100
Subject: [PATCH] fix up for "fs: add is_idmapped_mnt() helper"

Signed-off-by: Stephen Rothwell <>
 fs/cachefiles/cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/cachefiles/cache.c b/fs/cachefiles/cache.c
index 327cea71557f..e0aa8bf429b8 100644
--- a/fs/cachefiles/cache.c
+++ b/fs/cachefiles/cache.c
@@ -44,7 +44,7 @@ int cachefiles_add_cache(struct cachefiles_cache *cache)
 	root = path.dentry;
 	ret = -EINVAL;
-	if (mnt_user_ns(path.mnt) != &init_user_ns) {
+	if (is_idmapped_mnt(path.mnt)) {
 		pr_warn("File cache on idmapped mounts not supported");
 		goto error_unsupported;

Stephen Rothwell

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

             reply	other threads:[~2021-12-05 22:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-05 22:07 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-01-26 23:00 Stephen Rothwell
2021-02-14 21:14 ` Stephen Rothwell
2021-02-24 22:40   ` 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:

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

  git send-email \ \ \ \ \ \ \ \
    --subject='Re: linux-next: manual merge of the fscache tree with the pidfd tree' \

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.