Merge branch 'for-4.20/apple' into for-linus

Support for Apple Magic Trackpad 2

diff --combined drivers/hid/hid-ids.h
index 0e0aa7f0e6fc056578cb50218a99f56702a63b01,bb0cd212c7cca72b24c160403ddf2c178538f2f9..80a9aea38fa34741d394abf481624b7625d82d60
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -92,6 -92,7 +92,7 @@@
  #define USB_DEVICE_ID_APPLE_MIGHTYMOUSE       0x0304
  #define USB_DEVICE_ID_APPLE_MAGICMOUSE        0x030d
  #define USB_DEVICE_ID_APPLE_MAGICTRACKPAD     0x030e
+ #define USB_DEVICE_ID_APPLE_MAGICTRACKPAD2    0x0265
  #define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI     0x020e
  #define USB_DEVICE_ID_APPLE_FOUNTAIN_ISO      0x020f
  #define USB_DEVICE_ID_APPLE_GEYSER_ANSI       0x0214
@@@ -342,7 -343,6 +343,7 @@@
  #define USB_DEVICE_ID_DMI_ENC         0x5fab
  
  #define USB_VENDOR_ID_DRAGONRISE              0x0079
 +#define USB_DEVICE_ID_REDRAGON_SEYMUR2                0x0006
  #define USB_DEVICE_ID_DRAGONRISE_WIIU         0x1800
  #define USB_DEVICE_ID_DRAGONRISE_PS3          0x1801
  #define USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR   0x1803
@@@ -977,6 -977,7 +978,6 @@@
  #define USB_DEVICE_ID_SIS817_TOUCH    0x0817
  #define USB_DEVICE_ID_SIS_TS          0x1013
  #define USB_DEVICE_ID_SIS1030_TOUCH   0x1030
 -#define USB_DEVICE_ID_SIS10FB_TOUCH   0x10fb
  
  #define USB_VENDOR_ID_SKYCABLE                        0x1223
  #define       USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER       0x3F07