From: Greg KH <gregkh@linuxfoundation.org>
To: bvanassche@acm.org, leon@kernel.org, yangx.jy@fujitsu.com
Cc: stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] RDMA/srp: Fix srp_abort()" failed to apply to 5.10-stable tree
Date: Mon, 16 Oct 2023 10:37:52 +0200 [thread overview]
Message-ID: <2023101640-knoll-iodize-ae6f@gregkh> (raw)
In-Reply-To: <2023101650-makeshift-gorged-fd92@gregkh>
On Mon, Oct 16, 2023 at 10:32:50AM +0200, gregkh@linuxfoundation.org wrote:
>
> The patch below does not apply to the 5.10-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
>
> To reproduce the conflict and resubmit, you may use the following commands:
>
> git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
> git checkout FETCH_HEAD
> git cherry-pick -x 6dbe4a8dead84de474483910b02ec9e6a10fc1a9
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2023101650-makeshift-gorged-fd92@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
>
> Possible dependencies:
>
> 6dbe4a8dead8 ("RDMA/srp: Fix srp_abort()")
> 9c5274eec75b ("scsi: RDMA/srp: Use scsi_cmd_to_rq() instead of scsi_cmnd.request")
> ad215aaea4f9 ("RDMA/srp: Make struct scsi_cmnd and struct srp_request adjacent")
> 7ec2e27a3aff ("RDMA/srp: Fix a recently introduced memory leak")
> 2b5715fc1738 ("RDMA/srp: Fix support for unpopulated and unbalanced NUMA nodes")
Nevermind, I fixed it up by hand, sorry for the noise.
greg k-h
prev parent reply other threads:[~2023-10-16 8:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 8:32 FAILED: patch "[PATCH] RDMA/srp: Fix srp_abort()" failed to apply to 5.10-stable tree gregkh
2023-10-16 8:37 ` Greg KH [this message]
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=2023101640-knoll-iodize-ae6f@gregkh \
--to=gregkh@linuxfoundation.org \
--cc=bvanassche@acm.org \
--cc=leon@kernel.org \
--cc=stable@vger.kernel.org \
--cc=yangx.jy@fujitsu.com \
/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