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

Alex Elder
2022-02-07T16:36:51Z

On 2/5/22 12:30 PM, Greg KH wrote:
> On Sat, Feb 05, 2022 at 08:32:30AM -0600, Alex Elder wrote:
>> On 2/5/22 2:03 AM, Greg KH wrote:
>>> 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 :)
>>
>> Oh! Well that's different! Sorry about that, I'll spend
>> a little more time on this I guess...
>
> It was a "include file not found" type of error if I remember correctly.

OK, yes, I did discover the build problem. And it can be
easily fixed with one more prerequisite commit.

HOWEVER, there is a "matching" DTS patch that won't land
in Linus' master branch until v5.18-rc1, so I'll have to
get back to you on that later anyway.

Which means you can simply drop my attempted 5.15 back-port
from your queue (if you haven't already...).

Thanks, and sorry for the noise.

-Alex