Hi all,
On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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()")
--
Cheers,
Stephen Rothwell
Attachment:
pgpf1tYJDXiLn.pgp
Description: OpenPGP digital signature
