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

[Andrew Morton]

On Tue, 20 Oct 2026 06:45:16 -0600 Jens Axboe <axboe@xxxxxxxxx> wrote:

> On 10/20/26 6:27 AM, Mark Brown wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the block tree got a conflict in:
> > 
> >   block/bio.c
> > 
> > between commit:
> > 
> >   d4ee6948bcabb ("block: restore the iterator when rejecting a misaligned bio")
> > 
> > from the mm tree and commit:
> > 
> >   73a0ff6030afc ("block: fail a short atomic pin in bio_iov_iter_get_pages()")
> > 
> > from the block tree.
> 
> I suspected as much when I saw Andrew pick it up. Andrew, perhaps
> let's queue it where it belongs?

I was hoping to get some review feedback before sending it over
formally.

I'll send it now.