Commit 904e28c
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 doing46 files changed
Lines changed: 5213 additions & 29 deletions
File tree
- Documentation/hid
- drivers
- hid
- amd-sfh-hid
- bpf
- entrypoints
- i2c-hid
- intel-ish-hid
- include/linux
- net/bluetooth/hidp
- samples/hid
- tools/testing/selftests
- hid
- progs
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
0 commit comments