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

@@ -29,7 +29,6 @@ · 28 unmodified lines
29	29
30	30	#include <linux/types.h>
31	31	#include <linux/fs.h>
32		−#include <linux/signal.h>
33	32	#include <asm/byteorder.h>
34	33
35	34	typedef __kernel_ulong_t aio_context_t;
@@ -110,10 +109,5 @@ struct iocb { · 74 unmodified lines
110	109	#undef IFBIG
111	110	#undef IFLITTLE
112	111
113		−struct __aio_sigset {
114		− const sigset_t __user *sigmask;
115		− size_t sigsetsize;
116		−};
117		−
118	112	#endif /* __LINUX__AIO_ABI_H */
119	113

@@ -76,7 +76,7 @@ struct btf_type { · 75 unmodified lines
76	76	*/
77	77	#define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)
78	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	81	/* Attributes stored in the BTF_INT_ENCODING */
82	82	#define BTF_INT_SIGNED (1 << 0)

@@ -226,7 +226,7 @@ enum tunable_id { · 225 unmodified lines
226	226	ETHTOOL_TX_COPYBREAK,
227	227	ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */
228	228	/*
229		− * Add your fresh new tubale attribute above and remember to update
	229	+ * Add your fresh new tunable attribute above and remember to update
230	230	* tunable_strings[] in net/core/ethtool.c
231	231	*/
232	232	__ETHTOOL_TUNABLE_COUNT,

@@ -127,6 +127,10 @@ enum { · 126 unmodified lines
127	127
128	128	#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	+
130	134	struct tcp_repair_opt {
131	135	__u32 opt_code;
132	136	__u32 opt_val;