public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Alex Elder <elder@linaro.org>
Cc: kuba@kernel.org,
	"bjorn.andersson@linaro.org" <bjorn.andersson@linaro.org>,
	stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] net: ipa: request IPA register values be retained" failed to apply to 5.15-stable tree
Date: Sat, 5 Feb 2022 09:03:26 +0100	[thread overview]
Message-ID: <Yf4vTqtKLQ71O77S@kroah.com> (raw)
In-Reply-To: <b4a3db1e-9bee-5075-9b45-1e1dcc06869e@linaro.org>

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

  reply	other threads:[~2022-02-05  8:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-04  8:50 FAILED: patch "[PATCH] net: ipa: request IPA register values be retained" failed to apply to 5.15-stable tree gregkh
2022-02-04 21:41 ` Alex Elder
2022-02-05  8:03   ` Greg KH [this message]
2022-02-05 14:32     ` Alex Elder
2022-02-05 18:30       ` Greg KH
2022-02-07 16:23         ` Alex Elder

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=Yf4vTqtKLQ71O77S@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=elder@linaro.org \
    --cc=kuba@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