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


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 <[email protected]>.

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 '<[email protected]>' --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 <[email protected]>
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.

[[email protected]: rebased on top of the pm_ptr() conversion]

Cc [email protected]

Signed-off-by Aditya Garg <[email protected]>

Signed-off-by Jiri Kosina <[email protected]>

drivers/hid/hid-appletb-kbd.c +3 -2

index a1db3b3d0667..0fdc0968b9ef 100644
@@ -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);

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

Quoted 1 line · Aditya Garg

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

Quoted 9 lines · On 20 Mar 2026, at 2:45 PM, [email protected] wrote:

Quoted 1 line · Aditya Garg

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

Quoted 5 lines · Aditya Garg

Quoted 5 lines

Quoted 3 lines · On 20 Mar 2026, at 2:45 PM, [email protected] wrote:

On Fri, Mar 20, 2026 at 09:01:27AM +0000, Aditya Garg wrote:

Quoted 6 lines

Quoted 4 lines

Quoted 1 line

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 :(

Quoted 12 lines · On 20 Mar 2026, at 10:43 PM, [email protected] wrote:

Quoted 7 lines · Aditya Garg

Quoted 7 lines

Quoted 3 lines · On 20 Mar 2026, at 2:45 PM, [email protected] wrote:

Quoted 1 line · Aditya Garg

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

Quoted 6 lines

Quoted 4 lines

Quoted 2 lines

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?

Quoted 15 lines · Aditya Garg

Quoted 15 lines · On 20 Mar 2026, at 10:43 PM, [email protected] wrote:

Quoted 10 lines · Aditya Garg

Quoted 9 lines

Quoted 3 lines · On 20 Mar 2026, at 2:45 PM, [email protected] wrote:

Quoted 1 line · Aditya Garg

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

Quoted 5 lines

Quoted 3 lines

Quoted 1 line

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!