Merge branch 'for-6.1/rc-controllers' into for-linus

- Support for various RC controllers (Marcus Folkesson)

diff --cc drivers/hid/Kconfig
index b2ab14d27640fcf31139df231335edebe20247c0,4cdc44da2abf1b0a53a210601a21b4b421bf5d60..b9adf714db3576b756f4d8125bb8b3f60a834ee5
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -454,8 -480,20 +454,18 @@@ config HID_VIEWSONI
        help
          Support for ViewSonic/Signotec PD1011 signature pad.
  
+ config HID_VRC2
+       tristate "VRC-2 Car Controller"
+       depends on HID
+       help
+         Support for VRC-2 which is a 2-axis controller often used in
+         car simulators.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called hid-vrc2.
+ 
  config HID_XIAOMI
        tristate "Xiaomi"
 -      depends on HID
        help
          Adds support for side buttons of Xiaomi Mi Dual Mode Wireless
          Mouse Silent Edition.
@@@ -899,8 -960,18 +909,17 @@@ config PLAYSTATION_F
          Say Y here if you would like to enable force feedback support for
          PlayStation game controllers.
  
+ config HID_PXRC
+        tristate "PhoenixRC HID Flight Controller"
+        depends on HID
+        help
+        Support for PhoenixRC HID Flight Controller, a 8-axis flight controller.
+ 
+        To compile this driver as a module, choose M here: the
+        module will be called hid-pxrc.
+ 
  config HID_RAZER
        tristate "Razer non-fully HID-compliant devices"
 -      depends on HID
        help
        Support for Razer devices that are not fully compliant with the
        HID standard.

diff --cc drivers/hid/Makefile
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge