From: John Hubbard <jhubbard@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>,
Jens Axboe <axboe@kernel.dk>
Cc: 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 mm tree with the block tree
Date: Thu, 1 Sep 2022 00:47:41 -0700 [thread overview]
Message-ID: <1a6632f1-5e23-5fb3-1af2-6d653e4338d4@nvidia.com> (raw)
In-Reply-To: <20220901161722.739d2013@canb.auug.org.au>
On 8/31/22 23:17, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mm tree got a conflict in:
>
> block/blk-map.c
>
> between commit:
>
> e88811bc43b9 ("block: use on-stack page vec for <= UIO_FASTIOV")
>
> from the block tree and commit:
>
> 2e9a2aa23dad ("block, bio, fs: convert most filesystems to pin_user_pages_fast()")
>
> from the mm tree.
>
> I fixed it up (I think - see below) and can carry the fix as
The fix up looks correct to me.
> 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.
>
Of the 7 patches in my series [1], the first two are in mm, and provide
some prerequisites. The remaining patches apply to block, bio, fs, and
iov_iter, and that's where this merge conflict happened.
Also, there's still some upcoming churn (more patchset revisions are
coming), as reviews are still active and this one isn't perfected yet.
So I see two obvious solutions. Either:
a) Only do the first two patches for now, and leave them in Andrew's
tree. After the next release, do the remaining 5 patches via the block
tree, or
b) Move the whole series to the block tree now, or
c) something else?
Andrew, Jens, any preference here?
[1] https://lore.kernel.org/r/20220831041843.973026-1-jhubbard@nvidia.com
thanks,
--
John Hubbard
NVIDIA
next prev parent reply other threads:[~2022-09-01 7:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 6:17 linux-next: manual merge of the mm tree with the block tree Stephen Rothwell
2022-09-01 7:47 ` John Hubbard [this message]
2022-09-01 14:10 ` Jens Axboe
2022-09-02 7:02 ` John Hubbard
2022-09-02 11:49 ` Jens Axboe
2022-09-02 13:58 ` Andrew Morton
2022-11-10 6:55 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=1a6632f1-5e23-5fb3-1af2-6d653e4338d4@nvidia.com \
--to=jhubbard@nvidia.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).