History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Jakub Kicinski committed 4 years ago

Commit c59400a2 parents 9c30918 dcb85f8405 files · +4030 −2043Browse files

Showing the changes to include/uapi (3 of 405 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/cyclades.h +35 −0
  2. include/uapi/linux/kvm.h +1 −0
  3. include/uapi/linux/smc_diag.h +5 −6
include/uapi/linux/cyclades.h+35−0
@@ -0,0 +1,35 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+
3+#ifndef _UAPI_LINUX_CYCLADES_H
4+#define _UAPI_LINUX_CYCLADES_H
5+
6+#warning "Support for features provided by this header has been removed"
7+#warning "Please consider updating your code"
8+
9+struct cyclades_monitor {
10+ unsigned long int_count;
11+ unsigned long char_count;
12+ unsigned long char_max;
13+ unsigned long char_last;
14+};
15+
16+#define CYGETMON 0x435901
17+#define CYGETTHRESH 0x435902
18+#define CYSETTHRESH 0x435903
19+#define CYGETDEFTHRESH 0x435904
20+#define CYSETDEFTHRESH 0x435905
21+#define CYGETTIMEOUT 0x435906
22+#define CYSETTIMEOUT 0x435907
23+#define CYGETDEFTIMEOUT 0x435908
24+#define CYSETDEFTIMEOUT 0x435909
25+#define CYSETRFLOW 0x43590a
26+#define CYGETRFLOW 0x43590b
27+#define CYSETRTSDTR_INV 0x43590c
28+#define CYGETRTSDTR_INV 0x43590d
29+#define CYZSETPOLLCYCLE 0x43590e
30+#define CYZGETPOLLCYCLE 0x43590f
31+#define CYGETCD1400VER 0x435910
32+#define CYSETWAIT 0x435912
33+#define CYGETWAIT 0x435913
34+
35+#endif /* _UAPI_LINUX_CYCLADES_H */
include/uapi/linux/kvm.h+1−0
@@ -1133,6 +1133,7 @@ struct kvm_ppc_resize_hpt { · 1132 unmodified lines
11331133 #define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206
11341134 #define KVM_CAP_VM_GPA_BITS 207
11351135 #define KVM_CAP_XSAVE2 208
1136+#define KVM_CAP_SYS_ATTRIBUTES 209
11361137
11371138 #ifdef KVM_CAP_IRQ_ROUTING
11381139
include/uapi/linux/smc_diag.h+5−6
@@ -84,12 +84,11 @@ struct smc_diag_conninfo { · 83 unmodified lines
8484 /* SMC_DIAG_LINKINFO */
8585
8686 struct smc_diag_linkinfo {
87− __u8 link_id; /* link identifier */
88− __u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
89− __u8 ibport; /* RDMA device port number */
90− __u8 gid[40]; /* local GID */
91− __u8 peer_gid[40]; /* peer GID */
92− __aligned_u64 net_cookie; /* RDMA device net namespace */
87+ __u8 link_id; /* link identifier */
88+ __u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
89+ __u8 ibport; /* RDMA device port number */
90+ __u8 gid[40]; /* local GID */
91+ __u8 peer_gid[40]; /* peer GID */
9392 };
9493
9594 struct smc_diag_lgrinfo {