Skip to content

Commit

Permalink
Merge branch 'for-6.3/hid-bpf' into for-linus
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bentiss committed Feb 22, 2023
2 parents a738688 + 2f7f4ef commit 904e28c
Show file tree
Hide file tree
Showing 46 changed files with 5,213 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Documentation/hid/hid-alps.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Currently ALPS HID driver supports U1 Touchpad device.
U1 device basic information.

========== ======
Vender ID 0x044E
Vendor ID 0x044E
Product ID 0x120B
Version ID 0x0121
========== ======
Expand Down
Loading

0 comments on commit 904e28c

Please sign in to comment.