From: Keith Busch <kbusch@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: hch@lst.de, sagi@grimberg.me, linux-nvme@lists.infradead.org
Subject: Re: [GIT PULL] nvme fix for Linux 6.12
Date: Thu, 14 Nov 2024 11:41:43 -0700 [thread overview]
Message-ID: <ZzZEZ2AJDl4U7vxl@kbusch-mbp> (raw)
In-Reply-To: <058d94f1-da1d-49d4-aeb9-10fda3069c99@kernel.dk>
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.
next prev parent reply other threads:[~2024-11-14 18:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-14 18:19 [GIT PULL] nvme fix for Linux 6.12 Keith Busch
2024-11-14 18:28 ` Jens Axboe
2024-11-14 18:41 ` Keith Busch [this message]
2024-11-14 18:45 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZzZEZ2AJDl4U7vxl@kbusch-mbp \
--to=kbusch@kernel.org \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox