Re: FAILED: patch "[PATCH] nfsd: lock_rename() needs both directories to live on the" failed to apply to 5.4-stable tree

On Sat, Oct 28, 2023 at 02:50:32AM +0100, Al Viro wrote:

On Fri, Oct 27, 2023 at 02:18:01PM +0200, gregkh@linuxfoundation.org wrote:

...

The patch below does not apply to the 5.4-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.

Trivial context change in that one, really. The if (...) following the second chunk has changed; git cherry-pick is unhappy about it. See below for rebased diff (identical to the original except for the post-chunk context):

Thanks, all now queued up.

greg k-h