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 EB5D3284693 for ; Fri, 20 Mar 2026 08:48:17 +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=1773996498; cv=none; b=te+tnf4jrb9mn53e1oKa8oEWHH2EW0gpDTQgziDJAzRdvcNg0lOOsOnI6rZUaFN4X1rqUMp8UqM7F2mcETqwvGCVNuVD6yq6SKHId6LeX06O4zYTkOoApcY5bAOCN2NrtqOSvnE00SIIwHEB/mGMos/1U/fR/pg0YaNSHV+Sqv0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773996498; c=relaxed/simple; bh=p22TIIL5mf2EDg2iL+lEgdaizJ1ZHx+hDTxq41H8a7o=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=mJXPonr3CN3xBe0yBIEX04fijhqBIc5ZFq9+oGDmAnQGE0iwEmPQFY3PJ+pe0qAN4FUQk6+uCQLCr7jGSPXks75imWrCwMl3QYDs23PoYLObGSR3F/fTuLf+l1Xv7vPhKRHV5R+SBTrUiNocPL6Yg4mQdpSOpJM/Ih8xCRlLXFQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=iq4ks3nq; 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="iq4ks3nq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1953FC4CEF7; Fri, 20 Mar 2026 08:48:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773996497; bh=p22TIIL5mf2EDg2iL+lEgdaizJ1ZHx+hDTxq41H8a7o=; h=Subject:To:Cc:From:Date:From; b=iq4ks3nqGaBCis711Wh0QeSKSOE/zy/KkxCGBL7y+iFcvsh/GHllARx/GQG309+gt WbJi9hwv7xTB4dHlZTJ9+jkUZ8R0lf3Unlpxe8VPPPezjTzvKkYxfoFWuQPKkWTbl9 p6M8ziA/F+lNnl8G4uu61tE4i7k6vK8g4vSt9gqQ= Subject: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 5.10-stable tree To: gargaditya08@live.com,jkosina@suse.com Cc: From: Date: Fri, 20 Mar 2026 09:48:02 +0100 Message-ID: <2026032002-nutrient-founding-21d0@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 5.10-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-5.10.y git checkout FETCH_HEAD git cherry-pick -x 1965445e13c09b79932ca8154977b4408cb9610c # git commit -s git send-email --to '' --in-reply-to '2026032002-nutrient-founding-21d0@gregkh' --subject-prefix 'PATCH 5.10.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);