• Benjamin Tissoires's avatar
    Merge branch 'for-6.3/hid-bpf' into for-linus · 904e28c6
    Benjamin Tissoires authored
    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 bf7660da ("HID: stop drivers from selecting CONFIG_HID")
      conflicts with commit 2afac81d ("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
    904e28c6
Makefile 6.58 KB