On Wed, Sep 15, 2021 at 08:41:21PM +0800, Yi Zhang wrote: > On Tue, Sep 14, 2021 at 10:28 PM Sagi Grimberg <sagi@xxxxxxxxxxx> wrote: > > > > > > > Hello > > > I found this failure on stable 5.13.16-rc1[1] and cannot reproduce it > > > on 5.14, seems we are missing commit[2] on 5.13.y, could anyone help > > > check it? > > > > Was it picked up and didn't apply correctly? > > > > Hi Sagi > I tried apply that patch to stable branch, but failed to do that, > would you or Hannes mind help backport it, thanks. > > [linux-stable-rc ((daeb634aa75f...))]$ git am > 0001-nvme-fix-refcounting-imbalance-when-all-paths-are-do.patch > Applying: nvme: fix refcounting imbalance when all paths are down > error: patch failed: drivers/nvme/host/nvme.h:716 > error: drivers/nvme/host/nvme.h: patch does not apply > Patch failed at 0001 nvme: fix refcounting imbalance when all paths are down > hint: Use 'git am --show-current-patch' to see the failed patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > [linux-stable-rc ((daeb634aa75f...))]$ patch -p1 < > 0001-nvme-fix-refcounting-imbalance-when-all-paths-are-do.patch > patching file drivers/nvme/host/core.c > Hunk #1 succeeded at 3761 (offset -46 lines). > Hunk #2 succeeded at 3771 (offset -46 lines). > Hunk #3 succeeded at 3790 (offset -46 lines). > patching file drivers/nvme/host/multipath.c > Hunk #1 succeeded at 757 (offset -3 lines). > patching file drivers/nvme/host/nvme.h > Hunk #1 FAILED at 716. > Hunk #2 succeeded at 775 (offset 3 lines). > 1 out of 2 hunks FAILED -- saving rejects to file drivers/nvme/host/nvme.h.rej 5.13 is only going to be around for a 2-3 more days, please move to 5.14.y at this point in time. No need to do any extra work for 5.13.y at this point in time as it is about to be end-of-life. thanks, greg k-h
