Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats.
Showing the changes to include/uapi/linux (1 of 59 files). Show all
Unified · Split
| @@ -35,7 +35,7 @@ · 34 unmodified lines | |||
| 35 | #define RTF_PREF(pref) ((pref) << 27) | 35 | #define RTF_PREF(pref) ((pref) << 27) |
| 36 | #define RTF_PREF_MASK 0x18000000 | 36 | #define RTF_PREF_MASK 0x18000000 |
| 37 | 37 | ||
| 38 | #define RTF_PCPU 0x40000000 | 38 | #define RTF_PCPU 0x40000000 /* read-only: can not be set by user */ |
| 39 | #define RTF_LOCAL 0x80000000 | 39 | #define RTF_LOCAL 0x80000000 |
| 40 | 40 | ||
| 41 | 41 | ||