Re: FAILED: patch "[PATCH] rust: lockdep: Remove support for dynamically allocated" failed to apply to 6.6-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Tue, Mar 18, 2025 at 10:59:58AM -0700, Boqun Feng wrote:
> Hi Greg,
> 
> On Sun, Mar 16, 2025 at 08:15:32AM +0100, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 6.6-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-6.6.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 966944f3711665db13e214fef6d02982c49bb972
> 
> It's weird because `cherry-pick` works for me:
> 
> $ git cherry-pick -x 966944f3711665db13e214fef6d02982c49bb972
> Auto-merging rust/kernel/sync.rs
> [stable-6.6 f5771e91eac3] rust: lockdep: Remove support for dynamically allocated LockClassKeys
>  Author: Mitchell Levy <levymitchell0@gmail.com>
>  Date: Fri Mar 7 15:27:00 2025 -0800
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> my base is 594a1dd5138a ("Linux 6.6.83").
> 
> I checked the original commit in Linus' tree, it removes the `impl
> Default` which doesn't exist in 6.6, however it seems my `cherry-pick`
> can realise and fix this! Anyway I will send the fixed patch soon.

Yeah, git is smart, patch is not:

patching file rust/kernel/sync.rs
Hunk #1 FAILED at 30.
1 out of 1 hunk FAILED -- rejects in file rust/kernel/sync.rs

:(

thanks for the fixup.

greg k-h