Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Cristian Marussi <cristian.marussi@arm.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Cristian Marussi <cristian.marussi@arm.com>, stable@vger.kernel.org
Subject: Re: [PATCH 6.6.y] firmware: arm_scmi: Add missing definition of info reference
Date: Fri, 9 May 2025 15:22:22 +0100	[thread overview]
Message-ID: <aB4PnqeXehOD0VPz@pluto> (raw)
In-Reply-To: <2025050920-aide-squire-5a2e@gregkh>

On Fri, May 09, 2025 at 03:45:26PM +0200, Greg KH wrote:
> On Fri, May 09, 2025 at 12:44:22PM +0100, Cristian Marussi wrote:
> > Add the missing definition that caused a build break.
> > 
> > Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
> > ---
> >  drivers/firmware/arm_scmi/driver.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
> > index 609fbf4563ff..3f3701ed196e 100644
> > --- a/drivers/firmware/arm_scmi/driver.c
> > +++ b/drivers/firmware/arm_scmi/driver.c
> > @@ -1044,6 +1044,8 @@ static int scmi_wait_for_reply(struct device *dev, const struct scmi_desc *desc,
> >  		 */
> >  		if (!desc->sync_cmds_completed_on_ret) {
> >  			bool ooo = false;
> > +			struct scmi_info *info =
> > +				handle_to_scmi_info(cinfo->handle);
> >  
> >  			/*
> >  			 * Poll on xfer using transport provided .poll_done();
> > -- 
> > 2.39.5
> > 

Hi Greg,

> > 
> 
> <formletter>
> 
> This is not the correct way to submit patches for inclusion in the
> stable kernel tree.  Please read:
>     https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
> for how to do this properly.

..oh...I know...but from the FAILED report that I received related to the
fact that the patch did not apply cleanly...

https://lore.kernel.org/all/2025050930-scuba-spending-0eb9@gregkh/

---
The patch below does not apply to the 6.6-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-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x c23c03bf1faa1e76be1eba35bad6da6a2a7c95ee
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025050930-scuba-spending-0eb9@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..

Possible dependencies:
----

...my (mis-)understanding was that you wanted some sort of diff on top
of that the bad non-applying patch ('git commit -s') instead of fresh new
poeprly backported patch....thing which, indeed, seemed weird :P

I'll resend following the proper procedure.

Sorry for the noise.

Thanks,
Cristian

  reply	other threads:[~2025-05-09 14:22 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-09  8:53 FAILED: patch "[PATCH] firmware: arm_scmi: Fix timeout checks on polling path" failed to apply to 6.6-stable tree gregkh
2025-05-09 11:44 ` [PATCH 6.6.y] firmware: arm_scmi: Add missing definition of info reference Cristian Marussi
2025-05-09 13:45   ` Greg KH
2025-05-09 14:22     ` Cristian Marussi [this message]
2025-05-12 18:04   ` Sasha Levin

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=aB4PnqeXehOD0VPz@pluto \
    --to=cristian.marussi@arm.com \
    --cc=gregkh@linuxfoundation.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