Merge tag 'v4.20' into for-linus

Sync with mainline to get linux/overflow.h among other things.
This commit is contained in:
Dmitry Torokhov
2019-01-14 15:33:23 -08:00
24798 changed files with 1680486 additions and 1106516 deletions

View File

@@ -274,10 +274,11 @@ struct input_mask {
/*
* MT_TOOL types
*/
#define MT_TOOL_FINGER 0
#define MT_TOOL_PEN 1
#define MT_TOOL_PALM 2
#define MT_TOOL_MAX 2
#define MT_TOOL_FINGER 0x00
#define MT_TOOL_PEN 0x01
#define MT_TOOL_PALM 0x02
#define MT_TOOL_DIAL 0x0a
#define MT_TOOL_MAX 0x0f
/*
* Values describing the status of a force-feedback effect