History

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

Just minor overlapping changes in the conflicts here.

David S. Miller committed 7 years ago

Commit 13dfb3f2 parents 05bb520 33920f11012 files · +9587 −7699Browse files

Showing the changes to include/uapi/linux (17 of 1012 files). Show all

Unified · Split

17 files
  1. include/uapi/linux/bpfilter.h +1 −1
  2. include/uapi/linux/ipmi_bmc.h +1 −1
  3. include/uapi/linux/isst_if.h +1 −1
  4. include/uapi/linux/kvm.h +2 −2
  5. include/uapi/linux/netfilter/nf_synproxy.h +1 −1
  6. include/uapi/linux/netfilter/xt_connlabel.h +6 −0
  7. include/uapi/linux/psp-sev.h +1 −1
  8. include/uapi/linux/rxrpc.h +1 −1
  9. include/uapi/linux/serial_core.h +0 −3
  10. include/uapi/linux/socket.h +13 −6
  11. include/uapi/linux/usb/g_uvc.h +1 −1
  12. include/uapi/linux/vbox_vmmdev_types.h +1 −1
  13. include/uapi/linux/vboxguest.h +1 −1
  14. include/uapi/linux/virtio_iommu.h +18 −14
  15. include/uapi/linux/virtio_pmem.h +1 −1
  16. include/uapi/linux/vmcore.h +1 −1
  17. include/uapi/linux/wmi.h +1 −1
