History

Merge tag 'v7.1-rc6' into work

Linux 7.1-rc6

Jonathan Cameron committed 5 months ago

Commit c82228f2 parents 3f2d03e e43ffb62186 files · +34139 −16689Browse files

Showing the changes to include/uapi (2 of 2186 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/io_uring.h +2 −1
  2. include/uapi/linux/rseq.h +4 −1
include/uapi/linux/io_uring.h+2−1
@@ -905,7 +905,8 @@ struct io_uring_buf_reg { · 904 unmodified lines
905 __u32 ring_entries;905 __u32 ring_entries;
906 __u16 bgid;906 __u16 bgid;
907 __u16 flags;907 __u16 flags;
908 __u64 resv[3];908 __u32 min_left;
909 __u32 resv[5];
909};910};
910 911
911/* argument for IORING_REGISTER_PBUF_STATUS */912/* argument for IORING_REGISTER_PBUF_STATUS */
include/uapi/linux/rseq.h+4−1
@@ -28,7 +28,7 @@ enum rseq_cs_flags_bit { · 27 unmodified lines
28 RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT = 0,28 RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT_BIT = 0,
29 RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT = 1,29 RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL_BIT = 1,
30 RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT = 2,30 RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE_BIT = 2,
31 /* (3) Intentional gap to put new bits into a separate byte */31 /* (3) Intentional gap to keep new bits separate */
32 32
33 /* User read only feature flags */33 /* User read only feature flags */
34 RSEQ_CS_FLAG_SLICE_EXT_AVAILABLE_BIT = 4,34 RSEQ_CS_FLAG_SLICE_EXT_AVAILABLE_BIT = 4,
@@ -161,6 +161,9 @@ struct rseq { · 126 unmodified lines
161 * - RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT161 * - RSEQ_CS_FLAG_NO_RESTART_ON_PREEMPT
162 * - RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL162 * - RSEQ_CS_FLAG_NO_RESTART_ON_SIGNAL
163 * - RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE163 * - RSEQ_CS_FLAG_NO_RESTART_ON_MIGRATE
164 *
165 * It is now used for feature status advertisement by the kernel.
166 * See: enum rseq_cs_flags_bit for further information.
164 */167 */
165 __u32 flags;168 __u32 flags;
166 169