]> git.infradead.org Git - users/hch/misc.git/commitdiff
Merge branch 'for-6.3/hid-bpf' into for-linus
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Wed, 22 Feb 2023 09:44:31 +0000 (10:44 +0100)
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>
Wed, 22 Feb 2023 09:44:31 +0000 (10:44 +0100)
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

1  2 
MAINTAINERS
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
include/linux/hid.h
tools/testing/selftests/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 41b649452560c3d91936c4ac8ba46df6e75c9736,479127efddf94dd0b9aec9963b1c5f5d7efbab0a..0bc9592b5e62a432faba17e06430637f2f20a0ed
@@@ -26,8 -26,8 +26,9 @@@ TARGETS += fp
  TARGETS += ftrace
  TARGETS += futex
  TARGETS += gpio
+ TARGETS += hid
  TARGETS += intel_pstate
 +TARGETS += iommu
  TARGETS += ipc
  TARGETS += ir
  TARGETS += kcmp