Conflicts: drivers/net/ethernet/mellanox/mlx4/cmd.c net/core/fib_rules.c net/ipv4/fib_frontend.c The fib_rules.c and fib_frontend.c conflicts were locking adjustments in 'net' overlapping addition and removal of code in 'net-next'. The mlx4 conflict was a bug fix in 'net' happening in the same place a constant was being replaced with a more suitable macro.
Showing the changes to include/uapi (1 of 91 files). Show all
Unified · Split
| @@ -973,7 +973,8 @@ struct input_keymap_entry { · 972 unmodified lines | |||
| 973 | */ | 973 | */ |
| 974 | #define MT_TOOL_FINGER 0 | 974 | #define MT_TOOL_FINGER 0 |
| 975 | #define MT_TOOL_PEN 1 | 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 | * Values describing the status of a force-feedback effect | 980 | * Values describing the status of a force-feedback effect |