On Mon, Oct 16, 2023 at 10:32:50AM +0200, gregkh@xxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxx>. > > 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@xxxxxxxxxxxxxxx>' --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
