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

From: Jens Axboe <[email-masked]>
Date: Mon, 13 May 2024 17:50:15 -0600

On 5/12/24 8:23 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the block tree got a conflict in:
> 
>   drivers/block/ublk_drv.c
> 
> between commit:
> 
>   eaf4a9b19b99 ("ublk: remove segment count and size limits")
> 
> from Linus' tree and commit:
> 
>   073341c3031b ("ublk_drv: set DMA alignment mask to 3")
> 
> from the block tree.

The block tree currently contains just that one pending patch, and I'll
pick it into a block-6.10 branch now that Linus has merged the other
bits. Hence this conflict will go away.

-- 
Jens Axboe