Skip to content

Commit 904e28c

Browse files
committed
Merge branch 'for-6.3/hid-bpf' into for-linus
Initial support of HID-BPF (Benjamin Tissoires) The history is a little long for this series, as it was intended to be sent for v6.2. However some last minute issues forced us to postpone it to v6.3. Conflicts: * drivers/hid/i2c-hid/Kconfig: commit bf7660d ("HID: stop drivers from selecting CONFIG_HID") conflicts with commit 2afac81 ("HID: fix I2C_HID not selected when I2C_HID_OF_ELAN is") the resolution is simple enough: just drop the "default" and "select" lines as the new commit from Arnd is doing
2 parents a738688 + 2f7f4ef commit 904e28c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+5213
-29
lines changed

Documentation/hid/hid-alps.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Currently ALPS HID driver supports U1 Touchpad device.
99
U1 device basic information.
1010

1111
========== ======
12-
Vender ID 0x044E
12+
Vendor ID 0x044E
1313
Product ID 0x120B
1414
Version ID 0x0121
1515
========== ======

0 commit comments

Comments
 (0)