From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF1F1284693 for ; Fri, 20 Mar 2026 08:48:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773996490; cv=none; b=mq6UL/TBi3kAyCw1qiP9jnpjnoBfN88x51Zo7dkJUtoa8h1oLHVBxWR3CpNyJq2wdTinVGNwOSxxJ+UjJQ7dVoOtEeWb45+GWduJndo1/KtsNR4LUaJ+zteOxBNXwJtzixzZWu7k9becOImfjQ2Yv4oVgdGmwP7RfRLeZtZSfrw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773996490; c=relaxed/simple; bh=+HEj9AtUdWjdK8fhcfyJcJ/AH6vHEW24GV+Yyj/kIXY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=YxIvoVebc5cyJK8F6sH+7H+Cky/vRuUQWlYraR7Z/Ff0x8GRzfQzz5EBApwagOAdTT7SeADjQCLy8/NybfuEN4wRHBO0EFwS9zS1Z8Bl/cHkWZjBcf/YClliuPtJI4+55Bzh0xOFCHdcTL6ABfz1iAMrTJVDpDry3Iux5uu9CBo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Wf4JROMe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Wf4JROMe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09523C4CEF7; Fri, 20 Mar 2026 08:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773996490; bh=+HEj9AtUdWjdK8fhcfyJcJ/AH6vHEW24GV+Yyj/kIXY=; h=Subject:To:Cc:From:Date:From; b=Wf4JROMepuMY+k8zPA4wqrG2xEzwDfULPasksSAbeSqH8HUcn8Z1ywSkLLFXVSsp9 70jrLTQ3G/aekYq50F24PlASb5tfUHBYYDmNuv3ZN4v28j69MP6QNFFYF2Ka+gtWwk QR63V78quxoVTeR17q0vtROqp8DUAq47/ElM4Gik= Subject: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.1-stable tree To: gargaditya08@live.com,jkosina@suse.com Cc: From: Date: Fri, 20 Mar 2026 09:47:58 +0100 Message-ID: <2026032057-starving-daily-c643@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-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 . 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.1.y git checkout FETCH_HEAD git cherry-pick -x 1965445e13c09b79932ca8154977b4408cb9610c # git commit -s git send-email --to '' --in-reply-to '2026032057-starving-daily-c643@gregkh' --subject-prefix 'PATCH 6.1.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 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 Signed-off-by: Jiri Kosina 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);