Re: [PATCH v6 0/6] nvme: add csi, ms and nuse to sysfs

Max Gurtovoy
2023-12-19T16:27:00Z

On 19/12/2023 18:07, Keith Busch wrote:
> On Tue, Dec 19, 2023 at 04:42:20PM +0200, Max Gurtovoy wrote:
>> Hi Keith,
>>
>> On 19/12/2023 0:55, Keith Busch wrote:
>>> On Mon, Dec 18, 2023 at 05:59:48PM +0100, Daniel Wagner wrote:
>>>> Rebased on the current nvme/nvme-6.8 branch and added the Review tags. Also
>>>> addressed the printk format issue pointed out by Chaitanya.
>>>
>>> Thanks, added to nvme-6.8.
>>
>> I'm rebasing my fixes to the PI bug (which are not trivial) on top of
>> nvme-6.8 and Daniel's series.
>> I've found that this branch is missing some fixes from the master that I've
>> added manually to local nvme-6.8 branch.
>> When do you plan to rebase the nvme-6.8 on top of master ?
>> It will be helpful, otherwise my patches will not apply cleanly on your
>> branch. :)
>
> linux-nvme pulls go through Jens' linux-block repo, so we have to be
> based on the appropriate branch from there. We already have some late
> fixes in 6.7 that create minor merge conflicts for our existing 6.8
> branch, so we may provide a reference resolution branch with the pull
> request if conflicts are non-trivial. That might be an option for your
> fixes if you can make them work atop existing nvme-6.8 without the
> conflicting 6.7 changes.
>
> Sometime after the next merge window opens, Jens will rebase his 6.8
> block tree to Linus', and we usually get a 2nd feature pull request
> within the merge window from that new baseline. That might be an option
> if you want to wait a couple more weeks.

I see. I think that after finishing the latest testing I'll send the
version on top of nvme-6.8 + my local branch patches I took from 6.7.
We will start the reviewing process and probably will converge in a week
or two. Then we will see what is the status of the linux-block repo and
decide how to continue.