We want the fixes in here as well, also to help out with merge issues.
Showing the changes to include/uapi (2 of 305 files). Show all
Unified · Split
| @@ -973,7 +973,8 @@ struct input_keymap_entry { · 972 unmodified lines | ||
| 973 | 973 | */ |
| 974 | 974 | #define MT_TOOL_FINGER 0 |
| 975 | 975 | #define MT_TOOL_PEN 1 |
| 976 | −#define MT_TOOL_MAX 1 | |
| 976 | +#define MT_TOOL_PALM 2 | |
| 977 | +#define MT_TOOL_MAX 2 | |
| 977 | 978 | |
| 978 | 979 | /* |
| 979 | 980 | * Values describing the status of a force-feedback effect |
| @@ -47,7 +47,7 @@ · 46 unmodified lines | ||
| 47 | 47 | * exported filesystem. |
| 48 | 48 | */ |
| 49 | 49 | #define NFSEXP_V4ROOT 0x10000 |
| 50 | −#define NFSEXP_NOPNFS 0x20000 | |
| 50 | +#define NFSEXP_PNFS 0x20000 | |
| 51 | 51 | |
| 52 | 52 | /* All flags that we claim to support. (Note we don't support NOACL.) */ |
| 53 | 53 | #define NFSEXP_ALLFLAGS 0x3FE7F |