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: "Darrick J. Wong" <darrick.wong@oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the xfs tree with Linus' tree
Date: Tue, 18 Jan 2022 09:30:41 +1100 [thread overview]
Message-ID: <20220118093041.7d964a13@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 796 bytes --]
Hi all,
Today's linux-next merge of the xfs tree got a conflict in:
fs/xfs/xfs_ioctl.c
between commit:
983d8e60f508 ("xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate")
from Linus' tree and commit:
4d1b97f9ce7c ("xfs: kill the XFS_IOC_{ALLOC,FREE}SP* ioctls")
from the xfs tree.
I fixed it up (the latter removed the code modified by the former, so I
did that) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-01-17 22:30 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-17 22:30 Stephen Rothwell [this message]
2022-01-18 18:17 ` linux-next: manual merge of the xfs tree with Linus' tree Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2023-10-31 0:41 Stephen Rothwell
2022-03-30 22:00 Stephen Rothwell
2019-07-16 23:36 Stephen Rothwell
2018-10-31 0:22 Stephen Rothwell
2018-10-31 1:05 ` Dave Chinner
2018-06-05 0:34 Stephen Rothwell
2018-06-05 0:38 ` Stephen Rothwell
2018-06-05 0:59 ` Dave Chinner
2018-06-05 1:13 ` Andreas Grünbacher
2018-06-05 1:25 ` Stephen Rothwell
2017-12-21 22:50 Stephen Rothwell
2017-12-21 23:01 ` Darrick J. Wong
2016-07-21 1:07 Stephen Rothwell
2016-07-21 1:35 ` Dave Chinner
2015-04-20 2:24 Stephen Rothwell
2012-01-03 1:06 Stephen Rothwell
2012-01-03 1:34 ` Dave Chinner
2011-09-15 2:30 Stephen Rothwell
2011-09-15 11:05 ` Christoph Hellwig
2011-03-28 1:21 Stephen Rothwell
2009-08-18 0:12 Stephen Rothwell
2009-08-18 6:49 ` Felix Blyakher
2009-08-18 7:17 ` 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=20220118093041.7d964a13@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--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).