Merge branch 'for-5.14/core' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 30 Jun 2021 07:03:51 +0000 (09:03 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 30 Jun 2021 07:03:51 +0000 (09:03 +0200)
commitfd73788ce6a580f2bd353e0f364d31b6c16dcd12
treedbeecdd8155a9c1c6be3d85739d3740243907c2e
parent5a94296bc02ac616336da7b5332b86d2ca8827f0
parentbcfa8d14570d85c998a9b706b074ab151b286edf
Merge branch 'for-5.14/core' into for-linus

- device unbinding locking fix from Dmitry Torokhov
- support for programmable buttons (mapping to KEY_MACRO# event codes)
  from Thomas Weißschuh
- various other small fixes and code style improvements
drivers/hid/hid-core.c
drivers/hid/hid-debug.c
drivers/hid/hid-input.c
include/linux/hid.h