6.17 block tree rebased

6.17 block tree rebased

[Jens Axboe]

Hi,

As per discussion last week for ublk, I've rebased the block branch
for-6.17/block to be based on v6.16-rc4 to avoid a bunch of issues on
the ublk side.

For ublk, could you folks please check the end results?

For others, just a heads-up if you had a tree based on the block tree,
then please do rebase it as well.

Sorry for the trouble!

-- 
Jens Axboe

Re: 6.17 block tree rebased

[Ming Lei]

Hi Jens,

On Mon, Jun 30, 2025 at 04:08:29PM -0600, Jens Axboe wrote:
> Hi,
> 
> As per discussion last week for ublk, I've rebased the block branch
> for-6.17/block to be based on v6.16-rc4 to avoid a bunch of issues on
> the ublk side.
> 
> For ublk, could you folks please check the end results?

Thanks for the rebase.

We have merged commit 4c8a951787ff ("ublk: setup ublk_io correctly in case of
ublk_get_data() failure") to -rc4, commit c5adc2714c2c ("ublk: move ublk_prep_cancel()
to case UBLK_IO_COMMIT_AND_FETCH_REQ") becomes not correct any more, can you drop it
from for-6.17/block?

Otherwise, the ublk rebase is good.

Thanks,
Ming

Re: 6.17 block tree rebased

[Jens Axboe]

On 6/30/25 8:02 PM, Ming Lei wrote:
> Hi Jens,
> 
> On Mon, Jun 30, 2025 at 04:08:29PM -0600, Jens Axboe wrote:
>> Hi,
>>
>> As per discussion last week for ublk, I've rebased the block branch
>> for-6.17/block to be based on v6.16-rc4 to avoid a bunch of issues on
>> the ublk side.
>>
>> For ublk, could you folks please check the end results?
> 
> Thanks for the rebase.
> 
> We have merged commit 4c8a951787ff ("ublk: setup ublk_io correctly in case of
> ublk_get_data() failure") to -rc4, commit c5adc2714c2c ("ublk: move ublk_prep_cancel()
> to case UBLK_IO_COMMIT_AND_FETCH_REQ") becomes not correct any more, can you drop it
> from for-6.17/block?

Done

> Otherwise, the ublk rebase is good.

Thanks for checking!

-- 
Jens Axboe

Re: 6.17 block tree rebased

[Caleb Sander Mateos]

On Mon, Jun 30, 2025 at 10:02 PM Ming Lei <ming.lei@redhat.com> wrote:
>
> Hi Jens,
>
> On Mon, Jun 30, 2025 at 04:08:29PM -0600, Jens Axboe wrote:
> > Hi,
> >
> > As per discussion last week for ublk, I've rebased the block branch
> > for-6.17/block to be based on v6.16-rc4 to avoid a bunch of issues on
> > the ublk side.
> >
> > For ublk, could you folks please check the end results?
>
> Thanks for the rebase.
>
> We have merged commit 4c8a951787ff ("ublk: setup ublk_io correctly in case of
> ublk_get_data() failure") to -rc4, commit c5adc2714c2c ("ublk: move ublk_prep_cancel()
> to case UBLK_IO_COMMIT_AND_FETCH_REQ") becomes not correct any more, can you drop it
> from for-6.17/block?

Indeed, I noticed this too but didn't have time to rebase my patches
before I left for a week. I agree with dropping that commit.

Thank you both,
Caleb