Re: FAILED: patch "[PATCH] net: ipa: request IPA register values be retained" failed to apply to 5.15-stable tree

Greg KH
2022-02-05T08:03:40Z

On Fri, Feb 04, 2022 at 03:41:20PM -0600, Alex Elder wrote:
> On 2/4/22 2:50 AM, gregkh@linuxfoundation.org wrote:
> >
> > The patch below does not apply to the 5.15-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>.
>
> I just tried to apply this patch on v5.15.19 and it applied
> cleanly for me.
>
> ----------------
>
> {2314} elder@presto-> git checkout -b test
> Switched to a new branch 'test'
> {2315} elder@presto-> git reset --hard v5.15.19
> HEAD is now at 47cccb1eb2fec Linux 5.15.19
> {2316} elder@presto-> git cherry-pick -x
> 34a081761e4e3c35381cbfad609ebae2962fe2f8
> [test 71a06f5acbb05] net: ipa: request IPA register values be retained
> Date: Tue Feb 1 09:02:05 2022 -0600
> 3 files changed, 64 insertions(+)
> {2317} elder@presto-> git log --oneline -2
> 71a06f5acbb05 (HEAD -> test) net: ipa: request IPA register values be
> retained
> 47cccb1eb2fec (tag: v5.15.19, stable/linux-5.15.y) Linux 5.15.19
> {2318} elder@presto->
>
> ----------------
>
> I don't understand. If you know that I'm doing something wrong,
> can you let me know what it might be?

It fails to build :)

> While I have your attention on this, there is another commit
> that should be back-ported with this. It did not have the
> "Fixes" tag, unfortunately.
>
> Bjorn has committed it in the "arm64-for-5.18" branch in the
> Qualcomm repository:
> git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
> 73419e4d2fd1b arm64: dts: qcom: add IPA qcom,qmp property
>
> He says he has no plans to rebase this branch before it gets
> pulled.
>
> I can send a followup message when that commit lands in v5.18-rc1,
> but it might be simplest to take care of it now.

According to the stable rules, I have to wait until it hits Linus's tree
before I can add it to a stable release.

So if this is a bugfix that everyone needs, it should go to Linus before
5.17-final is out.

thanks,

greg k-h