Re: FAILED: patch "[PATCH] crypto: xilinx-trng - Remove crypto_rng interface" failed to apply to 7.1-stable tree

Re: FAILED: patch "[PATCH] crypto: xilinx-trng - Remove crypto_rng interface" failed to apply to 7.1-stable tree

[Eric Biggers]

On Wed, Jul 15, 2026 at 12:16:01PM +0200, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 7.1-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-7.1.y
> git checkout FETCH_HEAD
> git cherry-pick -x 32b4d29280ed2a991dc196d5845b892acedc63b8
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026071501-handstand-curtain-592d@gregkh' --subject-prefix 'PATCH 7.1.y' 'HEAD^..'
> 
> Possible dependencies:

It actually cherry-picks cleanly.   And you also failed to Cc the
subsystem mailing list.

- Eric

Re: FAILED: patch "[PATCH] crypto: xilinx-trng - Remove crypto_rng interface" failed to apply to 7.1-stable tree

[Greg KH]

On Thu, Jul 16, 2026 at 07:18:31PM -0700, Eric Biggers wrote:
> On Wed, Jul 15, 2026 at 12:16:01PM +0200, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 7.1-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-7.1.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 32b4d29280ed2a991dc196d5845b892acedc63b8
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026071501-handstand-curtain-592d@gregkh' --subject-prefix 'PATCH 7.1.y' 'HEAD^..'
> > 
> > Possible dependencies:
> 
> It actually cherry-picks cleanly.

Odd, I got this error:
Hunk #2 FAILED at 13.

> And you also failed to Cc the subsystem mailing list.

We don't do that for stable FAILED emails, as that would just spam too
many lists too often.

thanks for the backports!

greg k-h

Re: FAILED: patch "[PATCH] crypto: xilinx-trng - Remove crypto_rng interface" failed to apply to 7.1-stable tree

[Eric Biggers]

On Fri, Jul 17, 2026 at 09:38:26AM +0200, Greg KH wrote:
> On Thu, Jul 16, 2026 at 07:18:31PM -0700, Eric Biggers wrote:
> > On Wed, Jul 15, 2026 at 12:16:01PM +0200, gregkh@linuxfoundation.org wrote:
> > > 
> > > The patch below does not apply to the 7.1-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-7.1.y
> > > git checkout FETCH_HEAD
> > > git cherry-pick -x 32b4d29280ed2a991dc196d5845b892acedc63b8
> > > # <resolve conflicts, build, test, etc.>
> > > git commit -s
> > > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026071501-handstand-curtain-592d@gregkh' --subject-prefix 'PATCH 7.1.y' 'HEAD^..'
> > > 
> > > Possible dependencies:
> > 
> > It actually cherry-picks cleanly.
> 
> Odd, I got this error:
> Hunk #2 FAILED at 13.

Use 'git cherry-pick', just like you're telling everyone else to do.

> > And you also failed to Cc the subsystem mailing list.
> 
> We don't do that for stable FAILED emails, as that would just spam too
> many lists too often.

They are part of the kernel development process and need to be sent to
the proper lists.

- Eric