Received-SPF: pass (google.com: domain of linux-kernel+bounces-178187-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <a2a87d8c-eb92-497f-bd30-99840c9e0ff1@kernel.dk>
Date: Mon, 13 May 2024 17:50:15 -0600
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: manual merge of the block tree with Linus' tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>,
 Uday Shankar <ushankar@purestorage.com>
References: <20240513122334.135fef82@canb.auug.org.au>
Content-Language: en-US
From: Jens Axboe <axboe@kernel.dk>
In-Reply-To: <20240513122334.135fef82@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

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