linux-next: manual merge of the akpm-current tree with the pidfd tree
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.
Signature · 17 lines
Cheers, Stephen Rothwell 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;
Hi:
Quoted 14 lines · Stephen Rothwell
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/hugetlbfs/inode.cbetween commit:
2f221d6f7b88("attr: handle idmapped mounts")from the pidfd tree and commit:
57d3629b7a9a("hugetlbfs: remove uselessBUG_ON(!inode)inhugetlbfs_setattr()")
Quoted 9 lines
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.
Hi all,
Quoted 28 lines · On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell <[email protected]>…
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/hugetlbfs/inode.cbetween commit:
2f221d6f7b88("attr: handle idmapped mounts")from the pidfd tree and commit:
57d3629b7a9a("hugetlbfs: remove uselessBUG_ON(!inode)inhugetlbfs_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.
fs/hugetlbfs/inode.c +0
-0
fs/hugetlbfs/inode.c
Quoted 9 lines
fs/hugetlbfs/inode.c +0
-2@@@ -760,9 -766,7 +767,7 @@@ static int hugetlbfs_setattr(struct useunsigned 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()")
Signature · 2 lines
Cheers, Stephen Rothwell
Hi all,
Quoted 43 lines · On Mon, 15 Feb 2021 08:54:41 +1100 Stephen Rothwell <[email protected]>…
Quoted 28 lines · On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell <[email protected]>…
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/hugetlbfs/inode.cbetween commit:
2f221d6f7b88("attr: handle idmapped mounts")from the pidfd tree and commit:
57d3629b7a9a("hugetlbfs: remove uselessBUG_ON(!inode)inhugetlbfs_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.
fs/hugetlbfs/inode.c +0
-0fs/hugetlbfs/inode.c
Quoted 9 lines
fs/hugetlbfs/inode.c +0
-2@@@ -760,9 -766,7 +767,7 @@@ static int hugetlbfs_setattr(struct useunsigned 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.
Quoted 3 lines
The akpm-current commit is now
b557c21f61f8("hugetlbfs: remove uselessBUG_ON(!inode)inhugetlbfs_setattr()")
This is now a conflict between the akpm-current tree and Linus' tree.
Signature · 2 lines
Cheers, Stephen Rothwell