From: Jens Axboe <axboe@kernel.dk>
To: John Hubbard <jhubbard@nvidia.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>
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: Fri, 2 Sep 2022 05:49:04 -0600 [thread overview]
Message-ID: <ae675a01-90e6-4af1-6c43-660b3a6c7b72@kernel.dk> (raw)
In-Reply-To: <87d96d36-fd13-2268-122b-fea806090942@nvidia.com>
On 9/2/22 1:02 AM, John Hubbard wrote:
> On 9/1/22 07:10, Jens Axboe wrote:
>>> 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?
>>
>> Would've been cleaner to take through the block tree given what
>> it touches, imho. Or at least base on that, so we'd avoid frivolous
>> conflicts like this.
>>
>
> OK, so I'm new to block, and my first guess at the right git tree
> and branch:
>
> git://git.kernel.dk/linux-block block-6.0
>
> doesn't seem to contain this one:
>
> e88811bc43b9 ("block: use on-stack page vec for <= UIO_FASTIOV")
>
> Can you point me to the right tree please?
That's because block-6.0 contains fixes for 6.0, it's not a 6.1 tree.
for-6.1/block is the pending 6.1 items, and for-next contains all my
branches merged for linux-next consumption.
> Once I know the right block tree to use, I could post the next version
> rebased on top of that. And plan to send it up through Jens' block tree,
> assuming that it continues to survive the reviews, that is.
>
> Andrew, is that OK with you? The first two patches will still get
> reviewed by mm, and they shouldn't conflict with mm, even if they
> go up through the block tree.
We can just make it a separate topic branch too, I often do that for
various items that are separate in nature and has overlap.
--
Jens Axboe
next prev parent reply other threads:[~2022-09-02 11: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
2022-09-01 14:10 ` Jens Axboe
2022-09-02 7:02 ` John Hubbard
2022-09-02 11:49 ` Jens Axboe [this message]
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=ae675a01-90e6-4af1-6c43-660b3a6c7b72@kernel.dk \
--to=axboe@kernel.dk \
--cc=akpm@linux-foundation.org \
--cc=jhubbard@nvidia.com \
--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).