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 6B72B2E7621 for ; Fri, 20 Mar 2026 08:48:01 +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=1773996481; cv=none; b=egaT+wzjjeHdmETEq6nJgHKl701NtYPrxdB+jy58sF8aXuGM35r4+Jlwf2W7XMkfnUp//OpBGbytr6cl3O94q1KOPzuUUVEm1L38v2zuljmkKryGSMMFKEE/IdtrDZgQv81PFjyptZGbaQLhyqil47C0zujpnj77qDWceVKvwYA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773996481; c=relaxed/simple; bh=FrbzmRQA684c/XuC9UeSv3HY5asnFY4jocyEeDHZrT4=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=IMe15RWnrWpS/H9YC4HDzaPDSppR7MYNshPuehE4FITm1mhI19U/qtAEywLtRbXYBCxqll+n9lK5XxbLI2bmnQSyrfnXr3lzPv+GI1p56pxmLIXitNskPeBcld6hxo3P6FPW4Qx3MrbmBTaw3HU2momFBM5tsgZlaxF+hhtmFx0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XtX5pFrO; 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="XtX5pFrO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B27D6C4CEF7; Fri, 20 Mar 2026 08:48:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773996481; bh=FrbzmRQA684c/XuC9UeSv3HY5asnFY4jocyEeDHZrT4=; h=Subject:To:Cc:From:Date:From; b=XtX5pFrO7G8M2yzhifpRNyiouiB5EaywmFP4EjbmRqyGgqNDYXZyc2ULXXdj9u0Xl E/OMSzY2krzvtsHOJVEBMTfKW568F3DqK324yKKb7xU5FSFpTluFGhjhSJ/CtFylBj L0cQCmDz4WHYeiJXaoIfpydaT9B417JqyujI61jI= Subject: FAILED: patch "[PATCH] HID: appletb-kbd: add .resume method in PM" failed to apply to 6.12-stable tree To: gargaditya08@live.com,jkosina@suse.com Cc: From: Date: Fri, 20 Mar 2026 09:47:53 +0100 Message-ID: <2026032053-reviver-stock-9da2@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.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 . 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 # git commit -s git send-email --to '' --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 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);