History

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

No conflicts.

Jakub Kicinski committed 3 years ago

Commit 4aea86b2 parents 0471005 50011c31151 files · +105880 −132765Browse files

Showing the changes to include/uapi (5 of 1151 files). Show all

Unified · Split

5 files
  1. include/uapi/linux/atmbr2684.h +1 −1
  2. include/uapi/linux/io_uring.h +8 −0
  3. include/uapi/linux/kvm.h +3 −0
  4. include/uapi/linux/pr.h +17 −0
  5. include/uapi/linux/vdpa.h +1 −3
include/uapi/linux/atmbr2684.h+1−1
@@ -38,7 +38,7 @@ · 37 unmodified lines
38 */38 */
39#define BR2684_ENCAPS_VC (0) /* VC-mux */39#define BR2684_ENCAPS_VC (0) /* VC-mux */
40#define BR2684_ENCAPS_LLC (1)40#define BR2684_ENCAPS_LLC (1)
41#define BR2684_ENCAPS_AUTODETECT (2) /* Unsuported */41#define BR2684_ENCAPS_AUTODETECT (2) /* Unsupported */
42 42
43/*43/*
44 * Is this VC bridged or routed?44 * Is this VC bridged or routed?
include/uapi/linux/io_uring.h+8−0
@@ -10,7 +10,15 @@ · 9 unmodified lines
10 10
11#include <linux/fs.h>11#include <linux/fs.h>
12#include <linux/types.h>12#include <linux/types.h>
13/*
14 * this file is shared with liburing and that has to autodetect
15 * if linux/time_types.h is available or not, it can
16 * define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
17 * if linux/time_types.h is not available
18 */
19#ifndef UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
13#include <linux/time_types.h>20#include <linux/time_types.h>
21#endif
14 22
15#ifdef __cplusplus23#ifdef __cplusplus
16extern "C" {24extern "C" {
include/uapi/linux/kvm.h+3−0
@@ -1767,6 +1767,7 @@ struct kvm_xen_hvm_attr { · 1766 unmodified lines
1767 __u8 runstate_update_flag;1767 __u8 runstate_update_flag;
1768 struct {1768 struct {
1769 __u64 gfn;1769 __u64 gfn;
1770#define KVM_XEN_INVALID_GFN ((__u64)-1)
1770 } shared_info;1771 } shared_info;
1771 struct {1772 struct {
1772 __u32 send_port;1773 __u32 send_port;
@@ -1798,6 +1799,7 @@ struct kvm_xen_hvm_attr { · 25 unmodified lines
1798 } u;1799 } u;
1799};1800};
1800 1801
1802
1801/* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_SHARED_INFO */1803/* Available with KVM_CAP_XEN_HVM / KVM_XEN_HVM_CONFIG_SHARED_INFO */
1802#define KVM_XEN_ATTR_TYPE_LONG_MODE 0x01804#define KVM_XEN_ATTR_TYPE_LONG_MODE 0x0
1803#define KVM_XEN_ATTR_TYPE_SHARED_INFO 0x11805#define KVM_XEN_ATTR_TYPE_SHARED_INFO 0x1
@@ -1823,6 +1825,7 @@ struct kvm_xen_vcpu_attr { · 19 unmodified lines
1823 __u16 pad[3];1825 __u16 pad[3];
1824 union {1826 union {
1825 __u64 gpa;1827 __u64 gpa;
1828#define KVM_XEN_INVALID_GPA ((__u64)-1)
1826 __u64 pad[8];1829 __u64 pad[8];
1827 struct {1830 struct {
1828 __u64 state;1831 __u64 state;
include/uapi/linux/pr.h+17−0
@@ -4,6 +4,23 @@ · 3 unmodified lines
4 4
5#include <linux/types.h>5#include <linux/types.h>
6 6
7enum pr_status {
8 PR_STS_SUCCESS = 0x0,
9 /*
10 * The following error codes are based on SCSI, because the interface
11 * was originally created for it and has existing users.
12 */
13 /* Generic device failure. */
14 PR_STS_IOERR = 0x2,
15 PR_STS_RESERVATION_CONFLICT = 0x18,
16 /* Temporary path failure that can be retried. */
17 PR_STS_RETRY_PATH_FAILURE = 0xe0000,
18 /* The request was failed due to a fast failure timer. */
19 PR_STS_PATH_FAST_FAILED = 0xf0000,
20 /* The path cannot be reached and has been marked as failed. */
21 PR_STS_PATH_FAILED = 0x10000,
22};
23
7enum pr_type {24enum pr_type {
8 PR_WRITE_EXCLUSIVE = 1,25 PR_WRITE_EXCLUSIVE = 1,
9 PR_EXCLUSIVE_ACCESS = 2,26 PR_EXCLUSIVE_ACCESS = 2,
include/uapi/linux/vdpa.h+1−3
@@ -53,11 +53,9 @@ enum vdpa_attr { · 52 unmodified lines
53 VDPA_ATTR_DEV_VENDOR_ATTR_NAME, /* string */53 VDPA_ATTR_DEV_VENDOR_ATTR_NAME, /* string */
54 VDPA_ATTR_DEV_VENDOR_ATTR_VALUE, /* u64 */54 VDPA_ATTR_DEV_VENDOR_ATTR_VALUE, /* u64 */
55 55
56 /* virtio features that are provisioned to the vDPA device */
56 VDPA_ATTR_DEV_FEATURES, /* u64 */57 VDPA_ATTR_DEV_FEATURES, /* u64 */
57 58
58 /* virtio features that are supported by the vDPA device */
59 VDPA_ATTR_VDPA_DEV_SUPPORTED_FEATURES, /* u64 */
60
61 /* new attributes must be added above here */59 /* new attributes must be added above here */
62 VDPA_ATTR_MAX,60 VDPA_ATTR_MAX,
63};61};

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