From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Christian Brauner <christian.brauner@ubuntu•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miaohe Lin <linmiaohe@huawei•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the pidfd tree
Date: Thu, 25 Feb 2021 09:41:36 +1100 [thread overview]
Message-ID: <20210225094136.05a1aabe@canb.auug.org.au> (raw)
In-Reply-To: <20210215085441.48edb08f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1842 bytes --]
Hi all,
On Mon, 15 Feb 2021 08:54:41 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > fs/hugetlbfs/inode.c
> >
> > between commit:
> >
> > 2f221d6f7b88 ("attr: handle idmapped mounts")
> >
> > from the pidfd tree and commit:
> >
> > 57d3629b7a9a ("hugetlbfs: remove useless BUG_ON(!inode) in hugetlbfs_setattr()")
> >
> > from the akpm-current 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/hugetlbfs/inode.c
> > index c5c32eb59498,ca9e25427f2d..000000000000
> > --- a/fs/hugetlbfs/inode.c
> > +++ b/fs/hugetlbfs/inode.c
> > @@@ -760,9 -766,7 +767,7 @@@ static int hugetlbfs_setattr(struct use
> > unsigned int ia_valid = attr->ia_valid;
> > struct hugetlbfs_inode_info *info = HUGETLBFS_I(inode);
> >
> > - BUG_ON(!inode);
> > -
> > - error = setattr_prepare(dentry, attr);
> > + error = setattr_prepare(&init_user_ns, dentry, attr);
> > if (error)
> > return error;
> >
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
>
> The akpm-current commit is now
>
> b557c21f61f8 ("hugetlbfs: remove useless BUG_ON(!inode) in hugetlbfs_setattr()")
This is now a conflict between the akpm-current 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-24 22:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-27 11:43 linux-next: manual merge of the akpm-current tree with the pidfd tree Stephen Rothwell
2021-01-28 2:04 ` Miaohe Lin
2021-02-14 21:54 ` Stephen Rothwell
2021-02-24 22:41 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 8:54 Stephen Rothwell
2019-05-22 1:43 Stephen Rothwell
2019-05-24 8:15 ` Joel Fernandes
2019-07-08 23:12 ` Stephen Rothwell
2019-05-15 3:16 Stephen Rothwell
2019-07-08 2:01 ` Stephen Rothwell
2019-07-12 12:53 ` Joel Fernandes
2019-07-12 13:02 ` Christian Brauner
2019-07-12 13:54 ` Joel Fernandes
2019-04-23 8:46 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=20210225094136.05a1aabe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=christian.brauner@ubuntu$(echo .)com \
--cc=linmiaohe@huawei$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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