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
31683168 * Return
31693169 * The id is returned or 0 in case the id could not be retrieved.
31703170 *
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)
31723172 * Description
31733173 * Copy *size* bytes from *data* into a ring buffer *ringbuf*.
3174− * If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
3175− * new data availability is sent.
3176− * IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of
3177− * new data availability is sent unconditionally.
3174+ * If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
3175+ * of new data availability is sent.
3176+ * If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
3177+ * of new data availability is sent unconditionally.
31783178 * Return
3179− * 0, on success;
3180− * < 0, on error.
3179+ * 0 on success, or a negative error in case of failure.
31813180 *
31823181 * void *bpf_ringbuf_reserve(void *ringbuf, u64 size, u64 flags)
31833182 * Description
@@ -3189,20 +3188,20 @@ union bpf_attr { · 5 unmodified lines
31893188 * void bpf_ringbuf_submit(void *data, u64 flags)
31903189 * Description
31913190 * Submit reserved ring buffer sample, pointed to by *data*.
3192− * If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
3193− * new data availability is sent.
3194− * IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of
3195− * new data availability is sent unconditionally.
3191+ * If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
3192+ * of new data availability is sent.
3193+ * If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
3194+ * of new data availability is sent unconditionally.
31963195 * Return
31973196 * Nothing. Always succeeds.
31983197 *
31993198 * void bpf_ringbuf_discard(void *data, u64 flags)
32003199 * Description
32013200 * Discard reserved ring buffer sample, pointed to by *data*.
3202− * If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
3203− * new data availability is sent.
3204− * IF BPF_RB_FORCE_WAKEUP is specified in *flags*, notification of
3205− * new data availability is sent unconditionally.
3201+ * If **BPF_RB_NO_WAKEUP** is specified in *flags*, no notification
3202+ * of new data availability is sent.
3203+ * If **BPF_RB_FORCE_WAKEUP** is specified in *flags*, notification
3204+ * of new data availability is sent unconditionally.
32063205 * Return
32073206 * Nothing. Always succeeds.
32083207 *
@@ -3210,16 +3209,18 @@ union bpf_attr { · 1 unmodified line
32103209 * Description
32113210 * Query various characteristics of provided ring buffer. What
32123211 * exactly is queries is determined by *flags*:
3213− * - BPF_RB_AVAIL_DATA - amount of data not yet consumed;
3214− * - BPF_RB_RING_SIZE - the size of ring buffer;
3215− * - BPF_RB_CONS_POS - consumer position (can wrap around);
3216− * - BPF_RB_PROD_POS - producer(s) position (can wrap around);
3217− * Data returned is just a momentary snapshots of actual values
3212+ *
3213+ * * **BPF_RB_AVAIL_DATA**: Amount of data not yet consumed.
3214+ * * **BPF_RB_RING_SIZE**: The size of ring buffer.
3215+ * * **BPF_RB_CONS_POS**: Consumer position (can wrap around).
3216+ * * **BPF_RB_PROD_POS**: Producer(s) position (can wrap around).
3217+ *
3218+ * Data returned is just a momentary snapshot of actual values
32183219 * and could be inaccurate, so this facility should be used to
32193220 * power heuristics and for reporting, not to make 100% correct
32203221 * calculation.
32213222 * Return
3222− * Requested value, or 0, if flags are not recognized.
3223+ * Requested value, or 0, if *flags* are not recognized.
32233224 *
32243225 * int bpf_csum_level(struct sk_buff *skb, u64 level)
32253226 * Description
include/uapi/linux/fb.h+1−0
@@ -205,6 +205,7 @@ struct fb_bitfield { · 204 unmodified lines
205205 #define FB_ACTIVATE_ALL 64 /* change all VCs on this fb */
206206 #define FB_ACTIVATE_FORCE 128 /* force apply even when no change*/
207207 #define FB_ACTIVATE_INV_MODE 256 /* invalidate videomode */
208+#define FB_ACTIVATE_KD_TEXT 512 /* for KDSET vt ioctl */
208209
209210 #define FB_ACCELF_TEXT 1 /* (OBSOLETE) see fb_info.flags and vc_mode */
210211
include/uapi/linux/idxd.h+3−0
@@ -110,9 +110,12 @@ struct dsa_hw_desc { · 109 unmodified lines
110110 uint16_t rsvd1;
111111 union {
112112 uint8_t expected_res;
113+ /* create delta record */
113114 struct {
114115 uint64_t delta_addr;
115116 uint32_t max_delta_size;
117+ uint32_t delt_rsvd;
118+ uint8_t expected_res_mask;
116119 };
117120 uint32_t delta_rec_size;
118121 uint64_t dest2;
include/uapi/linux/input-event-codes.h+2−1
@@ -888,7 +888,8 @@ · 887 unmodified lines
888888 #define SW_LINEIN_INSERT 0x0d /* set = inserted */
889889 #define SW_MUTE_DEVICE 0x0e /* set = device disabled */
890890 #define SW_PEN_INSERTED 0x0f /* set = pen inserted */
891−#define SW_MAX 0x0f
891+#define SW_MACHINE_COVER 0x10 /* set = cover closed */
892+#define SW_MAX 0x10
892893 #define SW_CNT (SW_MAX+1)
893894
894895 /*
include/uapi/linux/io_uring.h+1−0
@@ -197,6 +197,7 @@ struct io_sqring_offsets { · 196 unmodified lines
197197 * sq_ring->flags
198198 */
199199 #define IORING_SQ_NEED_WAKEUP (1U << 0) /* needs io_uring_enter wakeup */
200+#define IORING_SQ_CQ_OVERFLOW (1U << 1) /* CQ ring is overflown */
200201
201202 struct io_cqring_offsets {
202203 __u32 head;
include/uapi/linux/mrp_bridge.h+0−1
@@ -36,7 +36,6 @@ enum br_mrp_port_state_type { · 35 unmodified lines
3636 enum br_mrp_port_role_type {
3737 BR_MRP_PORT_ROLE_PRIMARY,
3838 BR_MRP_PORT_ROLE_SECONDARY,
39− BR_MRP_PORT_ROLE_NONE,
4039 };
4140
4241 enum br_mrp_tlv_header_type {
include/uapi/linux/rds.h+3−1
@@ -64,10 +64,12 @@ · 63 unmodified lines
6464
6565 /* supported values for SO_RDS_TRANSPORT */
6666 #define RDS_TRANS_IB 0
67−#define RDS_TRANS_IWARP 1
67+#define RDS_TRANS_GAP 1
6868 #define RDS_TRANS_TCP 2
6969 #define RDS_TRANS_COUNT 3
7070 #define RDS_TRANS_NONE (~0)
71+/* don't use RDS_TRANS_IWARP - it is deprecated */
72+#define RDS_TRANS_IWARP RDS_TRANS_GAP
7173
7274 /* IOCTLS commands for SOL_RDS */
7375 #define SIOCRDSSETTOS (SIOCPROTOPRIVATE)
include/uapi/linux/spi/spidev.h+4−0
@@ -48,6 +48,10 @@ · 47 unmodified lines
4848 #define SPI_TX_QUAD 0x200
4949 #define SPI_RX_DUAL 0x400
5050 #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
5155
5256 /*---------------------------------------------------------------------------*/
5357
include/uapi/linux/vboxguest.h+2−2
@@ -103,7 +103,7 @@ VMMDEV_ASSERT_SIZE(vbg_ioctl_driver_version_info, 24 + 20); · 102 unmodified lines
103103
104104
105105 /* 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)
107107
108108
109109 /** VBG_IOCTL_HGCM_CONNECT data structure. */
@@ -198,7 +198,7 @@ struct vbg_ioctl_log { · 88 unmodified lines
198198 } u;
199199 };
200200
201−#define VBG_IOCTL_LOG(s) _IOC(_IOC_READ | _IOC_WRITE, 'V', 9, s)
201+#define VBG_IOCTL_LOG(s) _IO('V', 9)
202202
203203
204204 /** 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
10301030 * size in bytes that can be used by user applications when getting the dirty
10311031 * bitmap.
10321032 */
1033−#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 1
1033+#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 2
10341034
10351035 struct vfio_iommu_type1_info_cap_migration {
10361036 struct vfio_info_cap_header header;