FAILED: patch "[PATCH] Input: atkbd - skip deactivate for HONOR ZQC-P" failed to apply to 6.18-stable tree
Subsystems (2)
[email protected]
maintainerThe 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 <[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.18.y
git checkout FETCH_HEAD
git cherry-pick -x 410c44b1096789d0c40fbee706520e981dba7bc1
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026082021-ungraded-halves-33f6@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 410c44b1096789d0c40fbee706520e981dba7bc1 Mon Sep 17 00:00:00 2001
From: Donglin Lyu <[email protected]>
Date: Sun, 2 Aug 2026 15:37:18 -0700
Subject: [PATCH] Input: atkbd - skip deactivate for HONOR ZQC-P
The internal keyboard on the HONOR ZQC-P (HONOR MagicBook Pro 14 2026) does not work after boot.
Using the kernel command line 'i8042.dumbkbd=1' makes the keyboard functional, but the CapsLock LED does not work. Adding the 'atkbd_deactivate_fixup' quirk fixes the keyboard and CapsLock LED natively without requiring boot parameters.
DMI: HONOR ZQC-P/ZQC-P-PCB, BIOS 1.09 03/19/2026
drivers/input/keyboard/atkbd.c +15 -7
@@ -1916,6 +1916,13 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { }, .callback = atkbd_deactivate_fixup, }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"HONOR" ), + DMI_MATCH(DMI_PRODUCT_NAME, "BCC-N"), + }, + .callback = atkbd_deactivate_fixup, + }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "HONOR"),
@@ -1923,6 +1930,14 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { }, .callback = atkbd_deactivate_fixup, }, + { +/* HONOR MagicBook Pro 14 2026 */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"HONOR" ), + DMI_MATCH(DMI_PRODUCT_NAME, "ZQC-P"), + }, + .callback = atkbd_deactivate_fixup, + }, {/* Lenovo Yoga Air 14 (83QK) */ .matches = {
@@ -1931,13 +1946,6 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { }, .callback = atkbd_deactivate_fixup, }, - { - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"HONOR" ), - DMI_MATCH(DMI_PRODUCT_NAME, "BCC-N"), - }, - .callback = atkbd_deactivate_fixup, - }, {/* Xiaomi Book Pro 14 (TM2424) */ .matches = {
Sasha Levin
maintainerPATCH 1/2 Input: atkbd - skip deactivate for HONOR FMB-P's internal keyboard
From: Cryolitia PukNgae <[email protected]>
[ Upstream commit 2aaf33c6e1e82561d7dce2345298a985a2483266 ]
After commit 9cf6e24c9fbf17e52de9fff07f12be7565ea6d61 ("Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID"), HONOR FMB-P, aka HONOR MagicBook Pro 14 2025's internal keyboard stops working. Adding the atkbd_deactivate_fixup quirk fixes it.
DMI: HONOR FMB-P/FMB-P-PCB, BIOS 1.13 05/08/2025
Stable-dep-of: 410c44b10967 ("Input: atkbd - skip deactivate for HONOR ZQC-P")
--- drivers/input/keyboard/atkbd.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/keyboard/atkbd.c +7 -0
@@ -1937,6 +1937,13 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { }, .callback = atkbd_deactivate_fixup, }, + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"HONOR" ), + DMI_MATCH(DMI_PRODUCT_NAME, "FMB-P"), + }, + .callback = atkbd_deactivate_fixup, + }, {/* Lenovo Yoga Air 14 (83QK) */ .matches = {
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 Input: atkbd - skip deactivate for HONOR ZQC-P
From: Donglin Lyu <[email protected]>
[ Upstream commit 410c44b1096789d0c40fbee706520e981dba7bc1 ]
The internal keyboard on the HONOR ZQC-P (HONOR MagicBook Pro 14 2026) does not work after boot.
Using the kernel command line 'i8042.dumbkbd=1' makes the keyboard functional, but the CapsLock LED does not work. Adding the 'atkbd_deactivate_fixup' quirk fixes the keyboard and CapsLock LED natively without requiring boot parameters.
DMI: HONOR ZQC-P/ZQC-P-PCB, BIOS 1.09 03/19/2026
--- drivers/input/keyboard/atkbd.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/input/keyboard/atkbd.c +13 -5
@@ -1940,22 +1940,30 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "HONOR"), - DMI_MATCH(DMI_PRODUCT_NAME, "FMB-P"), + DMI_MATCH(DMI_PRODUCT_NAME, "BCC-N"), }, .callback = atkbd_deactivate_fixup, }, { - /* Lenovo Yoga Air 14 (83QK) */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_NAME, "83QK"), + DMI_MATCH(DMI_SYS_VENDOR, "HONOR"), + DMI_MATCH(DMI_PRODUCT_NAME, "FMB-P"), }, .callback = atkbd_deactivate_fixup, }, { + /* HONOR MagicBook Pro 14 2026 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "HONOR"), - DMI_MATCH(DMI_PRODUCT_NAME, "BCC-N"), + DMI_MATCH(DMI_PRODUCT_NAME, "ZQC-P"), + }, + .callback = atkbd_deactivate_fixup, + }, + { + /* Lenovo Yoga Air 14 (83QK) */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "83QK"), }, .callback = atkbd_deactivate_fixup, },
Signature · 1 line
2.53.0
Greg KH
maintainerRe: [PATCH 6.18.y 2/2] Input: atkbd - skip deactivate for HONOR ZQC-P
Quoted 22 lines · Sasha Levin
From: Donglin Lyu <[email protected]>
[ Upstream commit
410c44b1096789d0c40fbee706520e981dba7bc1]The internal keyboard on the HONOR ZQC-P (HONOR MagicBook Pro 14 2026) does not work after boot.
Using the kernel command line 'i8042.dumbkbd=1' makes the keyboard functional, but the CapsLock LED does not work. Adding the '
atkbd_deactivate_fixup' quirk fixes the keyboard and CapsLock LED natively without requiring boot parameters.DMI: HONOR ZQC-P/ZQC-P-PCB, BIOS 1.09 03/19/2026
Fixes 9cf6e24c9fbf ("Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID")Signed-off-by Donglin Lyu <[email protected]>Tested-by Ruslan Shevchenko <[email protected]>[dtor: keep all HONOR entries together]Signed-off-by Dmitry Torokhov <[email protected]>Signed-off-by Sasha Levin <[email protected]>
Quoted 3 lines
--- drivers/input/keyboard/atkbd.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
Did I miss a patch 1/2 for this?
And this patch differs a lot from the original, why not just backport the id table changes that were done in the meantime instead?
thanks,
greg k-h
Greg KH
maintainerRe: [PATCH 6.18.y 2/2] Input: atkbd - skip deactivate for HONOR ZQC-P
Quoted 27 lines · Greg KH
Quoted 22 lines · Sasha Levin
From: Donglin Lyu <[email protected]>
[ Upstream commit
410c44b1096789d0c40fbee706520e981dba7bc1]The internal keyboard on the HONOR ZQC-P (HONOR MagicBook Pro 14 2026) does not work after boot.
Using the kernel command line 'i8042.dumbkbd=1' makes the keyboard functional, but the CapsLock LED does not work. Adding the '
atkbd_deactivate_fixup' quirk fixes the keyboard and CapsLock LED natively without requiring boot parameters.DMI: HONOR ZQC-P/ZQC-P-PCB, BIOS 1.09 03/19/2026
Fixes 9cf6e24c9fbf ("Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID")Signed-off-by Donglin Lyu <[email protected]>Tested-by Ruslan Shevchenko <[email protected]>[dtor: keep all HONOR entries together]Signed-off-by Dmitry Torokhov <[email protected]>Signed-off-by Sasha Levin <[email protected]>Quoted 3 lines
--- drivers/input/keyboard/atkbd.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
Quoted 1 line
Did I miss a patch 1/2 for this?
Now it showed up, sorry for doubting it...
Quoted 2 lines
And this patch differs a lot from the original, why not just backport the id table changes that were done in the meantime instead?
But this still stands.
Sasha Levin
maintainerRe: [PATCH 6.18.y 2/2] Input: atkbd - skip deactivate for HONOR ZQC-P
In reply to Greg KHQuoted 2 lines · Greg KH
And this patch differs a lot from the original, why not just backport the id table changes that were done in the meantime instead?
It doesn't differ - 2/2 is a identical cherry-pick of 410c44b10967 ("Input:
atkbd - skip deactivate for HONOR ZQC-P"). The only differences from the upstream patch are the index lines and the hunk offsets. The 13/5 diffstat is upstream's own doing: that is the "[dtor: keep all HONOR entries together]" reorder Dmitry did in the same commit.
And the id table change done in the meantime is patch 1/2 - 2aaf33c6e1e8 ("Input: atkbd - skip deactivate for HONOR FMB-P's internal keyboard"). Of the quirk-table commits between v6.18 and 410c44b10967, 6.18.y already has all of them except FMB-P, which is precisely why the plain cherry-pick of 2/2 failed. With 1/2 in, the table matches upstream's pre-410c44b10967 state and 2/2 applies verbatim.
So both as sent should be fine.
Signature · 2 lines
Thanks, Sasha