Merge 4.15-rc3 into char-misc-next

We want the fixes and changes in here for testing.

Greg Kroah-Hartman committed 8 years ago

Commit 2fc10242 parents 05eec0c 50c4c4e1514 files · +13681 −8540Browse files

Showing the changes to include/uapi/linux (8 of 1514 files). Show all

Unified · Split

8 files

@@ -91,7 +91,7 @@ PTR_FIELD(PTR_GEN, 0, 8) · 90 unmodified lines
91	91
92	92	#define PTR_CHECK_DEV ((1 << PTR_DEV_BITS) - 1)
93	93
94		−#define PTR(gen, offset, dev) \
	94	+#define MAKE_PTR(gen, offset, dev) \
95	95	((((__u64) dev) << 51) \| ((__u64) offset) << 8 \| gen)
96	96
97	97	/* Bkey utility code */

@@ -76,7 +76,7 @@ struct bfs_super_block { · 75 unmodified lines
76	76	#define BFS_FILEBLOCKS(ip) \
77	77	((ip)->i_sblock == 0 ? 0 : (le32_to_cpu((ip)->i_eblock) + 1) - le32_to_cpu((ip)->i_sblock))
78	78	#define BFS_UNCLEAN(bfs_sb, sb) \
79		− ((le32_to_cpu(bfs_sb->s_from) != -1) && (le32_to_cpu(bfs_sb->s_to) != -1) && !(sb->s_flags & MS_RDONLY))
	79	+ ((le32_to_cpu(bfs_sb->s_from) != -1) && (le32_to_cpu(bfs_sb->s_to) != -1) && !(sb->s_flags & SB_RDONLY))
80	80
81	81
82	82	#endif /* _LINUX_BFS_FS_H */

@@ -8,11 +8,10 @@ · 7 unmodified lines
8	8	#ifndef _UAPI__LINUX_BPF_PERF_EVENT_H__
9	9	#define _UAPI__LINUX_BPF_PERF_EVENT_H__
10	10
11		−#include <linux/types.h>
12		−#include <linux/ptrace.h>
	11	+#include <asm/bpf_perf_event.h>
13	12
14	13	struct bpf_perf_event_data {
15		− struct pt_regs regs;
	14	+ bpf_user_pt_regs_t regs;
16	15	__u64 sample_period;
17	16	};
18	17

@@ -233,29 +233,29 @@ struct kfd_ioctl_wait_events_args { · 232 unmodified lines
233	233	};
234	234
235	235	struct kfd_ioctl_set_scratch_backing_va_args {
236		− uint64_t va_addr; /* to KFD */
237		− uint32_t gpu_id; /* to KFD */
238		− uint32_t pad;
	236	+ __u64 va_addr; /* to KFD */
	237	+ __u32 gpu_id; /* to KFD */
	238	+ __u32 pad;
239	239	};
240	240
241	241	struct kfd_ioctl_get_tile_config_args {
242	242	/* to KFD: pointer to tile array */
243		− uint64_t tile_config_ptr;
	243	+ __u64 tile_config_ptr;
244	244	/* to KFD: pointer to macro tile array */
245		− uint64_t macro_tile_config_ptr;
	245	+ __u64 macro_tile_config_ptr;
246	246	/* to KFD: array size allocated by user mode
247	247	* from KFD: array size filled by kernel
248	248	*/
249		− uint32_t num_tile_configs;
	249	+ __u32 num_tile_configs;
250	250	/* to KFD: array size allocated by user mode
251	251	* from KFD: array size filled by kernel
252	252	*/
253		− uint32_t num_macro_tile_configs;
	253	+ __u32 num_macro_tile_configs;
254	254
255		− uint32_t gpu_id; /* to KFD */
256		− uint32_t gb_addr_config; /* from KFD */
257		− uint32_t num_banks; /* from KFD */
258		− uint32_t num_ranks; /* from KFD */
	255	+ __u32 gpu_id; /* to KFD */
	256	+ __u32 gb_addr_config; /* from KFD */
	257	+ __u32 num_banks; /* from KFD */
	258	+ __u32 num_ranks; /* from KFD */
259	259	/* struct size can be extended later if needed
260	260	* without breaking ABI compatibility
261	261	*/

@@ -630,9 +630,9 @@ struct kvm_s390_irq { · 629 unmodified lines
630	630
631	631	struct kvm_s390_irq_state {
632	632	__u64 buf;
633		− __u32 flags;
	633	+ __u32 flags; /* will stay unused for compatibility reasons */
634	634	__u32 len;
635		− __u32 reserved[4];
	635	+ __u32 reserved[4]; /* will stay unused for compatibility reasons */
636	636	};
637	637
638	638	/* for KVM_SET_GUEST_DEBUG */

@@ -59,6 +59,7 @@ enum rxrpc_cmsg_type { · 58 unmodified lines
59	59	RXRPC_EXCLUSIVE_CALL = 10, /* s-: Call should be on exclusive connection */
60	60	RXRPC_UPGRADE_SERVICE = 11, /* s-: Request service upgrade for client call */
61	61	RXRPC_TX_LENGTH = 12, /* s-: Total length of Tx data */
	62	+ RXRPC_SET_CALL_TIMEOUT = 13, /* s-: Set one or more call timeouts */
62	63	RXRPC__SUPPORTED
63	64	};
64	65

@@ -880,6 +880,8 @@ struct usb_wireless_cap_descriptor { /* Ultra Wide Band */ · 879 unmodified lines
880	880	__u8 bReserved;
881	881	} __attribute__((packed));
882	882
	883	+#define USB_DT_USB_WIRELESS_CAP_SIZE 11
	884	+
883	885	/* USB 2.0 Extension descriptor */
884	886	#define USB_CAP_TYPE_EXT 2
885	887
@@ -1072,6 +1074,7 @@ struct usb_ptm_cap_descriptor { · 186 unmodified lines
1072	1074	__u8 bDevCapabilityType;
1073	1075	} __attribute__((packed));
1074	1076
	1077	+#define USB_DT_USB_PTM_ID_SIZE 3
1075	1078	/*
1076	1079	* The size of the descriptor for the Sublink Speed Attribute Count
1077	1080	* (SSAC) specified in bmAttributes[4:0].

@@ -1,3 +1,4 @@
	1	+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1	2	/* AF_VSOCK sock_diag(7) interface for querying open sockets */
2	3
3	4	#ifndef _UAPI__VM_SOCKETS_DIAG_H__