[lvc-project] [PATCH 6.1 1/3] Revert "RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task""

[Greg Kroah-Hartman]

On Fri, Jun 05, 2026 at 08:03:27PM +0300, Vladislav Nikolaev wrote:
> This reverts commit 3236221bb8e4de8e3d0c8385f634064fb26b8e38.
> 
> The reverted commit is an incomplete backport of upstream
> commit b2b1ddc45745. It added guards for req.task and comp.task
> cleanup, but missed resp.task cleanup and left it before the RC timer
> cleanup, unlike the upstream fix. Revert it first so the correct
> backport can be applied cleanly in the following patch.
> 
> Signed-off-by: Vladislav Nikolaev <vlad102nikolaev at gmail.com>
> ---
>  drivers/infiniband/sw/rxe/rxe_qp.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
> index 709c63e9773c..05e4a270084f 100644
> --- a/drivers/infiniband/sw/rxe/rxe_qp.c
> +++ b/drivers/infiniband/sw/rxe/rxe_qp.c
> @@ -788,11 +788,8 @@ static void rxe_qp_do_cleanup(struct work_struct *work)
>  		del_timer_sync(&qp->rnr_nak_timer);
>  	}
>  
> -	if (qp->req.task.func)
> -		rxe_cleanup_task(&qp->req.task);
> -
> -	if (qp->comp.task.func)
> -		rxe_cleanup_task(&qp->comp.task);
> +	rxe_cleanup_task(&qp->req.task);
> +	rxe_cleanup_task(&qp->comp.task);
>  
>  	/* flush out any receive wr's or pending requests */
>  	if (qp->req.task.func)
> -- 
> 2.43.0
> 

This series does not apply to the latest tree :(

Are you sure it is still needed?

thanks,

greg k-h