History

Backmerge v4.1-rc4 into into drm-next

We picked up a silent conflict in amdkfd with drm-fixes and drm-next, backmerge v4.1-rc5 and fix the conflicts Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 11 years ago

Commit bdcddf92 parents 91d9f98 e260818547 files · +6074 −4842Browse files

Showing the changes to include/uapi (4 of 547 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/inet_diag.h +4 −0
  2. include/uapi/linux/mpls.h +10 −0
  3. include/uapi/linux/tcp.h +3 −0
  4. include/uapi/rdma/rdma_netlink.h +1 −0
include/uapi/linux/inet_diag.h+4−0
@@ -143,4 +143,8 @@ struct tcp_dctcp_info { · 142 unmodified lines
143 __u32 dctcp_ab_tot;143 __u32 dctcp_ab_tot;
144};144};
145 145
146union tcp_cc_info {
147 struct tcpvegas_info vegas;
148 struct tcp_dctcp_info dctcp;
149};
146#endif /* _UAPI_INET_DIAG_H_ */150#endif /* _UAPI_INET_DIAG_H_ */
include/uapi/linux/mpls.h+10−0
@@ -31,4 +31,14 @@ struct mpls_label { · 30 unmodified lines
31#define MPLS_LS_TTL_MASK 0x000000FF31#define MPLS_LS_TTL_MASK 0x000000FF
32#define MPLS_LS_TTL_SHIFT 032#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 */
include/uapi/linux/tcp.h+3−0
@@ -112,6 +112,7 @@ enum { · 111 unmodified lines
112#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */112#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */
113#define TCP_TIMESTAMP 24113#define TCP_TIMESTAMP 24
114#define TCP_NOTSENT_LOWAT 25 /* limit number of unsent bytes in write queue */114#define TCP_NOTSENT_LOWAT 25 /* limit number of unsent bytes in write queue */
115#define TCP_CC_INFO 26 /* Get Congestion Control (optional) info */
115 116
116struct tcp_repair_opt {117struct tcp_repair_opt {
117 __u32 opt_code;118 __u32 opt_code;
@@ -189,6 +190,8 @@ struct tcp_info { · 71 unmodified lines
189 190
190 __u64 tcpi_pacing_rate;191 __u64 tcpi_pacing_rate;
191 __u64 tcpi_max_pacing_rate;192 __u64 tcpi_max_pacing_rate;
193 __u64 tcpi_bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
194 __u64 tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
192};195};
193 196
194/* for TCP_MD5SIG socket option */197/* for TCP_MD5SIG socket option */
include/uapi/rdma/rdma_netlink.h+1−0
@@ -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,