History

Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

To resolve conflicts in: drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/mlx5/qp.c From patches merged into the -rc cycle. The conflict resolution matches what linux-next has been carrying.

Jason Gunthorpe committed 8 years ago

Commit e7996a92 parents b5fa635 d8a5b802113 files · +25691 −13476Browse files

Showing the changes to include/uapi (10 of 2113 files). Show all

Unified · Split

10 files
  1. include/uapi/asm-generic/bpf_perf_event.h +9 −0
  2. include/uapi/linux/bpf_perf_event.h +2 −3
  3. include/uapi/linux/if_ether.h +3 −0
  4. include/uapi/linux/kvm.h +6 −2
  5. include/uapi/linux/libc-compat.h +60 −1
  6. include/uapi/linux/netfilter/nf_conntrack_common.h +1 −1
  7. include/uapi/linux/openvswitch.h +0 −1
  8. include/uapi/linux/pkt_sched.h +0 −1
  9. include/uapi/linux/rtnetlink.h +1 −0
  10. include/uapi/linux/usb/ch9.h +3 −0
include/uapi/asm-generic/bpf_perf_event.h+9−0
@@ -0,0 +1,9 @@
1+#ifndef _UAPI__ASM_GENERIC_BPF_PERF_EVENT_H__
2+#define _UAPI__ASM_GENERIC_BPF_PERF_EVENT_H__
3+
4+#include <linux/ptrace.h>
5+
6+/* Export kernel pt_regs structure */
7+typedef struct pt_regs bpf_user_pt_regs_t;
8+
9+#endif /* _UAPI__ASM_GENERIC_BPF_PERF_EVENT_H__ */
include/uapi/linux/bpf_perf_event.h+2−3
@@ -8,11 +8,10 @@ · 7 unmodified lines
88 #ifndef _UAPI__LINUX_BPF_PERF_EVENT_H__
99 #define _UAPI__LINUX_BPF_PERF_EVENT_H__
1010
11−#include <linux/types.h>
12−#include <linux/ptrace.h>
11+#include <asm/bpf_perf_event.h>
1312
1413 struct bpf_perf_event_data {
15− struct pt_regs regs;
14+ bpf_user_pt_regs_t regs;
1615 __u64 sample_period;
1716 };
1817
include/uapi/linux/if_ether.h+3−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 #define _UAPI_LINUX_IF_ETHER_H
2424
2525 #include <linux/types.h>
26+#include <linux/libc-compat.h>
2627
2728 /*
2829 * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
@@ -149,11 +150,13 @@ · 120 unmodified lines
149150 * This is an Ethernet frame header.
150151 */
151152
153+#if __UAPI_DEF_ETHHDR
152154 struct ethhdr {
153155 unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
154156 unsigned char h_source[ETH_ALEN]; /* source ether addr */
155157 __be16 h_proto; /* packet type ID field */
156158 } __attribute__((packed));
159+#endif
157160
158161
159162 #endif /* _UAPI_LINUX_IF_ETHER_H */
include/uapi/linux/kvm.h+6−2
@@ -630,9 +630,9 @@ struct kvm_s390_irq { · 629 unmodified lines
630630
631631 struct kvm_s390_irq_state {
632632 __u64 buf;
633− __u32 flags;
633+ __u32 flags; /* will stay unused for compatibility reasons */
634634 __u32 len;
635− __u32 reserved[4];
635+ __u32 reserved[4]; /* will stay unused for compatibility reasons */
636636 };
637637
638638 /* for KVM_SET_GUEST_DEBUG */
@@ -932,6 +932,8 @@ struct kvm_ppc_resize_hpt { · 293 unmodified lines
932932 #define KVM_CAP_HYPERV_SYNIC2 148
933933 #define KVM_CAP_HYPERV_VP_INDEX 149
934934 #define KVM_CAP_S390_AIS_MIGRATION 150
935+#define KVM_CAP_PPC_GET_CPU_CHAR 151
936+#define KVM_CAP_S390_BPB 152
935937
936938 #ifdef KVM_CAP_IRQ_ROUTING
937939
@@ -1261,6 +1263,8 @@ struct kvm_s390_ucas_mapping { · 323 unmodified lines
12611263 #define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)
12621264 /* Available with KVM_CAP_PPC_RADIX_MMU */
12631265 #define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)
1266+/* Available with KVM_CAP_PPC_GET_CPU_CHAR */
1267+#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)
12641268
12651269 /* ioctl for vm fd */
12661270 #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
include/uapi/linux/libc-compat.h+60−1
@@ -168,47 +168,106 @@ · 167 unmodified lines
168168
169169 /* If we did not see any headers from any supported C libraries,
170170 * or we are being included in the kernel, then define everything
171− * that we need. */
171+ * that we need. Check for previous __UAPI_* definitions to give
172+ * unsupported C libraries a way to opt out of any kernel definition. */
172173 #else /* !defined(__GLIBC__) */
173174
174175 /* Definitions for if.h */
176+#ifndef __UAPI_DEF_IF_IFCONF
175177 #define __UAPI_DEF_IF_IFCONF 1
178+#endif
179+#ifndef __UAPI_DEF_IF_IFMAP
176180 #define __UAPI_DEF_IF_IFMAP 1
181+#endif
182+#ifndef __UAPI_DEF_IF_IFNAMSIZ
177183 #define __UAPI_DEF_IF_IFNAMSIZ 1
184+#endif
185+#ifndef __UAPI_DEF_IF_IFREQ
178186 #define __UAPI_DEF_IF_IFREQ 1
187+#endif
179188 /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
189+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS
180190 #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
191+#endif
181192 /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
193+#ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
182194 #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
195+#endif
183196
184197 /* Definitions for in.h */
198+#ifndef __UAPI_DEF_IN_ADDR
185199 #define __UAPI_DEF_IN_ADDR 1
200+#endif
201+#ifndef __UAPI_DEF_IN_IPPROTO
186202 #define __UAPI_DEF_IN_IPPROTO 1
203+#endif
204+#ifndef __UAPI_DEF_IN_PKTINFO
187205 #define __UAPI_DEF_IN_PKTINFO 1
206+#endif
207+#ifndef __UAPI_DEF_IP_MREQ
188208 #define __UAPI_DEF_IP_MREQ 1
209+#endif
210+#ifndef __UAPI_DEF_SOCKADDR_IN
189211 #define __UAPI_DEF_SOCKADDR_IN 1
212+#endif
213+#ifndef __UAPI_DEF_IN_CLASS
190214 #define __UAPI_DEF_IN_CLASS 1
215+#endif
191216
192217 /* Definitions for in6.h */
218+#ifndef __UAPI_DEF_IN6_ADDR
193219 #define __UAPI_DEF_IN6_ADDR 1
220+#endif
221+#ifndef __UAPI_DEF_IN6_ADDR_ALT
194222 #define __UAPI_DEF_IN6_ADDR_ALT 1
223+#endif
224+#ifndef __UAPI_DEF_SOCKADDR_IN6
195225 #define __UAPI_DEF_SOCKADDR_IN6 1
226+#endif
227+#ifndef __UAPI_DEF_IPV6_MREQ
196228 #define __UAPI_DEF_IPV6_MREQ 1
229+#endif
230+#ifndef __UAPI_DEF_IPPROTO_V6
197231 #define __UAPI_DEF_IPPROTO_V6 1
232+#endif
233+#ifndef __UAPI_DEF_IPV6_OPTIONS
198234 #define __UAPI_DEF_IPV6_OPTIONS 1
235+#endif
236+#ifndef __UAPI_DEF_IN6_PKTINFO
199237 #define __UAPI_DEF_IN6_PKTINFO 1
238+#endif
239+#ifndef __UAPI_DEF_IP6_MTUINFO
200240 #define __UAPI_DEF_IP6_MTUINFO 1
241+#endif
201242
202243 /* Definitions for ipx.h */
244+#ifndef __UAPI_DEF_SOCKADDR_IPX
203245 #define __UAPI_DEF_SOCKADDR_IPX 1
246+#endif
247+#ifndef __UAPI_DEF_IPX_ROUTE_DEFINITION
204248 #define __UAPI_DEF_IPX_ROUTE_DEFINITION 1
249+#endif
250+#ifndef __UAPI_DEF_IPX_INTERFACE_DEFINITION
205251 #define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1
252+#endif
253+#ifndef __UAPI_DEF_IPX_CONFIG_DATA
206254 #define __UAPI_DEF_IPX_CONFIG_DATA 1
255+#endif
256+#ifndef __UAPI_DEF_IPX_ROUTE_DEF
207257 #define __UAPI_DEF_IPX_ROUTE_DEF 1
258+#endif
208259
209260 /* Definitions for xattr.h */
261+#ifndef __UAPI_DEF_XATTR
210262 #define __UAPI_DEF_XATTR 1
263+#endif
211264
212265 #endif /* __GLIBC__ */
213266
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+
214273 #endif /* _UAPI_LIBC_COMPAT_H */
include/uapi/linux/netfilter/nf_conntrack_common.h+1−1
@@ -36,7 +36,7 @@ enum ip_conntrack_info { · 35 unmodified lines
3636
3737 #define NF_CT_STATE_INVALID_BIT (1 << 0)
3838 #define NF_CT_STATE_BIT(ctinfo) (1 << ((ctinfo) % IP_CT_IS_REPLY + 1))
39−#define NF_CT_STATE_UNTRACKED_BIT (1 << (IP_CT_UNTRACKED + 1))
39+#define NF_CT_STATE_UNTRACKED_BIT (1 << 6)
4040
4141 /* Bitset representing status of connection. */
4242 enum ip_conntrack_status {
include/uapi/linux/openvswitch.h+0−1
@@ -363,7 +363,6 @@ enum ovs_tunnel_key_attr { · 362 unmodified lines
363363 OVS_TUNNEL_KEY_ATTR_IPV6_SRC, /* struct in6_addr src IPv6 address. */
364364 OVS_TUNNEL_KEY_ATTR_IPV6_DST, /* struct in6_addr dst IPv6 address. */
365365 OVS_TUNNEL_KEY_ATTR_PAD,
366− OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, /* be32 ERSPAN index. */
367366 __OVS_TUNNEL_KEY_ATTR_MAX
368367 };
369368
include/uapi/linux/pkt_sched.h+0−1
@@ -256,7 +256,6 @@ struct tc_red_qopt { · 255 unmodified lines
256256 #define TC_RED_ECN 1
257257 #define TC_RED_HARDDROP 2
258258 #define TC_RED_ADAPTATIVE 4
259−#define TC_RED_OFFLOADED 8
260259 };
261260
262261 struct tc_red_xstats {
include/uapi/linux/rtnetlink.h+1−0
@@ -557,6 +557,7 @@ enum { · 556 unmodified lines
557557 TCA_PAD,
558558 TCA_DUMP_INVISIBLE,
559559 TCA_CHAIN,
560+ TCA_HW_OFFLOAD,
560561 __TCA_MAX
561562 };
562563
include/uapi/linux/usb/ch9.h+3−0
@@ -880,6 +880,8 @@ struct usb_wireless_cap_descriptor { /* Ultra Wide Band */ · 879 unmodified lines
880880 __u8 bReserved;
881881 } __attribute__((packed));
882882
883+#define USB_DT_USB_WIRELESS_CAP_SIZE 11
884+
883885 /* USB 2.0 Extension descriptor */
884886 #define USB_CAP_TYPE_EXT 2
885887
@@ -1072,6 +1074,7 @@ struct usb_ptm_cap_descriptor { · 186 unmodified lines
10721074 __u8 bDevCapabilityType;
10731075 } __attribute__((packed));
10741076
1077+#define USB_DT_USB_PTM_ID_SIZE 3
10751078 /*
10761079 * The size of the descriptor for the Sublink Speed Attribute Count
10771080 * (SSAC) specified in bmAttributes[4:0].

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t