Merge commit 'v4.16-rc4~0' into patchwork

* commit 'v4.16-rc4~0': (900 commits) Linux 4.16-rc4 memremap: fix softlockup reports at teardown libnvdimm: re-enable deep flush for pmem devices via fsync() MAINTAINERS: take over Kconfig maintainership vfio: disable filesystem-dax page pinning kconfig: fix line number in recursive inclusion error message Coccinelle: memdup: Fix typo in warning messages i2c: octeon: Prevent error message on bus error parisc: Reduce irq overhead when run in qemu parisc: Use cr16 interval timers unconditionally on qemu parisc: Check if secondary CPUs want own PDC calls parisc: Hide virtual kernel memory layout parisc: Fix ordering of cache and TLB flushes kconfig: Update ncurses package names for menuconfig kbuild/kallsyms: trivial typo fix kbuild: test --build-id linker flag by ld-option instead of cc-ldoption kbuild: drop superfluous GCC_PLUGINS_CFLAGS assignment kconfig: Don't leak choice names during parsing sh: fix build error for empty CONFIG_BUILTIN_DTB_SOURCE kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list ...

Mauro Carvalho Chehab committed 8 years ago

Commit 76bf7082 parents e3e389f 661e50b995 files · +10318 −5937Browse files

Showing the changes to include/uapi/linux (7 of 995 files). Show all

Unified · Split

7 files

include/uapi/linux/blktrace_api.h +1 −1
include/uapi/linux/dvb/dmx.h +35 −0
include/uapi/linux/if_ether.h +5 −1
include/uapi/linux/kvm.h +2 −0
include/uapi/linux/libc-compat.h +0 −6
include/uapi/linux/psp-sev.h +1 −1
include/uapi/linux/ptrace.h +2 −2

include/uapi/linux/blktrace_api.h+1−1

