From: Benjamin Tissoires Date: Wed, 22 Feb 2023 09:44:31 +0000 (+0100) Subject: Merge branch 'for-6.3/hid-bpf' into for-linus X-Git-Tag: v6.3-rc1~154^2 X-Git-Url: https://git.kernel.dk/?p=linux-block.git;a=commitdiff_plain;h=904e28c6de083fa4834cdbd0026470ddc30676fc 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 --- 904e28c6de083fa4834cdbd0026470ddc30676fc diff --cc tools/testing/selftests/Makefile index 41b649452560,479127efddf9..0bc9592b5e62 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@@ -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