FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree

FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree

[gregkh]

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);

Re: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree

[Aditya Garg]

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);
> 

Re: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree

[gregkh]

On Fri, Mar 20, 2026 at 09:01:27AM +0000, Aditya Garg wrote:
> The driver doesn't exist for kernels before 6.15 so it's not needed there.

Thanks for letting us know, but backports for newer kernels would be
appreciated :)

greg k-h

Re: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree

[Aditya Garg]

> On 20 Mar 2026, at 2:45 PM, gregkh@linuxfoundation.org wrote:
> 
> On Fri, Mar 20, 2026 at 09:01:27AM +0000, Aditya Garg wrote:
>> The driver doesn't exist for kernels before 6.15 so it's not needed there.
> 
> Thanks for letting us know, but backports for newer kernels would be
> appreciated :)

I have already sent them to the mailing list using the git send-email command mentioned in the email itself :)

Re: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree

[gregkh]

On Fri, Mar 20, 2026 at 09:17:52AM +0000, Aditya Garg wrote:
> 
> 
> > On 20 Mar 2026, at 2:45 PM, gregkh@linuxfoundation.org wrote:
> > 
> > On Fri, Mar 20, 2026 at 09:01:27AM +0000, Aditya Garg wrote:
> >> The driver doesn't exist for kernels before 6.15 so it's not needed there.
> > 
> > Thanks for letting us know, but backports for newer kernels would be
> > appreciated :)
> 
> I have already sent them to the mailing list using the git send-email command mentioned in the email itself :)

I think you forgot a step that added the git id to the changelog area :(

Re: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree

[Aditya Garg]

> On 20 Mar 2026, at 10:43 PM, gregkh@linuxfoundation.org wrote:
> 
> On Fri, Mar 20, 2026 at 09:17:52AM +0000, Aditya Garg wrote:
>> 
>> 
>>>> On 20 Mar 2026, at 2:45 PM, gregkh@linuxfoundation.org wrote:
>>> 
>>> On Fri, Mar 20, 2026 at 09:01:27AM +0000, Aditya Garg wrote:
>>>> The driver doesn't exist for kernels before 6.15 so it's not needed there.
>>> 
>>> Thanks for letting us know, but backports for newer kernels would be
>>> appreciated :)
>> 
>> I have already sent them to the mailing list using the git send-email command mentioned in the email itself :)
> 
> I think you forgot a step that added the git id to the changelog area :(

Should I resend the patch with the git id?

Re: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree

[gregkh]

On Fri, Mar 20, 2026 at 05:17:00PM +0000, Aditya Garg wrote:
> 
> 
> > On 20 Mar 2026, at 10:43 PM, gregkh@linuxfoundation.org wrote:
> > 
> > On Fri, Mar 20, 2026 at 09:17:52AM +0000, Aditya Garg wrote:
> >> 
> >> 
> >>>> On 20 Mar 2026, at 2:45 PM, gregkh@linuxfoundation.org wrote:
> >>> 
> >>> On Fri, Mar 20, 2026 at 09:01:27AM +0000, Aditya Garg wrote:
> >>>> The driver doesn't exist for kernels before 6.15 so it's not needed there.
> >>> 
> >>> Thanks for letting us know, but backports for newer kernels would be
> >>> appreciated :)
> >> 
> >> I have already sent them to the mailing list using the git send-email command mentioned in the email itself :)
> > 
> > I think you forgot a step that added the git id to the changelog area :(
> 
> Should I resend the patch with the git id?

Please do, thanks!

greg k-h

Re: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree

[Aditya Garg]

> On 20 Mar 2026, at 10:57 PM, gregkh@linuxfoundation.org wrote:
> 
> On Fri, Mar 20, 2026 at 05:17:00PM +0000, Aditya Garg wrote:
>> 
>> 
>>> On 20 Mar 2026, at 10:43 PM, gregkh@linuxfoundation.org wrote:
>>> 
>>> On Fri, Mar 20, 2026 at 09:17:52AM +0000, Aditya Garg wrote:
>>>> 
>>>> 
>>>>>> On 20 Mar 2026, at 2:45 PM, gregkh@linuxfoundation.org wrote:
>>>>> 
>>>>> On Fri, Mar 20, 2026 at 09:01:27AM +0000, Aditya Garg wrote:
>>>>>> The driver doesn't exist for kernels before 6.15 so it's not needed there.
>>>>> 
>>>>> Thanks for letting us know, but backports for newer kernels would be
>>>>> appreciated :)
>>>> 
>>>> I have already sent them to the mailing list using the git send-email command mentioned in the email itself :)
>>> 
>>> I think you forgot a step that added the git id to the changelog area :(
>> 
>> Should I resend the patch with the git id?
> 
> Please do, thanks!

Sorry for the late reply. For some reason Outlook is blocking all emails sent from you to my Inbox (they are not even in Junk). I stumbled upon this on the mailing list itself. Anyways, I just resubmitted the patch using the rules mentioned in Option 3 here https://www.kernel.org/doc/Documentation/process/stable-kernel-rules.rst

And the patch should be here: https://lore.kernel.org/stable/20260326145134.1371-1-gargaditya08@live.com/

Thanks
Aditya