[GIT PULL] nvme fix for Linux 6.12
Jens Axboe
axboe at kernel.dk
Thu Nov 14 10:45:20 PST 2024
On 11/14/24 11:41 AM, Keith Busch wrote:
> On Thu, Nov 14, 2024 at 11:28:15AM -0700, Jens Axboe wrote:
>> On 11/14/24 11:19 AM, Keith Busch wrote:
>>> Same fix as the last week's nvme fix, but for nvme-multipath. It should
>>> have been included with our previous pull-request, but I did see the
>>> message in my queue until too late.
>>
>> Just to avoid yet another merge conflict, can we please just push this
>> to 6.13 instead and just mark it stable? We probably should've done that
>> with the other one as well, it's not like they are important fixes.
>
> I was sending this now because I thought it would make it easier for
> stable to pick up without having to back out unrelated 6.13 conflicts. I
> just tried to merge upstream with this and block-6.13, and it actually
> looks like there aren't any conflicts anywa, so it doesn't matter.
>
> So yes, let's drop this and I'll send it with the next nvme-6.13 pull
> request next week.
OK if it merges cleanly, then we may as well do it. I'll check in a
second.
--
Jens Axboe
More information about the Linux-nvme
mailing list