include/uapi/linux/bpfilter.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 #ifndef _UAPI_LINUX_BPFILTER_H
33 #define _UAPI_LINUX_BPFILTER_H
44
include/uapi/linux/ipmi_bmc.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 /*
33 * Copyright (c) 2015-2018, Intel Corporation.
44 */
include/uapi/linux/isst_if.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 /*
33 * Intel Speed Select Interface: OS to hardware Interface
44 * Copyright (c) 2019, Intel Corporation.
include/uapi/linux/kvm.h+2−2
@@ -116,7 +116,7 @@ struct kvm_irq_level { · 115 unmodified lines
116116 * ACPI gsi notion of irq.
117117 * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47..
118118 * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23..
119− * For ARM: See Documentation/virtual/kvm/api.txt
119+ * For ARM: See Documentation/virt/kvm/api.txt
120120 */
121121 union {
122122 __u32 irq;
@@ -1086,7 +1086,7 @@ struct kvm_xen_hvm_config { · 963 unmodified lines
10861086 *
10871087 * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies
10881088 * the irqfd to operate in resampling mode for level triggered interrupt
1089− * emulation. See Documentation/virtual/kvm/api.txt.
1089+ * emulation. See Documentation/virt/kvm/api.txt.
10901090 */
10911091 #define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)
10921092
include/uapi/linux/netfilter/nf_synproxy.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 #ifndef _NF_SYNPROXY_H
33 #define _NF_SYNPROXY_H
44
include/uapi/linux/netfilter/xt_connlabel.h+6−0
@@ -1,4 +1,8 @@
11 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+
3+#ifndef _UAPI_XT_CONNLABEL_H
4+#define _UAPI_XT_CONNLABEL_H
5+
26 #include <linux/types.h>
37
48 #define XT_CONNLABEL_MAXBIT 127
@@ -11,3 +15,5 @@ struct xt_connlabel_mtinfo { · 6 unmodified lines
1115 __u16 bit;
1216 __u16 options;
1317 };
18+
19+#endif /* _UAPI_XT_CONNLABEL_H */
include/uapi/linux/psp-sev.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0-only */
1+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
22 /*
33 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
44 * platform management commands.
include/uapi/linux/rxrpc.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0-or-later */
1+/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */
22 /* Types and definitions for AF_RXRPC.
33 *
44 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
include/uapi/linux/serial_core.h+0−3
@@ -150,9 +150,6 @@ · 149 unmodified lines
150150
151151 #define PORT_PNX8XXX 70
152152
153−/* Hilscher netx */
154−#define PORT_NETX 71
155−
156153 /* SUN4V Hypervisor Console */
157154 #define PORT_SUNHV 72
158155
include/uapi/linux/socket.h+13−6
@@ -6,17 +6,24 @@ · 5 unmodified lines
66 * Desired design of maximum size and alignment (see RFC2553)
77 */
88 #define _K_SS_MAXSIZE 128 /* Implementation specific max size */
9−#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *))
10− /* Implementation specific desired alignment */
119
1210 typedef unsigned short __kernel_sa_family_t;
1311
12+/*
13+ * The definition uses anonymous union and struct in order to control the
14+ * default alignment.
15+ */
1416 struct __kernel_sockaddr_storage {
15− __kernel_sa_family_t ss_family; /* address family */
16− /* Following field(s) are implementation specific */
17− char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
17+ union {
18+ struct {
19+ __kernel_sa_family_t ss_family; /* address family */
20+ /* Following field(s) are implementation specific */
21+ char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
1822 /* space to achieve desired size, */
1923 /* _SS_MAXSIZE value minus size of ss_family */
20−} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */
24+ };
25+ void *__align; /* implementation specific desired alignment */
26+ };
27+};
2128
2229 #endif /* _UAPI_LINUX_SOCKET_H */
include/uapi/linux/usb/g_uvc.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0+ */
1+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
22 /*
33 * g_uvc.h -- USB Video Class Gadget driver API
44 *
include/uapi/linux/vbox_vmmdev_types.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
1+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
22 /*
33 * Virtual Device for Guest <-> VMM/Host communication, type definitions
44 * which are also used for the vboxguest ioctl interface / by vboxsf
include/uapi/linux/vboxguest.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
1+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
22 /*
33 * VBoxGuest - VirtualBox Guest Additions Driver Interface.
44 *
include/uapi/linux/virtio_iommu.h+18−14
@@ -1,8 +1,8 @@
11 /* SPDX-License-Identifier: BSD-3-Clause */
22 /*
3− * Virtio-iommu definition v0.9
3+ * Virtio-iommu definition v0.12
44 *
5− * Copyright (C) 2018 Arm Ltd.
5+ * Copyright (C) 2019 Arm Ltd.
66 */
77 #ifndef _UAPI_LINUX_VIRTIO_IOMMU_H
88 #define _UAPI_LINUX_VIRTIO_IOMMU_H
@@ -11,26 +11,31 @@ · 2 unmodified lines
1111
1212 /* Feature bits */
1313 #define VIRTIO_IOMMU_F_INPUT_RANGE 0
14−#define VIRTIO_IOMMU_F_DOMAIN_BITS 1
14+#define VIRTIO_IOMMU_F_DOMAIN_RANGE 1
1515 #define VIRTIO_IOMMU_F_MAP_UNMAP 2
1616 #define VIRTIO_IOMMU_F_BYPASS 3
1717 #define VIRTIO_IOMMU_F_PROBE 4
18+#define VIRTIO_IOMMU_F_MMIO 5
1819
19−struct virtio_iommu_range {
20− __u64 start;
21− __u64 end;
20+struct virtio_iommu_range_64 {
21+ __le64 start;
22+ __le64 end;
23+};
24+
25+struct virtio_iommu_range_32 {
26+ __le32 start;
27+ __le32 end;
2228 };
2329
2430 struct virtio_iommu_config {
2531 /* Supported page sizes */
26− __u64 page_size_mask;
32+ __le64 page_size_mask;
2733 /* Supported IOVA range */
28− struct virtio_iommu_range input_range;
34+ struct virtio_iommu_range_64 input_range;
2935 /* Max domain ID size */
30− __u8 domain_bits;
31− __u8 padding[3];
36+ struct virtio_iommu_range_32 domain_range;
3237 /* Probe buffer size */
33− __u32 probe_size;
38+ __le32 probe_size;
3439 };
3540
3641 /* Request types */
@@ -49,6 +54,7 @@ struct virtio_iommu_config { · 12 unmodified lines
4954 #define VIRTIO_IOMMU_S_RANGE 0x05
5055 #define VIRTIO_IOMMU_S_NOENT 0x06
5156 #define VIRTIO_IOMMU_S_FAULT 0x07
57+#define VIRTIO_IOMMU_S_NOMEM 0x08
5258
5359 struct virtio_iommu_req_head {
5460 __u8 type;
@@ -78,12 +84,10 @@ struct virtio_iommu_req_detach { · 23 unmodified lines
7884
7985 #define VIRTIO_IOMMU_MAP_F_READ (1 << 0)
8086 #define VIRTIO_IOMMU_MAP_F_WRITE (1 << 1)
81−#define VIRTIO_IOMMU_MAP_F_EXEC (1 << 2)
82−#define VIRTIO_IOMMU_MAP_F_MMIO (1 << 3)
87+#define VIRTIO_IOMMU_MAP_F_MMIO (1 << 2)
8388
8489 #define VIRTIO_IOMMU_MAP_F_MASK (VIRTIO_IOMMU_MAP_F_READ | \
8590 VIRTIO_IOMMU_MAP_F_WRITE | \
86− VIRTIO_IOMMU_MAP_F_EXEC | \
8791 VIRTIO_IOMMU_MAP_F_MMIO)
8892
8993 struct virtio_iommu_req_map {
include/uapi/linux/virtio_pmem.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
1+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
22 /*
33 * Definitions for virtio-pmem devices.
44 *
include/uapi/linux/vmcore.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 #ifndef _UAPI_VMCORE_H
33 #define _UAPI_VMCORE_H
44
include/uapi/linux/wmi.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0-only */
1+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
22 /*
33 * User API methods for ACPI-WMI mapping driver
44 *