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

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

[gregkh]

The patch below does not apply to the 6.18-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.18.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 '2026032051-flogging-glade-d6d9@gregkh' --subject-prefix 'PATCH 6.18.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);

[PATCH 6.18.y] HID: appletb-kbd: add .resume method in PM

[Aditya Garg]

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.

Cc: stable@vger.kernel.org
Signed-off-by: Aditya Garg <gargaditya08@live.com>
---
 drivers/hid/hid-appletb-kbd.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c
index b00687e67..0b10cff46 100644
--- a/drivers/hid/hid-appletb-kbd.c
+++ b/drivers/hid/hid-appletb-kbd.c
@@ -477,7 +477,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);
 
@@ -503,7 +503,8 @@ static struct hid_driver appletb_kbd_hid_driver = {
 	.input_configured = appletb_kbd_input_configured,
 #ifdef CONFIG_PM
 	.suspend = appletb_kbd_suspend,
-	.reset_resume = appletb_kbd_reset_resume,
+	.resume = appletb_kbd_resume,
+	.reset_resume = appletb_kbd_resume,
 #endif
 	.driver.dev_groups = appletb_kbd_groups,
 };
-- 
2.52.0

Re: [PATCH 6.18.y] HID: appletb-kbd: add .resume method in PM

[Greg KH]

On Fri, Mar 20, 2026 at 08:58:47AM +0000, Aditya Garg wrote:
> 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.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Aditya Garg <gargaditya08@live.com>
> ---
>  drivers/hid/hid-appletb-kbd.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c
> index b00687e67..0b10cff46 100644
> --- a/drivers/hid/hid-appletb-kbd.c
> +++ b/drivers/hid/hid-appletb-kbd.c
> @@ -477,7 +477,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);
>  
> @@ -503,7 +503,8 @@ static struct hid_driver appletb_kbd_hid_driver = {
>  	.input_configured = appletb_kbd_input_configured,
>  #ifdef CONFIG_PM
>  	.suspend = appletb_kbd_suspend,
> -	.reset_resume = appletb_kbd_reset_resume,
> +	.resume = appletb_kbd_resume,
> +	.reset_resume = appletb_kbd_resume,
>  #endif
>  	.driver.dev_groups = appletb_kbd_groups,
>  };
> -- 
> 2.52.0
> 
> 

What is the git id of this change?

thanks,

greg k-h

Re: [PATCH 6.18.y] HID: appletb-kbd: add .resume method in PM

[Aditya Garg]

> On 20 Mar 2026, at 10:34 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> 
> On Fri, Mar 20, 2026 at 08:58:47AM +0000, Aditya Garg wrote:
>> 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.
>> 
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Aditya Garg <gargaditya08@live.com>
>> ---
>> drivers/hid/hid-appletb-kbd.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>> 
>> diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c
>> index b00687e67..0b10cff46 100644
>> --- a/drivers/hid/hid-appletb-kbd.c
>> +++ b/drivers/hid/hid-appletb-kbd.c
>> @@ -477,7 +477,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);
>> 
>> @@ -503,7 +503,8 @@ static struct hid_driver appletb_kbd_hid_driver = {
>>    .input_configured = appletb_kbd_input_configured,
>> #ifdef CONFIG_PM
>>    .suspend = appletb_kbd_suspend,
>> -    .reset_resume = appletb_kbd_reset_resume,
>> +    .resume = appletb_kbd_resume,
>> +    .reset_resume = appletb_kbd_resume,
>> #endif
>>    .driver.dev_groups = appletb_kbd_groups,
>> };
>> --
>> 2.52.0
>> 
>> 
> 
> What is the git id of this change?

Upstream commit 1965445e13c09b79932ca8154977b4408cb9610c if that's what you meant.
> 
> thanks,
> 
> greg k-h