@@ -131,7 +131,7 @@ enum { · 130 unmodified lines
131	131	#define BLKTRACE_BDEV_SIZE 32
132	132
133	133	/*
134		− * User setup structure passed with BLKTRACESTART
	134	+ * User setup structure passed with BLKTRACESETUP
135	135	*/
136	136	struct blk_user_trace_setup {
137	137	char name[BLKTRACE_BDEV_SIZE]; /* output */

include/uapi/linux/dvb/dmx.h+35−0

@@ -211,6 +211,32 @@ struct dmx_stc { · 210 unmodified lines
211	211	__u64 stc;
212	212	};
213	213
	214	+/**
	215	+ * enum dmx_buffer_flags - DMX memory-mapped buffer flags
	216	+ *
	217	+ * @DMX_BUFFER_FLAG_HAD_CRC32_DISCARD:
	218	+ * Indicates that the Kernel discarded one or more frames due to wrong
	219	+ * CRC32 checksum.
	220	+ * @DMX_BUFFER_FLAG_TEI:
	221	+ * Indicates that the Kernel has detected a Transport Error indicator
	222	+ * (TEI) on a filtered pid.
	223	+ * @DMX_BUFFER_PKT_COUNTER_MISMATCH:
	224	+ * Indicates that the Kernel has detected a packet counter mismatch
	225	+ * on a filtered pid.
	226	+ * @DMX_BUFFER_FLAG_DISCONTINUITY_DETECTED:
	227	+ * Indicates that the Kernel has detected one or more frame discontinuity.
	228	+ * @DMX_BUFFER_FLAG_DISCONTINUITY_INDICATOR:
	229	+ * Received at least one packet with a frame discontinuity indicator.
	230	+ */
	231	+
	232	+enum dmx_buffer_flags {
	233	+ DMX_BUFFER_FLAG_HAD_CRC32_DISCARD = 1 << 0,
	234	+ DMX_BUFFER_FLAG_TEI = 1 << 1,
	235	+ DMX_BUFFER_PKT_COUNTER_MISMATCH = 1 << 2,
	236	+ DMX_BUFFER_FLAG_DISCONTINUITY_DETECTED = 1 << 3,
	237	+ DMX_BUFFER_FLAG_DISCONTINUITY_INDICATOR = 1 << 4,
	238	+};
	239	+
214	240	/**
215	241	* struct dmx_buffer - dmx buffer info
216	242	*
@@ -220,15 +246,24 @@ struct dmx_stc { · 3 unmodified lines
220	246	* offset from the start of the device memory for this plane,
221	247	* (or a "cookie" that should be passed to mmap() as offset)
222	248	* @length: size in bytes of the buffer
	249	+ * @flags: bit array of buffer flags as defined by &enum dmx_buffer_flags.
	250	+ * Filled only at &DMX_DQBUF.
	251	+ * @count: monotonic counter for filled buffers. Helps to identify
	252	+ * data stream loses. Filled only at &DMX_DQBUF.
223	253	*
224	254	* Contains data exchanged by application and driver using one of the streaming
225	255	* I/O methods.
	256	+ *
	257	+ * Please notice that, for &DMX_QBUF, only @index should be filled.
	258	+ * On &DMX_DQBUF calls, all fields will be filled by the Kernel.
226	259	*/
227	260	struct dmx_buffer {
228	261	__u32 index;
229	262	__u32 bytesused;
230	263	__u32 offset;
231	264	__u32 length;
	265	+ __u32 flags;
	266	+ __u32 count;
232	267	};
233	268
234	269	/**

include/uapi/linux/if_ether.h+5−1

@@ -23,7 +23,6 @@ · 22 unmodified lines
23	23	#define _UAPI_LINUX_IF_ETHER_H
24	24
25	25	#include <linux/types.h>
26		−#include <linux/libc-compat.h>
27	26
28	27	/*
29	28	* IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
@@ -151,6 +150,11 @@ · 121 unmodified lines
151	150	* This is an Ethernet frame header.
152	151	*/
153	152
	153	+/* allow libcs like musl to deactivate this, glibc does not implement this. */
	154	+#ifndef __UAPI_DEF_ETHHDR
	155	+#define __UAPI_DEF_ETHHDR 1
	156	+#endif
	157	+
154	158	#if __UAPI_DEF_ETHHDR
155	159	struct ethhdr {
156	160	unsigned char h_dest[ETH_ALEN]; /* destination eth addr */

include/uapi/linux/kvm.h+2−0

@@ -761,6 +761,7 @@ struct kvm_ppc_resize_hpt { · 760 unmodified lines
761	761	#define KVM_TRACE_PAUSE __KVM_DEPRECATED_MAIN_0x07
762	762	#define KVM_TRACE_DISABLE __KVM_DEPRECATED_MAIN_0x08
763	763	#define KVM_GET_EMULATED_CPUID _IOWR(KVMIO, 0x09, struct kvm_cpuid2)
	764	+#define KVM_GET_MSR_FEATURE_INDEX_LIST _IOWR(KVMIO, 0x0a, struct kvm_msr_list)
764	765
765	766	/*
766	767	* Extension capability list.
@@ -934,6 +935,7 @@ struct kvm_ppc_resize_hpt { · 167 unmodified lines
934	935	#define KVM_CAP_S390_AIS_MIGRATION 150
935	936	#define KVM_CAP_PPC_GET_CPU_CHAR 151
936	937	#define KVM_CAP_S390_BPB 152
	938	+#define KVM_CAP_GET_MSR_FEATURES 153
937	939
938	940	#ifdef KVM_CAP_IRQ_ROUTING
939	941

include/uapi/linux/libc-compat.h+0−6

@@ -264,10 +264,4 @@ · 263 unmodified lines
264	264
265	265	#endif /* __GLIBC__ */
266	266
267		−/* Definitions for if_ether.h */
268		−/* allow libcs like musl to deactivate this, glibc does not implement this. */
269		−#ifndef __UAPI_DEF_ETHHDR
270		−#define __UAPI_DEF_ETHHDR 1
271		−#endif
272		−
273	267	#endif /* _UAPI_LIBC_COMPAT_H */

include/uapi/linux/psp-sev.h+1−1

@@ -42,7 +42,7 @@ typedef enum { · 41 unmodified lines
42	42	SEV_RET_INVALID_PLATFORM_STATE,
43	43	SEV_RET_INVALID_GUEST_STATE,
44	44	SEV_RET_INAVLID_CONFIG,
45		− SEV_RET_INVALID_len,
	45	+ SEV_RET_INVALID_LEN,
46	46	SEV_RET_ALREADY_OWNED,
47	47	SEV_RET_INVALID_CERTIFICATE,
48	48	SEV_RET_POLICY_FAILURE,

include/uapi/linux/ptrace.h+2−2

@@ -69,8 +69,8 @@ struct ptrace_peeksiginfo_args { · 68 unmodified lines
69	69	#define PTRACE_SECCOMP_GET_METADATA 0x420d
70	70
71	71	struct seccomp_metadata {
72		− unsigned long filter_off; /* Input: which filter */
73		− unsigned int flags; /* Output: filter's flags */
	72	+ __u64 filter_off; /* Input: which filter */
	73	+ __u64 flags; /* Output: filter's flags */
74	74	};
75	75
76	76	/* Read signals from a shared (process wide) queue */