Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in drivers/hid/hid-input.c between commit f974008f07a6 ("HID: add keyboard input assist hid usages") from Linus' tree and commit afdb5cce979b ("HID: input: Map unknown consumer page codes to KEY_UNKNOWN") from the hid tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/hid/hid-input.c
index 725f22ca47fc,7ea582be9c9a..000000000000
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@ -865,14 -862,7 +865,14 @@@ static void hidinput_configure_usage(st
case 0x28b: map_key_clear(KEY_FORWARDMAIL); break;
case 0x28c: map_key_clear(KEY_SEND); break;
+ case 0x2c7: map_key_clear(KEY_KBDINPUTASSIST_PREV); break;
+ case 0x2c8: map_key_clear(KEY_KBDINPUTASSIST_NEXT); break;
+ case 0x2c9: map_key_clear(KEY_KBDINPUTASSIST_PREVGROUP); break;
+ case 0x2ca: map_key_clear(KEY_KBDINPUTASSIST_NEXTGROUP); break;
+ case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT); break;
+ case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL); break;
+
- default: goto ignore;
+ default: map_key_clear(KEY_UNKNOWN);
}
break;
Attachment:
pgplueghkKLXD.pgp
Description: OpenPGP digital signature
