Hi: On 2021/1/27 19:43, Stephen Rothwell wrote: > Hi all, > > 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. > This fix is what I want. Many thanks for doing this.