Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days.
Showing the changes to include/uapi (2 of 410 files). Show all
Unified · Split
| @@ -31,4 +31,14 @@ struct mpls_label { · 30 unmodified lines | |||
| 31 | #define MPLS_LS_TTL_MASK 0x000000FF | 31 | #define MPLS_LS_TTL_MASK 0x000000FF |
| 32 | #define MPLS_LS_TTL_SHIFT 0 | 32 | #define MPLS_LS_TTL_SHIFT 0 |
| 33 | 33 | ||
| 34 | /* Reserved labels */ | ||
| 35 | #define MPLS_LABEL_IPV4NULL 0 /* RFC3032 */ | ||
| 36 | #define MPLS_LABEL_RTALERT 1 /* RFC3032 */ | ||
| 37 | #define MPLS_LABEL_IPV6NULL 2 /* RFC3032 */ | ||
| 38 | #define MPLS_LABEL_IMPLNULL 3 /* RFC3032 */ | ||
| 39 | #define MPLS_LABEL_ENTROPY 7 /* RFC6790 */ | ||
| 40 | #define MPLS_LABEL_GAL 13 /* RFC5586 */ | ||
| 41 | #define MPLS_LABEL_OAMALERT 14 /* RFC3429 */ | ||
| 42 | #define MPLS_LABEL_EXTENSION 15 /* RFC7274 */ | ||
| 43 | |||
| 34 | #endif /* _UAPI_MPLS_H */ | 44 | #endif /* _UAPI_MPLS_H */ |
| @@ -37,6 +37,7 @@ enum { · 36 unmodified lines | |||
| 37 | RDMA_NL_IWPM_ADD_MAPPING, | 37 | RDMA_NL_IWPM_ADD_MAPPING, |
| 38 | RDMA_NL_IWPM_QUERY_MAPPING, | 38 | RDMA_NL_IWPM_QUERY_MAPPING, |
| 39 | RDMA_NL_IWPM_REMOVE_MAPPING, | 39 | RDMA_NL_IWPM_REMOVE_MAPPING, |
| 40 | RDMA_NL_IWPM_REMOTE_INFO, | ||
| 40 | RDMA_NL_IWPM_HANDLE_ERR, | 41 | RDMA_NL_IWPM_HANDLE_ERR, |
| 41 | RDMA_NL_IWPM_MAPINFO, | 42 | RDMA_NL_IWPM_MAPINFO, |
| 42 | RDMA_NL_IWPM_MAPINFO_NUM, | 43 | RDMA_NL_IWPM_MAPINFO_NUM, |