From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Darrick J. Wong" <djwong@kernel.org>,
David Chinner <david@fromorbit.com>,
linux-xfs@vger.kernel.org
Cc: Christian Brauner <christian.brauner@ubuntu.com>,
Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the xfs tree with the pidfd tree
Date: Mon, 15 Feb 2021 09:41:31 +1100 [thread overview]
Message-ID: <20210215094131.7b47c1c5@canb.auug.org.au> (raw)
In-Reply-To: <20210208103348.1a0beef9@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2021-02-14 22:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2021-02-14 23:38 ` Darrick J. Wong
2021-02-21 22:56 ` 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=20210215094131.7b47c1c5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian.brauner@ubuntu.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).