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 */
2#ifndef _UAPI_LINUX_BPFILTER_H2#ifndef _UAPI_LINUX_BPFILTER_H
3#define _UAPI_LINUX_BPFILTER_H3#define _UAPI_LINUX_BPFILTER_H
4 4
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 */
2/*2/*
3 * Copyright (c) 2015-2018, Intel Corporation.3 * Copyright (c) 2015-2018, Intel Corporation.
4 */4 */
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 */
2/*2/*
3 * Intel Speed Select Interface: OS to hardware Interface3 * Intel Speed Select Interface: OS to hardware Interface
4 * Copyright (c) 2019, Intel Corporation.4 * Copyright (c) 2019, Intel Corporation.
include/uapi/linux/kvm.h+2−2
@@ -116,7 +116,7 @@ struct kvm_irq_level { · 115 unmodified lines
116 * ACPI gsi notion of irq.116 * ACPI gsi notion of irq.
117 * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47..117 * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47..
118 * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23..118 * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23..
119 * For ARM: See Documentation/virtual/kvm/api.txt119 * For ARM: See Documentation/virt/kvm/api.txt
120 */120 */
121 union {121 union {
122 __u32 irq;122 __u32 irq;
@@ -1086,7 +1086,7 @@ struct kvm_xen_hvm_config { · 963 unmodified lines
1086 *1086 *
1087 * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies1087 * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies
1088 * the irqfd to operate in resampling mode for level triggered interrupt1088 * 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.
1090 */1090 */
1091#define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)1091#define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)
1092 1092
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 */
2#ifndef _NF_SYNPROXY_H2#ifndef _NF_SYNPROXY_H
3#define _NF_SYNPROXY_H3#define _NF_SYNPROXY_H
4 4
include/uapi/linux/netfilter/xt_connlabel.h+6−0
@@ -1,4 +1,8 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2
3#ifndef _UAPI_XT_CONNLABEL_H
4#define _UAPI_XT_CONNLABEL_H
5
2#include <linux/types.h>6#include <linux/types.h>
3 7
4#define XT_CONNLABEL_MAXBIT 1278#define XT_CONNLABEL_MAXBIT 127
@@ -11,3 +15,5 @@ struct xt_connlabel_mtinfo { · 6 unmodified lines
11 __u16 bit;15 __u16 bit;
12 __u16 options;16 __u16 options;
13};17};
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 */
2/*2/*
3 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)3 * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
4 * platform management commands.4 * 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 */
2/* Types and definitions for AF_RXRPC.2/* Types and definitions for AF_RXRPC.
3 *3 *
4 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.4 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
include/uapi/linux/serial_core.h+0−3
@@ -150,9 +150,6 @@ · 149 unmodified lines
150 150
151#define PORT_PNX8XXX 70151#define PORT_PNX8XXX 70
152 152
153/* Hilscher netx */
154#define PORT_NETX 71
155
156/* SUN4V Hypervisor Console */153/* SUN4V Hypervisor Console */
157#define PORT_SUNHV 72154#define PORT_SUNHV 72
158 155
include/uapi/linux/socket.h+13−6
@@ -6,17 +6,24 @@ · 5 unmodified lines
6 * Desired design of maximum size and alignment (see RFC2553)6 * Desired design of maximum size and alignment (see RFC2553)
7 */7 */
8#define _K_SS_MAXSIZE 128 /* Implementation specific max size */8#define _K_SS_MAXSIZE 128 /* Implementation specific max size */
9#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *))
10 /* Implementation specific desired alignment */
11 9
12typedef unsigned short __kernel_sa_family_t;10typedef unsigned short __kernel_sa_family_t;
13 11
12/*
13 * The definition uses anonymous union and struct in order to control the
14 * default alignment.
15 */
14struct __kernel_sockaddr_storage {16struct __kernel_sockaddr_storage {
15 __kernel_sa_family_t ss_family; /* address family */17 union {
16 /* Following field(s) are implementation specific */18 struct {
17 char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];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)];
18 /* space to achieve desired size, */22 /* space to achieve desired size, */
19 /* _SS_MAXSIZE value minus size of ss_family */23 /* _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};
21 28
22#endif /* _UAPI_LINUX_SOCKET_H */29#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 */
2/*2/*
3 * g_uvc.h -- USB Video Class Gadget driver API3 * g_uvc.h -- USB Video Class Gadget driver API
4 *4 *
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) */
2/*2/*
3 * Virtual Device for Guest <-> VMM/Host communication, type definitions3 * Virtual Device for Guest <-> VMM/Host communication, type definitions
4 * which are also used for the vboxguest ioctl interface / by vboxsf4 * 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) */
2/*2/*
3 * VBoxGuest - VirtualBox Guest Additions Driver Interface.3 * VBoxGuest - VirtualBox Guest Additions Driver Interface.
4 *4 *
include/uapi/linux/virtio_iommu.h+18−14
@@ -1,8 +1,8 @@
1/* SPDX-License-Identifier: BSD-3-Clause */1/* SPDX-License-Identifier: BSD-3-Clause */
2/*2/*
3 * Virtio-iommu definition v0.93 * Virtio-iommu definition v0.12
4 *4 *
5 * Copyright (C) 2018 Arm Ltd.5 * Copyright (C) 2019 Arm Ltd.
6 */6 */
7#ifndef _UAPI_LINUX_VIRTIO_IOMMU_H7#ifndef _UAPI_LINUX_VIRTIO_IOMMU_H
8#define _UAPI_LINUX_VIRTIO_IOMMU_H8#define _UAPI_LINUX_VIRTIO_IOMMU_H
@@ -11,26 +11,31 @@ · 2 unmodified lines
11 11
12/* Feature bits */12/* Feature bits */
13#define VIRTIO_IOMMU_F_INPUT_RANGE 013#define VIRTIO_IOMMU_F_INPUT_RANGE 0
14#define VIRTIO_IOMMU_F_DOMAIN_BITS 114#define VIRTIO_IOMMU_F_DOMAIN_RANGE 1
15#define VIRTIO_IOMMU_F_MAP_UNMAP 215#define VIRTIO_IOMMU_F_MAP_UNMAP 2
16#define VIRTIO_IOMMU_F_BYPASS 316#define VIRTIO_IOMMU_F_BYPASS 3
17#define VIRTIO_IOMMU_F_PROBE 417#define VIRTIO_IOMMU_F_PROBE 4
18#define VIRTIO_IOMMU_F_MMIO 5
18 19
19struct virtio_iommu_range {20struct virtio_iommu_range_64 {
20 __u64 start;21 __le64 start;
21 __u64 end;22 __le64 end;
23};
24
25struct virtio_iommu_range_32 {
26 __le32 start;
27 __le32 end;
22};28};
23 29
24struct virtio_iommu_config {30struct virtio_iommu_config {
25 /* Supported page sizes */31 /* Supported page sizes */
26 __u64 page_size_mask;32 __le64 page_size_mask;
27 /* Supported IOVA range */33 /* Supported IOVA range */
28 struct virtio_iommu_range input_range;34 struct virtio_iommu_range_64 input_range;
29 /* Max domain ID size */35 /* Max domain ID size */
30 __u8 domain_bits;36 struct virtio_iommu_range_32 domain_range;
31 __u8 padding[3];
32 /* Probe buffer size */37 /* Probe buffer size */
33 __u32 probe_size;38 __le32 probe_size;
34};39};
35 40
36/* Request types */41/* Request types */
@@ -49,6 +54,7 @@ struct virtio_iommu_config { · 12 unmodified lines
49#define VIRTIO_IOMMU_S_RANGE 0x0554#define VIRTIO_IOMMU_S_RANGE 0x05
50#define VIRTIO_IOMMU_S_NOENT 0x0655#define VIRTIO_IOMMU_S_NOENT 0x06
51#define VIRTIO_IOMMU_S_FAULT 0x0756#define VIRTIO_IOMMU_S_FAULT 0x07
57#define VIRTIO_IOMMU_S_NOMEM 0x08
52 58
53struct virtio_iommu_req_head {59struct virtio_iommu_req_head {
54 __u8 type;60 __u8 type;
@@ -78,12 +84,10 @@ struct virtio_iommu_req_detach { · 23 unmodified lines
78 84
79#define VIRTIO_IOMMU_MAP_F_READ (1 << 0)85#define VIRTIO_IOMMU_MAP_F_READ (1 << 0)
80#define VIRTIO_IOMMU_MAP_F_WRITE (1 << 1)86#define VIRTIO_IOMMU_MAP_F_WRITE (1 << 1)
81#define VIRTIO_IOMMU_MAP_F_EXEC (1 << 2)87#define VIRTIO_IOMMU_MAP_F_MMIO (1 << 2)
82#define VIRTIO_IOMMU_MAP_F_MMIO (1 << 3)
83 88
84#define VIRTIO_IOMMU_MAP_F_MASK (VIRTIO_IOMMU_MAP_F_READ | \89#define VIRTIO_IOMMU_MAP_F_MASK (VIRTIO_IOMMU_MAP_F_READ | \
85 VIRTIO_IOMMU_MAP_F_WRITE | \90 VIRTIO_IOMMU_MAP_F_WRITE | \
86 VIRTIO_IOMMU_MAP_F_EXEC | \
87 VIRTIO_IOMMU_MAP_F_MMIO)91 VIRTIO_IOMMU_MAP_F_MMIO)
88 92
89struct virtio_iommu_req_map {93struct 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 */
2/*2/*
3 * Definitions for virtio-pmem devices.3 * Definitions for virtio-pmem devices.
4 *4 *
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 */
2#ifndef _UAPI_VMCORE_H2#ifndef _UAPI_VMCORE_H
3#define _UAPI_VMCORE_H3#define _UAPI_VMCORE_H
4 4
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 */
2/*2/*
3 * User API methods for ACPI-WMI mapping driver3 * User API methods for ACPI-WMI mapping driver
4 *4 *