From: Jiri Kosina Date: Thu, 3 Jan 2019 11:50:28 +0000 (+0100) Subject: Merge branches 'for-4.20/upstream-fixes', 'for-4.21/core', 'for-4.21/hid-asus', ... X-Git-Tag: v5.0-rc1~18^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bd8879faafe6d057237461c4d58d8b0d37b9e3ee;p=users%2Fdwmw2%2Flinux.git Merge branches 'for-4.20/upstream-fixes', 'for-4.21/core', 'for-4.21/hid-asus', 'for-4.21/hid-core', 'for-4.21/hid-cougar', 'for-4.21/hidraw', 'for-4.21/highres-wheel' and 'for-4.21/ish' into for-linus --- bd8879faafe6d057237461c4d58d8b0d37b9e3ee diff --cc include/uapi/linux/input-event-codes.h index ae366b87426ac,ae366b87426ac,3eb5a4c3d60a9,3eb5a4c3d60a9,6d180cc60a5df,6d180cc60a5df,265ef20286605,ae366b87426ac..7f14d4a66c28c --- a/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)