From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <christian@brauner•io>
Cc: Jaegeuk Kim <jaegeuk@kernel•org>, Chao Yu <chao@kernel•org>,
Chao Yu <yuchao0@huawei•com>,
Christian Brauner <christian.brauner@ubuntu•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the pidfd tree with the f2fs tree
Date: Mon, 22 Feb 2021 09:48:57 +1100 [thread overview]
Message-ID: <20210222094857.129c8818@canb.auug.org.au> (raw)
In-Reply-To: <20210215075806.6bdb990c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2447 bytes --]
Hi all,
On Mon, 15 Feb 2021 07:58:06 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Hi all,
>
> On Mon, 25 Jan 2021 16:32:55 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the pidfd tree got a conflict in:
> >
> > fs/f2fs/acl.c
> >
> > between commit:
> >
> > 7cf2e6173b2d ("f2fs: enhance to update i_mode and acl atomically in f2fs_setattr()")
> >
> > from the f2fs tree and commit:
> >
> > e65ce2a50cf6 ("acl: 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/f2fs/acl.c
> > index 732ec10e7890,a19e86c9adac..000000000000
> > --- a/fs/f2fs/acl.c
> > +++ b/fs/f2fs/acl.c
> > @@@ -200,27 -200,6 +200,27 @@@ struct posix_acl *f2fs_get_acl(struct i
> > return __f2fs_get_acl(inode, type, NULL);
> > }
> >
> > +static int f2fs_acl_update_mode(struct inode *inode, umode_t *mode_p,
> > + struct posix_acl **acl)
> > +{
> > + umode_t mode = inode->i_mode;
> > + int error;
> > +
> > + if (is_inode_flag_set(inode, FI_ACL_MODE))
> > + mode = F2FS_I(inode)->i_acl_mode;
> > +
> > + error = posix_acl_equiv_mode(*acl, &mode);
> > + if (error < 0)
> > + return error;
> > + if (error == 0)
> > + *acl = NULL;
> > - if (!in_group_p(inode->i_gid) &&
> > - !capable_wrt_inode_uidgid(inode, CAP_FSETID))
> > ++ if (!in_group_p(i_gid_into_mnt(&init_user_ns, inode)) &&
> > ++ !capable_wrt_inode_uidgid(&init_user_ns, inode, CAP_FSETID))
> > + mode &= ~S_ISGID;
> > + *mode_p = mode;
> > + return 0;
> > +}
> > +
> > static int __f2fs_set_acl(struct inode *inode, int type,
> > struct posix_acl *acl, struct page *ipage)
> > {
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
>
> The f2fs tree commit is now
>
> 17232e830afb ("f2fs: enhance to update i_mode and acl atomically in f2fs_setattr()")
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-02-21 22:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 5:32 linux-next: manual merge of the pidfd tree with the f2fs tree Stephen Rothwell
2021-02-14 20:58 ` Stephen Rothwell
2021-02-21 22:48 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 5:48 Stephen Rothwell
2021-02-14 21:01 ` Stephen Rothwell
2021-02-21 22:50 ` 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=20210222094857.129c8818@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chao@kernel$(echo .)org \
--cc=christian.brauner@ubuntu$(echo .)com \
--cc=christian@brauner$(echo .)io \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=yuchao0@huawei$(echo .)com \
/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