From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <christian@brauner•io>
Cc: Miklos Szeredi <miklos@szeredi•hu>,
Christian Brauner <christian.brauner@ubuntu•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miklos Szeredi <mszeredi@redhat•com>,
Tycho Andersen <tycho@tycho•pizza>,
Tyler Hicks <code@tyhicks•com>
Subject: Re: linux-next: manual merge of the pidfd tree with the overlayfs tree
Date: Mon, 1 Feb 2021 10:19:29 +1100 [thread overview]
Message-ID: <20210201101929.618b32e5@canb.auug.org.au> (raw)
In-Reply-To: <20210125162336.470e3183@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1709 bytes --]
Hi all,
On Mon, 25 Jan 2021 16:23:36 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> fs/ecryptfs/inode.c
>
> between commit:
>
> 176cfe865da6 ("ecryptfs: fix uid translation for setxattr on security.capability")
>
> from the overlayfs tree and commit:
>
> c7c7a1a18af4 ("xattr: handle idmapped mounts")
>
> from the pidfd 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.
>
>
> diff --cc fs/ecryptfs/inode.c
> index 58d0f7187997,55da9a91f51a..000000000000
> --- a/fs/ecryptfs/inode.c
> +++ b/fs/ecryptfs/inode.c
> @@@ -1024,11 -1043,10 +1045,12 @@@ ecryptfs_setxattr(struct dentry *dentry
> rc = -EOPNOTSUPP;
> goto out;
> }
> - rc = vfs_setxattr(&init_user_ns, lower_dentry, name, value, size,
> - flags);
> + inode_lock(lower_inode);
> - rc = __vfs_setxattr_locked(lower_dentry, name, value, size, flags, NULL);
> ++ rc = __vfs_setxattr_locked(&init_user_ns, lower_dentry, name,
> ++ value, size, flags, NULL);
> + inode_unlock(lower_inode);
> if (!rc && inode)
> - fsstack_copy_attr_all(inode, d_inode(lower_dentry));
> + fsstack_copy_attr_all(inode, lower_inode);
> out:
> return rc;
> }
This is now a conflict between the pidfd tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-01-31 23:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 5:23 linux-next: manual merge of the pidfd tree with the overlayfs tree Stephen Rothwell
2021-01-31 23:19 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 6:04 Stephen Rothwell
2021-02-04 22:42 ` Stephen Rothwell
2021-01-25 6:07 Stephen Rothwell
2021-02-04 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:
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=20210201101929.618b32e5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=christian.brauner@ubuntu$(echo .)com \
--cc=christian@brauner$(echo .)io \
--cc=code@tyhicks$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
--cc=tycho@tycho$(echo .)pizza \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox