diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2023-02-22 12:44:31 +0300 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2023-02-22 12:44:31 +0300 |
| commit | 904e28c6de083fa4834cdbd0026470ddc30676fc (patch) | |
| tree | f1b8a3dcdedcd9e7a4584808c8dcd96d7a091821 /MAINTAINERS | |
| parent | a738688177dcdffe8064dc5ecac6ec4431b6b951 (diff) | |
| parent | 2f7f4efb9411770b4ad99eb314d6418e980248b4 (diff) | |
| download | linux-904e28c6de083fa4834cdbd0026470ddc30676fc.tar.xz | |
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 bf7660dab30d ("HID: stop drivers from selecting CONFIG_HID")
conflicts with commit 2afac81dd165 ("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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 327679567645..b14fe36db463 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9207,9 +9207,12 @@ M: Benjamin Tissoires <benjamin.tissoires@redhat.com> L: linux-input@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git +F: Documentation/hid/ F: drivers/hid/ F: include/linux/hid* F: include/uapi/linux/hid* +F: samples/hid/ +F: tools/testing/selftests/hid/ HID LOGITECH DRIVERS R: Filipe Laíns <lains@riseup.net> |