Merge branch 'for-6.5/acer' into for-linus

- ASUS ROG Z13 keyboard support and other assorted fixes to
  hid-asus (Luke D. Jones)

diff --combined drivers/hid/hid-ids.h
index 6aa64a2f6ad3032782f3f9f90161340d51bfc442,25f26375815b4c54c798edda01cbba64c507b60e..32b054fc95a7e09d04fa7b8b76d452007f19fa2d
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -207,6 -207,7 +207,7 @@@
  #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822
  #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD       0x1866
  #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2      0x19b6
+ #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD3      0x1a30
  #define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD        0x196b
  #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD        0x1869
  
@@@ -529,7 -530,6 +530,7 @@@
  #define USB_DEVICE_ID_GOOGLE_MOONBALL 0x5044
  #define USB_DEVICE_ID_GOOGLE_DON      0x5050
  #define USB_DEVICE_ID_GOOGLE_EEL      0x5057
 +#define USB_DEVICE_ID_GOOGLE_JEWEL    0x5061
  
  #define USB_VENDOR_ID_GOTOP           0x08f2
  #define USB_DEVICE_ID_SUPER_Q2                0x007f
@@@ -620,7 -620,6 +621,7 @@@
  #define USB_DEVICE_ID_UGCI_FIGHTING   0x0030
  
  #define USB_VENDOR_ID_HP              0x03f0
 +#define USB_PRODUCT_ID_HP_ELITE_PRESENTER_MOUSE_464A          0x464a
  #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A 0x0a4a
  #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A 0x0b4a
  #define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE                0x134a
@@@ -935,15 -934,7 +936,15 @@@
  #define USB_DEVICE_ID_MS_TYPE_COVER_2    0x07a9
  #define USB_DEVICE_ID_MS_POWER_COVER     0x07da
  #define USB_DEVICE_ID_MS_SURFACE3_COVER               0x07de
 -#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER        0x02fd
 +/*
 + * For a description of the Xbox controller models, refer to:
 + * https://en.wikipedia.org/wiki/Xbox_Wireless_Controller#Summary
 + */
 +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708   0x02fd
 +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE       0x0b20
 +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914   0x0b13
 +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797   0x0b05
 +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE       0x0b22
  #define USB_DEVICE_ID_MS_PIXART_MOUSE    0x00cb
  #define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS      0x02e0
  #define USB_DEVICE_ID_MS_MOUSE_0783      0x0783