public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Aditya Garg <gargaditya08@live.com>
To: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Cc: "jkosina@suse.com" <jkosina@suse.com>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree
Date: Fri, 20 Mar 2026 09:01:27 +0000	[thread overview]
Message-ID: <MAUPR01MB1154696DABA7DD9EE0D6E99D3B84CA@MAUPR01MB11546.INDPRD01.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <2026032053-reviver-stock-9da2@gregkh>

The driver doesn't exist for kernels before 6.15 so it's not needed there.

> On 20 Mar 2026, at 2:18 PM, gregkh@linuxfoundation.org wrote:
> 
> 
> 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 1965445e13c09b79932ca8154977b4408cb9610c
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2026032053-reviver-stock-9da2@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
> 
> Possible dependencies:
> 
> 
> 
> thanks,
> 
> greg k-h
> 
> ------------------ original commit in Linus's tree ------------------
> 
> From 1965445e13c09b79932ca8154977b4408cb9610c Mon Sep 17 00:00:00 2001
> From: Aditya Garg <gargaditya08@live.com>
> Date: Tue, 17 Feb 2026 02:54:46 +0530
> Subject: [PATCH] HID: appletb-kbd: add .resume method in PM
> 
> Upon resuming from suspend, the Touch Bar driver was missing a resume
> method in order to restore the original mode the Touch Bar was on before
> suspending. It is the same as the reset_resume method.
> 
> [jkosina@suse.com: rebased on top of the pm_ptr() conversion]
> Cc: stable@vger.kernel.org
> Signed-off-by: Aditya Garg <gargaditya08@live.com>
> Signed-off-by: Jiri Kosina <jkosina@suse.com>
> 
> diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c
> index a1db3b3d0667..0fdc0968b9ef 100644
> --- a/drivers/hid/hid-appletb-kbd.c
> +++ b/drivers/hid/hid-appletb-kbd.c
> @@ -476,7 +476,7 @@ static int appletb_kbd_suspend(struct hid_device *hdev, pm_message_t msg)
>    return 0;
> }
> 
> -static int appletb_kbd_reset_resume(struct hid_device *hdev)
> +static int appletb_kbd_resume(struct hid_device *hdev)
> {
>    struct appletb_kbd *kbd = hid_get_drvdata(hdev);
> 
> @@ -500,7 +500,8 @@ static struct hid_driver appletb_kbd_hid_driver = {
>    .event = appletb_kbd_hid_event,
>    .input_configured = appletb_kbd_input_configured,
>    .suspend = pm_ptr(appletb_kbd_suspend),
> -    .reset_resume = pm_ptr(appletb_kbd_reset_resume),
> +    .resume = pm_ptr(appletb_kbd_resume),
> +    .reset_resume = pm_ptr(appletb_kbd_resume),
>    .driver.dev_groups = appletb_kbd_groups,
> };
> module_hid_driver(appletb_kbd_hid_driver);
> 

  reply	other threads:[~2026-03-20  9:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-20  8:47 FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree gregkh
2026-03-20  9:01 ` Aditya Garg [this message]
2026-03-20  9:15   ` gregkh
2026-03-20  9:17     ` Aditya Garg
2026-03-20 17:13       ` gregkh
2026-03-20 17:17         ` Aditya Garg
2026-03-20 17:27           ` gregkh
2026-03-26 14:58             ` Aditya Garg

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=MAUPR01MB1154696DABA7DD9EE0D6E99D3B84CA@MAUPR01MB11546.INDPRD01.PROD.OUTLOOK.COM \
    --to=gargaditya08@live.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jkosina@suse.com \
    --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