Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Armin Wolf <W_Armin@gmx.de>
Cc: ilpo.jarvinen@linux.intel.com, lkml@antheas.dev, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] platform/x86: msi-wmi-platform: Workaround a ACPI firmware" failed to apply to 6.12-stable tree
Date: Tue, 22 Apr 2025 09:39:41 +0200	[thread overview]
Message-ID: <2025042201-botanist-hassle-a21b@gregkh> (raw)
In-Reply-To: <c479afca-a994-4a65-a7c5-7fb53b2d38e9@gmx.de>

On Tue, Apr 22, 2025 at 12:07:23AM +0200, Armin Wolf wrote:
> Am 21.04.25 um 16:03 schrieb gregkh@linuxfoundation.org:
> 
> > The patch below does not apply to the 6.12-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.12.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x baf2f2c2b4c8e1d398173acd4d2fa9131a86b84e
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025042139-decimeter-dislike-3ca4@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> > 
> > Possible dependencies:
> 
> Hi,
> 
> this patch depends on 912d614ac99e ("platform/x86: msi-wmi-platform: Rename "data" variable"). I thought that i signaled that
> by using the "Cc: stable@vger.kernel.org # 6.x.x:" tag.
> 
> Where did i mess up?

You didn't, I missed that, sorry.

I've fixed this up for 6.12.y and 6.14.y, but both of these commits do
not apply to 6.6.y at all (filenames are wrong.)

Please send backports for 6.6.y if you want to see the commit there.

thanks,

greg k-h

  reply	other threads:[~2025-04-22  7:39 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-21 14:03 FAILED: patch "[PATCH] platform/x86: msi-wmi-platform: Workaround a ACPI firmware" failed to apply to 6.12-stable tree gregkh
2025-04-21 22:07 ` Armin Wolf
2025-04-22  7:39   ` Greg KH [this message]
2025-04-22 23:30     ` Armin Wolf

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=2025042201-botanist-hassle-a21b@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=W_Armin@gmx.de \
    --cc=ilpo.jarvinen@linux.intel.com \
    --cc=lkml@antheas.dev \
    --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