History

Merge 4.18-rc7 into staging-next

We want the staging changes in here for testing and merge issues.

Greg Kroah-Hartman committed 8 years ago

Commit c88b94a2 parents 38c6aa2 acb1872535 files · +5154 −2712Browse files

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

Unified · Split

4 files
  1. include/uapi/linux/aio_abi.h +0 −6
  2. include/uapi/linux/btf.h +1 −1
  3. include/uapi/linux/ethtool.h +1 −1
  4. include/uapi/linux/tcp.h +4 −0
include/uapi/linux/aio_abi.h+0−6
@@ -29,7 +29,6 @@ · 28 unmodified lines
29 29
30#include <linux/types.h>30#include <linux/types.h>
31#include <linux/fs.h>31#include <linux/fs.h>
32#include <linux/signal.h>
33#include <asm/byteorder.h>32#include <asm/byteorder.h>
34 33
35typedef __kernel_ulong_t aio_context_t;34typedef __kernel_ulong_t aio_context_t;
@@ -110,10 +109,5 @@ struct iocb { · 74 unmodified lines
110#undef IFBIG109#undef IFBIG
111#undef IFLITTLE110#undef IFLITTLE
112 111
113struct __aio_sigset {
114 const sigset_t __user *sigmask;
115 size_t sigsetsize;
116};
117
118#endif /* __LINUX__AIO_ABI_H */112#endif /* __LINUX__AIO_ABI_H */
119 113
include/uapi/linux/btf.h+1−1
@@ -76,7 +76,7 @@ struct btf_type { · 75 unmodified lines
76 */76 */
77#define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)77#define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)
78#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)78#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)
79#define BTF_INT_BITS(VAL) ((VAL) & 0x0000ffff)79#define BTF_INT_BITS(VAL) ((VAL) & 0x000000ff)
80 80
81/* Attributes stored in the BTF_INT_ENCODING */81/* Attributes stored in the BTF_INT_ENCODING */
82#define BTF_INT_SIGNED (1 << 0)82#define BTF_INT_SIGNED (1 << 0)
include/uapi/linux/ethtool.h+1−1
@@ -226,7 +226,7 @@ enum tunable_id { · 225 unmodified lines
226 ETHTOOL_TX_COPYBREAK,226 ETHTOOL_TX_COPYBREAK,
227 ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */227 ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */
228 /*228 /*
229 * Add your fresh new tubale attribute above and remember to update229 * Add your fresh new tunable attribute above and remember to update
230 * tunable_strings[] in net/core/ethtool.c230 * tunable_strings[] in net/core/ethtool.c
231 */231 */
232 __ETHTOOL_TUNABLE_COUNT,232 __ETHTOOL_TUNABLE_COUNT,
include/uapi/linux/tcp.h+4−0
@@ -127,6 +127,10 @@ enum { · 126 unmodified lines
127 127
128#define TCP_CM_INQ TCP_INQ128#define TCP_CM_INQ TCP_INQ
129 129
130#define TCP_REPAIR_ON 1
131#define TCP_REPAIR_OFF 0
132#define TCP_REPAIR_OFF_NO_WP -1 /* Turn off without window probes */
133
130struct tcp_repair_opt {134struct tcp_repair_opt {
131 __u32 opt_code;135 __u32 opt_code;
132 __u32 opt_val;136 __u32 opt_val;