Merge branches 'for-4.20/upstream-fixes', 'for-4.21/core', 'for-4.21/hid-asus', ...

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

diff --cc include/linux/hid.h
Simple merge

diff --cc include/uapi/linux/input-event-codes.h
index ae366b8,ae366b8,3eb5a4c,3eb5a4c,6d180cc,6d180cc,265ef20,ae366b8..7f14d4a
--- 1/include/uapi/linux/input-event-codes.h
--- 2/include/uapi/linux/input-event-codes.h
--- 3/include/uapi/linux/input-event-codes.h
--- 4/include/uapi/linux/input-event-codes.h
--- 5/include/uapi/linux/input-event-codes.h
--- 6/include/uapi/linux/input-event-codes.h
--- 7/include/uapi/linux/input-event-codes.h
--- 8/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@@@@@@@@ -716,6 -716,6 -716,6 -716,6 -716,7 -716,7 -716,8 -716,6 +716,8 @@@@@@@@@
         * the situation described above.
         */
        #define REL_RESERVED            0x0a
++++   +#define REL_WHEEL_HI_RES        0x0b
++++++ +#define REL_HWHEEL_HI_RES       0x0c
        #define REL_MAX                 0x0f
        #define REL_CNT                 (REL_MAX+1)