From: Greg KH <gregkh@linuxfoundation.org>
To: "Pali Rohár" <pali@kernel.org>
Cc: kabel@kernel.org, lorenzo.pieralisi@arm.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] PCI: aardvark: Increase polling delay to 1.5s while waiting" failed to apply to 5.10-stable tree
Date: Sun, 26 Sep 2021 16:07:50 +0200 [thread overview]
Message-ID: <YVB+tgg0Dzx/U+Gy@kroah.com> (raw)
In-Reply-To: <20210926135536.a6g2vxbnporfevvc@pali>
On Sun, Sep 26, 2021 at 03:55:36PM +0200, Pali Rohár wrote:
> On Sunday 26 September 2021 14:19:20 Greg KH wrote:
> > On Sat, Sep 25, 2021 at 11:46:39PM +0200, Pali Rohár wrote:
> > > On Wednesday 15 September 2021 18:52:43 Pali Rohár wrote:
> > > > On Wednesday 15 September 2021 16:38:07 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>.
> > > >
> > > > Hello! Below is backport for 5.10 (and probably it should apply also for
> > > > older versions):
> > >
> > > Hello Greg! Have you looked at this backport for 5.10?
> >
> > Ick, I somehow missed this for 5.10.y, thanks for catching it. I'll go
> > queue it up now.
>
> Ok!
>
> Now I'm checking other aardvark patches and I found out that following
> commits marked with Cc: stable tags are not included in 4.14 tree yet:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8ceeac307a79f68c0d0c72d6e48b82fa424204ec
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fcb461e2bc8b83b7eaca20cb2221e8b940f2189c
>
> And this in 4.19 stable tree:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fcb461e2bc8b83b7eaca20cb2221e8b940f2189c
>
> With merge.renamelimit = 24506 these commits applies cleanly for 4.14 /
> 4.19 stable trees. Could you look at it, why there are missing?
They are missing because I do not use renames when applying patches like
this (we use quilt for the patch queue).
If you can send the updated patches, I will be glad to queue them up.
thanks,
greg k-h
next prev parent reply other threads:[~2021-09-26 14:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 14:38 FAILED: patch "[PATCH] PCI: aardvark: Increase polling delay to 1.5s while waiting" failed to apply to 5.10-stable tree gregkh
2021-09-15 16:52 ` Pali Rohár
2021-09-25 21:46 ` Pali Rohár
2021-09-26 12:19 ` Greg KH
2021-09-26 13:55 ` Pali Rohár
2021-09-26 14:07 ` Greg KH [this message]
2021-09-26 14:26 ` Pali Rohár
2021-09-27 11:06 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YVB+tgg0Dzx/U+Gy@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=kabel@kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=pali@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox