From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 5EC76CDB465
	for <stable@archiver.kernel.org>; Mon, 16 Oct 2023 08:37:58 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S229666AbjJPIh6 (ORCPT <rfc822;stable@archiver.kernel.org>);
        Mon, 16 Oct 2023 04:37:58 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41888 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S229574AbjJPIh5 (ORCPT
        <rfc822;stable@vger.kernel.org>); Mon, 16 Oct 2023 04:37:57 -0400
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16C1DA2
        for <stable@vger.kernel.org>; Mon, 16 Oct 2023 01:37:56 -0700 (PDT)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DAC3C433C7;
        Mon, 16 Oct 2023 08:37:54 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org;
        s=korg; t=1697445475;
        bh=/7jfrFcvql6nFzQWqMkBtaWuAop1AwxjNIxKULDFV9s=;
        h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
        b=ko8fMPcgsSuwTvvwhxBFU7Y4aFPSelesK698kSyJYWTvpAhcS6ASfNRVeFbaRc1Rp
         gct14mm4tsNw6+lh1PEMlM9hPTAIAr2ZHgnkjxPKTXC3ZYioCLDWScfAryaDc0FJKl
         uBg/36aVnDmPfuRANAbXkmxXU4CG51DtBQFENtqk=
Date:   Mon, 16 Oct 2023 10:37:52 +0200
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
Message-ID: <2023101640-knoll-iodize-ae6f@gregkh>
References: <2023101650-makeshift-gorged-fd92@gregkh>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <2023101650-makeshift-gorged-fd92@gregkh>
Precedence: bulk
List-ID: <stable.vger.kernel.org>
X-Mailing-List: stable@vger.kernel.org

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