* linux-next: manual merge of the xfs tree with the pidfd tree
@ 2021-02-07 23:33 Stephen Rothwell
2021-02-14 22:41 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2021-02-07 23:33 UTC (permalink / raw)
To: Darrick J. Wong, David Chinner, linux-xfs
Cc: Christian Brauner, Christoph Hellwig, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1923 bytes --]
Hi all,
Today's linux-next merge of the xfs tree got a conflict in:
fs/xfs/xfs_ioctl.c
between commit:
f736d93d76d3 ("xfs: support idmapped mounts")
from the pidfd tree and commit:
7317a03df703 ("xfs: refactor inode ownership change transaction/inode/quota allocation idiom")
from the xfs 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.
--
Cheers,
Stephen Rothwell
diff --cc fs/xfs/xfs_ioctl.c
index 3d4c7ca080fb,248083ea0276..000000000000
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@@ -1280,9 -1275,9 +1280,10 @@@ xfs_ioctl_setattr_prepare_dax
*/
static struct xfs_trans *
xfs_ioctl_setattr_get_trans(
- struct file *file)
- struct xfs_inode *ip,
++ struct file *file,
+ struct xfs_dquot *pdqp)
{
+ struct xfs_inode *ip = XFS_I(file_inode(file));
struct xfs_mount *mp = ip->i_mount;
struct xfs_trans *tp;
int error = -EROFS;
@@@ -1470,9 -1461,9 +1469,9 @@@ xfs_ioctl_setattr
xfs_ioctl_setattr_prepare_dax(ip, fa);
- tp = xfs_ioctl_setattr_get_trans(file);
- tp = xfs_ioctl_setattr_get_trans(ip, pdqp);
++ tp = xfs_ioctl_setattr_get_trans(file, pdqp);
if (IS_ERR(tp)) {
- code = PTR_ERR(tp);
+ error = PTR_ERR(tp);
goto error_free_dquots;
}
@@@ -1615,7 -1599,7 +1606,7 @@@ xfs_ioc_setxflags
xfs_ioctl_setattr_prepare_dax(ip, &fa);
- tp = xfs_ioctl_setattr_get_trans(filp);
- tp = xfs_ioctl_setattr_get_trans(ip, NULL);
++ tp = xfs_ioctl_setattr_get_trans(filp, NULL);
if (IS_ERR(tp)) {
error = PTR_ERR(tp);
goto out_drop_write;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the xfs tree with the pidfd tree
2021-02-07 23:33 linux-next: manual merge of the xfs tree with the pidfd tree Stephen Rothwell
@ 2021-02-14 22:41 ` Stephen Rothwell
2021-02-14 23:38 ` Darrick J. Wong
2021-02-21 22:56 ` Stephen Rothwell
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2021-02-14 22:41 UTC (permalink / raw)
To: Darrick J. Wong, David Chinner, linux-xfs
Cc: Christian Brauner, Christoph Hellwig, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2223 bytes --]
Hi all,
On Mon, 8 Feb 2021 10:33:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the xfs tree got a conflict in:
>
> fs/xfs/xfs_ioctl.c
>
> between commit:
>
> f736d93d76d3 ("xfs: support idmapped mounts")
>
> from the pidfd tree and commit:
>
> 7317a03df703 ("xfs: refactor inode ownership change transaction/inode/quota allocation idiom")
>
> from the xfs 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/xfs/xfs_ioctl.c
> index 3d4c7ca080fb,248083ea0276..000000000000
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@@ -1280,9 -1275,9 +1280,10 @@@ xfs_ioctl_setattr_prepare_dax
> */
> static struct xfs_trans *
> xfs_ioctl_setattr_get_trans(
> - struct file *file)
> - struct xfs_inode *ip,
> ++ struct file *file,
> + struct xfs_dquot *pdqp)
> {
> + struct xfs_inode *ip = XFS_I(file_inode(file));
> struct xfs_mount *mp = ip->i_mount;
> struct xfs_trans *tp;
> int error = -EROFS;
> @@@ -1470,9 -1461,9 +1469,9 @@@ xfs_ioctl_setattr
>
> xfs_ioctl_setattr_prepare_dax(ip, fa);
>
> - tp = xfs_ioctl_setattr_get_trans(file);
> - tp = xfs_ioctl_setattr_get_trans(ip, pdqp);
> ++ tp = xfs_ioctl_setattr_get_trans(file, pdqp);
> if (IS_ERR(tp)) {
> - code = PTR_ERR(tp);
> + error = PTR_ERR(tp);
> goto error_free_dquots;
> }
>
> @@@ -1615,7 -1599,7 +1606,7 @@@ xfs_ioc_setxflags
>
> xfs_ioctl_setattr_prepare_dax(ip, &fa);
>
> - tp = xfs_ioctl_setattr_get_trans(filp);
> - tp = xfs_ioctl_setattr_get_trans(ip, NULL);
> ++ tp = xfs_ioctl_setattr_get_trans(filp, NULL);
> if (IS_ERR(tp)) {
> error = PTR_ERR(tp);
> goto out_drop_write;
With the merge window about to open, this is a reminder that this
conflict still exists.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the xfs tree with the pidfd tree
2021-02-14 22:41 ` Stephen Rothwell
@ 2021-02-14 23:38 ` Darrick J. Wong
2021-02-21 22:56 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Darrick J. Wong @ 2021-02-14 23:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Chinner, linux-xfs, Christian Brauner, Christoph Hellwig,
Linux Kernel Mailing List, Linux Next Mailing List
On Mon, Feb 15, 2021 at 09:41:31AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 8 Feb 2021 10:33:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the xfs tree got a conflict in:
> >
> > fs/xfs/xfs_ioctl.c
> >
> > between commit:
> >
> > f736d93d76d3 ("xfs: support idmapped mounts")
> >
> > from the pidfd tree and commit:
> >
> > 7317a03df703 ("xfs: refactor inode ownership change transaction/inode/quota allocation idiom")
> >
> > from the xfs 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.
Oops, sorry, this email fell off my radar. Your fixup looks good to me;
thanks for the reminder.
--D
> >
> > diff --cc fs/xfs/xfs_ioctl.c
> > index 3d4c7ca080fb,248083ea0276..000000000000
> > --- a/fs/xfs/xfs_ioctl.c
> > +++ b/fs/xfs/xfs_ioctl.c
> > @@@ -1280,9 -1275,9 +1280,10 @@@ xfs_ioctl_setattr_prepare_dax
> > */
> > static struct xfs_trans *
> > xfs_ioctl_setattr_get_trans(
> > - struct file *file)
> > - struct xfs_inode *ip,
> > ++ struct file *file,
> > + struct xfs_dquot *pdqp)
> > {
> > + struct xfs_inode *ip = XFS_I(file_inode(file));
> > struct xfs_mount *mp = ip->i_mount;
> > struct xfs_trans *tp;
> > int error = -EROFS;
> > @@@ -1470,9 -1461,9 +1469,9 @@@ xfs_ioctl_setattr
> >
> > xfs_ioctl_setattr_prepare_dax(ip, fa);
> >
> > - tp = xfs_ioctl_setattr_get_trans(file);
> > - tp = xfs_ioctl_setattr_get_trans(ip, pdqp);
> > ++ tp = xfs_ioctl_setattr_get_trans(file, pdqp);
> > if (IS_ERR(tp)) {
> > - code = PTR_ERR(tp);
> > + error = PTR_ERR(tp);
> > goto error_free_dquots;
> > }
> >
> > @@@ -1615,7 -1599,7 +1606,7 @@@ xfs_ioc_setxflags
> >
> > xfs_ioctl_setattr_prepare_dax(ip, &fa);
> >
> > - tp = xfs_ioctl_setattr_get_trans(filp);
> > - tp = xfs_ioctl_setattr_get_trans(ip, NULL);
> > ++ tp = xfs_ioctl_setattr_get_trans(filp, NULL);
> > if (IS_ERR(tp)) {
> > error = PTR_ERR(tp);
> > goto out_drop_write;
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the xfs tree with the pidfd tree
2021-02-14 22:41 ` Stephen Rothwell
2021-02-14 23:38 ` Darrick J. Wong
@ 2021-02-21 22:56 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2021-02-21 22:56 UTC (permalink / raw)
To: Christian Brauner
Cc: Darrick J. Wong, David Chinner, linux-xfs, Christoph Hellwig,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2509 bytes --]
Hi all,
On Mon, 15 Feb 2021 09:41:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 8 Feb 2021 10:33:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the xfs tree got a conflict in:
> >
> > fs/xfs/xfs_ioctl.c
> >
> > between commit:
> >
> > f736d93d76d3 ("xfs: support idmapped mounts")
> >
> > from the pidfd tree and commit:
> >
> > 7317a03df703 ("xfs: refactor inode ownership change transaction/inode/quota allocation idiom")
> >
> > from the xfs 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/xfs/xfs_ioctl.c
> > index 3d4c7ca080fb,248083ea0276..000000000000
> > --- a/fs/xfs/xfs_ioctl.c
> > +++ b/fs/xfs/xfs_ioctl.c
> > @@@ -1280,9 -1275,9 +1280,10 @@@ xfs_ioctl_setattr_prepare_dax
> > */
> > static struct xfs_trans *
> > xfs_ioctl_setattr_get_trans(
> > - struct file *file)
> > - struct xfs_inode *ip,
> > ++ struct file *file,
> > + struct xfs_dquot *pdqp)
> > {
> > + struct xfs_inode *ip = XFS_I(file_inode(file));
> > struct xfs_mount *mp = ip->i_mount;
> > struct xfs_trans *tp;
> > int error = -EROFS;
> > @@@ -1470,9 -1461,9 +1469,9 @@@ xfs_ioctl_setattr
> >
> > xfs_ioctl_setattr_prepare_dax(ip, fa);
> >
> > - tp = xfs_ioctl_setattr_get_trans(file);
> > - tp = xfs_ioctl_setattr_get_trans(ip, pdqp);
> > ++ tp = xfs_ioctl_setattr_get_trans(file, pdqp);
> > if (IS_ERR(tp)) {
> > - code = PTR_ERR(tp);
> > + error = PTR_ERR(tp);
> > goto error_free_dquots;
> > }
> >
> > @@@ -1615,7 -1599,7 +1606,7 @@@ xfs_ioc_setxflags
> >
> > xfs_ioctl_setattr_prepare_dax(ip, &fa);
> >
> > - tp = xfs_ioctl_setattr_get_trans(filp);
> > - tp = xfs_ioctl_setattr_get_trans(ip, NULL);
> > ++ tp = xfs_ioctl_setattr_get_trans(filp, NULL);
> > if (IS_ERR(tp)) {
> > error = PTR_ERR(tp);
> > goto out_drop_write;
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-21 22:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-07 23:33 linux-next: manual merge of the xfs tree with the pidfd tree Stephen Rothwell
2021-02-14 22:41 ` Stephen Rothwell
2021-02-14 23:38 ` Darrick J. Wong
2021-02-21 22:56 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).