Subject: Re: linux-next: manual merge of the block tree with the mm tree

From: Jens Axboe <[email-masked]>
Date: Fri, 16 Jun 2023 10:07:36 -0600

On 6/16/23 3:56?AM, David Howells wrote:
> Andrew Morton <[email-masked]> wrote:
> 
>> That's getting a bit nasty.  Maybe David's patches are in the wrong
>> tree.
> 
> You'd need to discuss that one with Jens.  The patches you'd have to
> transfer also touch a number of block-related files.  Looking at
> block/for-next, there don't seem to be many other patches touching
> those files, but I've seen patches from Christoph that will need to be
> applied on top of mine.

It's definitely a bit of a mess now, but for-6.5/block also depends on
these changes and make further tweaks on the block front.

for-6.5/splice is stable, so just pull that in?

-- 
Jens Axboe