History

Merge 5.8-rc6 into tty-next

We need the serial/tty fixes in here as well.

Greg Kroah-Hartman committed 6 years ago

Commit 6f2c6592 parents ea1be1e ba47d841395 files · +12287 −6522Browse files

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

Unified · Split

10 files
  1. include/uapi/linux/bpf.h +22 −21
  2. include/uapi/linux/fb.h +1 −0
  3. include/uapi/linux/idxd.h +3 −0
  4. include/uapi/linux/input-event-codes.h +2 −1
  5. include/uapi/linux/io_uring.h +1 −0
  6. include/uapi/linux/mrp_bridge.h +0 −1
  7. include/uapi/linux/rds.h +3 −1
  8. include/uapi/linux/spi/spidev.h +4 −0
  9. include/uapi/linux/vboxguest.h +2 −2
  10. include/uapi/linux/vfio.h +1 −1
include/uapi/linux/bpf.h+22−21
@@ -3168,16 +3168,15 @@ union bpf_attr { · 3167 unmodified lines
3168 * Return3168 * Return
3169 * The id is returned or 0 in case the id could not be retrieved.3169 * The id is returned or 0 in case the id could not be retrieved.
3170 *3170 *
3171 * void *bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags)3171 * int bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags)
3172 * Description3172 * Description
3173 * Copy *size* bytes from *data* into a ring buffer *ringbuf*.3173 * Copy *size* bytes from *data* into a ring buffer *ringbuf*.
3174 * If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of3174 * If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
3175 * new data availability is sent.3175 * of new data availability is sent.
3176 * IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of3176 * If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
3177 * new data availability is sent unconditionally.3177 * of new data availability is sent unconditionally.
3178 * Return3178 * Return
3179 * 0, on success;3179 * 0 on success, or a negative error in case of failure.
3180 * < 0, on error.
3181 *3180 *
3182 * void *bpf_ringbuf_reserve(void *ringbuf, u64 size, u64 flags)3181 * void *bpf_ringbuf_reserve(void *ringbuf, u64 size, u64 flags)
3183 * Description3182 * Description
@@ -3189,20 +3188,20 @@ union bpf_attr { · 5 unmodified lines
3189 * void bpf_ringbuf_submit(void *data, u64 flags)3188 * void bpf_ringbuf_submit(void *data, u64 flags)
3190 * Description3189 * Description
3191 * Submit reserved ring buffer sample, pointed to by *data*.3190 * Submit reserved ring buffer sample, pointed to by *data*.
3192 * If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of3191 * If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
3193 * new data availability is sent.3192 * of new data availability is sent.
3194 * IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of3193 * If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
3195 * new data availability is sent unconditionally.3194 * of new data availability is sent unconditionally.
3196 * Return3195 * Return
3197 * Nothing. Always succeeds.3196 * Nothing. Always succeeds.
3198 *3197 *
3199 * void bpf_ringbuf_discard(void *data, u64 flags)3198 * void bpf_ringbuf_discard(void *data, u64 flags)
3200 * Description3199 * Description
3201 * Discard reserved ring buffer sample, pointed to by *data*.3200 * Discard reserved ring buffer sample, pointed to by *data*.
3202 * If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of3201 * If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
3203 * new data availability is sent.3202 * of new data availability is sent.
3204 * IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of3203 * If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
3205 * new data availability is sent unconditionally.3204 * of new data availability is sent unconditionally.
3206 * Return3205 * Return
3207 * Nothing. Always succeeds.3206 * Nothing. Always succeeds.
3208 *3207 *
@@ -3210,16 +3209,18 @@ union bpf_attr { · 1 unmodified line
3210 * Description3209 * Description
3211 * Query various characteristics of provided ring buffer. What3210 * Query various characteristics of provided ring buffer. What
3212 * exactly is queries is determined by *flags*:3211 * exactly is queries is determined by *flags*:
3213 * - BPF_RB_AVAIL_DATA - amount of data not yet consumed;3212 *
3214 * - BPF_RB_RING_SIZE - the size of ring buffer;3213 * * **BPF_RB_AVAIL_DATA**: Amount of data not yet consumed.
3215 * - BPF_RB_CONS_POS - consumer position (can wrap around);3214 * * **BPF_RB_RING_SIZE**: The size of ring buffer.
3216 * - BPF_RB_PROD_POS - producer(s) position (can wrap around);3215 * * **BPF_RB_CONS_POS**: Consumer position (can wrap around).
3217 * Data returned is just a momentary snapshots of actual values3216 * * **BPF_RB_PROD_POS**: Producer(s) position (can wrap around).
3217 *
3218 * Data returned is just a momentary snapshot of actual values
3218 * and could be inaccurate, so this facility should be used to3219 * and could be inaccurate, so this facility should be used to
3219 * power heuristics and for reporting, not to make 100% correct3220 * power heuristics and for reporting, not to make 100% correct
3220 * calculation.3221 * calculation.
3221 * Return3222 * Return
3222 * Requested value, or 0, if flags are not recognized.3223 * Requested value, or 0, if *flags* are not recognized.
3223 *3224 *
3224 * int bpf_csum_level(struct sk_buff *skb, u64 level)3225 * int bpf_csum_level(struct sk_buff *skb, u64 level)
3225 * Description3226 * Description
include/uapi/linux/fb.h+1−0
@@ -205,6 +205,7 @@ struct fb_bitfield { · 204 unmodified lines
205#define FB_ACTIVATE_ALL 64 /* change all VCs on this fb */205#define FB_ACTIVATE_ALL 64 /* change all VCs on this fb */
206#define FB_ACTIVATE_FORCE 128 /* force apply even when no change*/206#define FB_ACTIVATE_FORCE 128 /* force apply even when no change*/
207#define FB_ACTIVATE_INV_MODE 256 /* invalidate videomode */207#define FB_ACTIVATE_INV_MODE 256 /* invalidate videomode */
208#define FB_ACTIVATE_KD_TEXT 512 /* for KDSET vt ioctl */
208 209
209#define FB_ACCELF_TEXT 1 /* (OBSOLETE) see fb_info.flags and vc_mode */210#define FB_ACCELF_TEXT 1 /* (OBSOLETE) see fb_info.flags and vc_mode */
210 211
include/uapi/linux/idxd.h+3−0
@@ -110,9 +110,12 @@ struct dsa_hw_desc { · 109 unmodified lines
110 uint16_t rsvd1;110 uint16_t rsvd1;
111 union {111 union {
112 uint8_t expected_res;112 uint8_t expected_res;
113 /* create delta record */
113 struct {114 struct {
114 uint64_t delta_addr;115 uint64_t delta_addr;
115 uint32_t max_delta_size;116 uint32_t max_delta_size;
117 uint32_t delt_rsvd;
118 uint8_t expected_res_mask;
116 };119 };
117 uint32_t delta_rec_size;120 uint32_t delta_rec_size;
118 uint64_t dest2;121 uint64_t dest2;
include/uapi/linux/input-event-codes.h+2−1
@@ -888,7 +888,8 @@ · 887 unmodified lines
888#define SW_LINEIN_INSERT 0x0d /* set = inserted */888#define SW_LINEIN_INSERT 0x0d /* set = inserted */
889#define SW_MUTE_DEVICE 0x0e /* set = device disabled */889#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
890#define SW_PEN_INSERTED 0x0f /* set = pen inserted */890#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
891#define SW_MAX 0x0f891#define SW_MACHINE_COVER 0x10 /* set = cover closed */
892#define SW_MAX 0x10
892#define SW_CNT (SW_MAX+1)893#define SW_CNT (SW_MAX+1)
893 894
894/*895/*
include/uapi/linux/io_uring.h+1−0
@@ -197,6 +197,7 @@ struct io_sqring_offsets { · 196 unmodified lines
197 * sq_ring->flags197 * sq_ring->flags
198 */198 */
199#define IORING_SQ_NEED_WAKEUP (1U << 0) /* needs io_uring_enter wakeup */199#define IORING_SQ_NEED_WAKEUP (1U << 0) /* needs io_uring_enter wakeup */
200#define IORING_SQ_CQ_OVERFLOW (1U << 1) /* CQ ring is overflown */
200 201
201struct io_cqring_offsets {202struct io_cqring_offsets {
202 __u32 head;203 __u32 head;
include/uapi/linux/mrp_bridge.h+0−1
@@ -36,7 +36,6 @@ enum br_mrp_port_state_type { · 35 unmodified lines
36enum br_mrp_port_role_type {36enum br_mrp_port_role_type {
37 BR_MRP_PORT_ROLE_PRIMARY,37 BR_MRP_PORT_ROLE_PRIMARY,
38 BR_MRP_PORT_ROLE_SECONDARY,38 BR_MRP_PORT_ROLE_SECONDARY,
39 BR_MRP_PORT_ROLE_NONE,
40};39};
41 40
42enum br_mrp_tlv_header_type {41enum br_mrp_tlv_header_type {
include/uapi/linux/rds.h+3−1
@@ -64,10 +64,12 @@ · 63 unmodified lines
64 64
65/* supported values for SO_RDS_TRANSPORT */65/* supported values for SO_RDS_TRANSPORT */
66#define RDS_TRANS_IB 066#define RDS_TRANS_IB 0
67#define RDS_TRANS_IWARP 167#define RDS_TRANS_GAP 1
68#define RDS_TRANS_TCP 268#define RDS_TRANS_TCP 2
69#define RDS_TRANS_COUNT 369#define RDS_TRANS_COUNT 3
70#define RDS_TRANS_NONE (~0)70#define RDS_TRANS_NONE (~0)
71/* don't use RDS_TRANS_IWARP - it is deprecated */
72#define RDS_TRANS_IWARP RDS_TRANS_GAP
71 73
72/* IOCTLS commands for SOL_RDS */74/* IOCTLS commands for SOL_RDS */
73#define SIOCRDSSETTOS (SIOCPROTOPRIVATE)75#define SIOCRDSSETTOS (SIOCPROTOPRIVATE)
include/uapi/linux/spi/spidev.h+4−0
@@ -48,6 +48,10 @@ · 47 unmodified lines
48#define SPI_TX_QUAD 0x20048#define SPI_TX_QUAD 0x200
49#define SPI_RX_DUAL 0x40049#define SPI_RX_DUAL 0x400
50#define SPI_RX_QUAD 0x80050#define SPI_RX_QUAD 0x800
51#define SPI_CS_WORD 0x1000
52#define SPI_TX_OCTAL 0x2000
53#define SPI_RX_OCTAL 0x4000
54#define SPI_3WIRE_HIZ 0x8000
51 55
52/*---------------------------------------------------------------------------*/56/*---------------------------------------------------------------------------*/
53 57
include/uapi/linux/vboxguest.h+2−2
@@ -103,7 +103,7 @@ VMMDEV_ASSERT_SIZE(vbg_ioctl_driver_version_info, 24 + 20); · 102 unmodified lines
103 103
104 104
105/* IOCTL to perform a VMM Device request larger then 1KB. */105/* IOCTL to perform a VMM Device request larger then 1KB. */
106#define VBG_IOCTL_VMMDEV_REQUEST_BIG _IOC(_IOC_READ | _IOC_WRITE, 'V', 3, 0)106#define VBG_IOCTL_VMMDEV_REQUEST_BIG _IO('V', 3)
107 107
108 108
109/** VBG_IOCTL_HGCM_CONNECT data structure. */109/** VBG_IOCTL_HGCM_CONNECT data structure. */
@@ -198,7 +198,7 @@ struct vbg_ioctl_log { · 88 unmodified lines
198 } u;198 } u;
199};199};
200 200
201#define VBG_IOCTL_LOG(s) _IOC(_IOC_READ | _IOC_WRITE, 'V', 9, s)201#define VBG_IOCTL_LOG(s) _IO('V', 9)
202 202
203 203
204/** VBG_IOCTL_WAIT_FOR_EVENTS data structure. */204/** VBG_IOCTL_WAIT_FOR_EVENTS data structure. */
include/uapi/linux/vfio.h+1−1
@@ -1030,7 +1030,7 @@ struct vfio_iommu_type1_info_cap_iova_range { · 1029 unmodified lines
1030 * size in bytes that can be used by user applications when getting the dirty1030 * size in bytes that can be used by user applications when getting the dirty
1031 * bitmap.1031 * bitmap.
1032 */1032 */
1033#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 11033#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 2
1034 1034
1035struct vfio_iommu_type1_info_cap_migration {1035struct vfio_iommu_type1_info_cap_migration {
1036 struct vfio_info_cap_header header;1036 struct vfio_info_cap_header header;