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

Cross-merge networking fixes after downstream PR (net-6.17-rc2). No conflicts. Adjacent changes: drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c d7a276a5768f ("net: stmmac: rk: convert to suspend()/resume() methods") de1e963ad064 ("net: stmmac: rk: put the PHY clock on remove")

Jakub Kicinski committed 1 year ago

Commit f24775c2 parents 875c541 6346713573 files · +5803 −3228Browse files

Showing the changes to include/uapi (3 of 573 files). Show all

Unified · Split

3 files

include/uapi/linux/io_uring.h +4 −0
include/uapi/linux/raid/md_p.h +1 −1
include/uapi/linux/vt.h +17 −17

include/uapi/linux/io_uring.h+4−0

@@ -392,12 +392,16 @@ enum io_uring_op { · 391 unmodified lines
392	392	* the starting buffer ID in cqe->flags as per
393	393	* usual for provided buffer usage. The buffers
394	394	* will be contiguous from the starting buffer ID.
	395	+ *
	396	+ * IORING_SEND_VECTORIZED If set, SEND[_ZC] will take a pointer to a io_vec
	397	+ * to allow vectorized send operations.
395	398	*/
396	399	#define IORING_RECVSEND_POLL_FIRST (1U << 0)
397	400	#define IORING_RECV_MULTISHOT (1U << 1)
398	401	#define IORING_RECVSEND_FIXED_BUF (1U << 2)
399	402	#define IORING_SEND_ZC_REPORT_USAGE (1U << 3)
400	403	#define IORING_RECVSEND_BUNDLE (1U << 4)
	404	+#define IORING_SEND_VECTORIZED (1U << 5)
401	405
402	406	/*
403	407	* cqe.res for IORING_CQE_F_NOTIF if

include/uapi/linux/raid/md_p.h+1−1

@@ -173,7 +173,7 @@ typedef struct mdp_superblock_s { · 172 unmodified lines
173	173	#else
174	174	#error unspecified endianness
175	175	#endif
176		− __u32 recovery_cp; /* 11 recovery checkpoint sector count */
	176	+ __u32 resync_offset; /* 11 resync checkpoint sector count */
177	177	/* There are only valid for minor_version > 90 */
178	178	__u64 reshape_position; /* 12,13 next address in array-space for reshape */
179	179	__u32 new_level; /* 14 new level we are reshaping to */

include/uapi/linux/vt.h+17−17

@@ -14,9 +14,9 @@ · 13 unmodified lines
14	14	/* Note: the ioctl VT_GETSTATE does not work for
15	15	consoles 16 and higher (since it returns a short) */
16	16
17		−/* 'V' to avoid collision with termios and kd */
	17	+/* 0x56 is 'V', to avoid collision with termios and kd */
18	18
19		−#define VT_OPENQRY _IO('V', 0x00) /* find available vt */
	19	+#define VT_OPENQRY 0x5600 /* find available vt */
20	20
21	21	struct vt_mode {
22	22	__u8 mode; /* vt mode */
@@ -25,8 +25,8 @@ struct vt_mode { · 2 unmodified lines
25	25	__s16 acqsig; /* signal to raise on acquisition */
26	26	__s16 frsig; /* unused (set to 0) */
27	27	};
28		−#define VT_GETMODE _IO('V', 0x01) /* get mode of active vt */
29		−#define VT_SETMODE _IO('V', 0x02) /* set mode of active vt */
	28	+#define VT_GETMODE 0x5601 /* get mode of active vt */
	29	+#define VT_SETMODE 0x5602 /* set mode of active vt */
30	30	#define VT_AUTO 0x00 /* auto vt switching */
31	31	#define VT_PROCESS 0x01 /* process controls switching */
32	32	#define VT_ACKACQ 0x02 /* acknowledge switch */
@@ -36,21 +36,21 @@ struct vt_stat { · 3 unmodified lines
36	36	__u16 v_signal; /* signal to send */
37	37	__u16 v_state; /* vt bitmask */
38	38	};
39		−#define VT_GETSTATE _IO('V', 0x03) /* get global vt state info */
40		−#define VT_SENDSIG _IO('V', 0x04) /* signal to send to bitmask of vts */
	39	+#define VT_GETSTATE 0x5603 /* get global vt state info */
	40	+#define VT_SENDSIG 0x5604 /* signal to send to bitmask of vts */
41	41
42		−#define VT_RELDISP _IO('V', 0x05) /* release display */
	42	+#define VT_RELDISP 0x5605 /* release display */
43	43
44		−#define VT_ACTIVATE _IO('V', 0x06) /* make vt active */
45		−#define VT_WAITACTIVE _IO('V', 0x07) /* wait for vt active */
46		−#define VT_DISALLOCATE _IO('V', 0x08) /* free memory associated to vt */
	44	+#define VT_ACTIVATE 0x5606 /* make vt active */
	45	+#define VT_WAITACTIVE 0x5607 /* wait for vt active */
	46	+#define VT_DISALLOCATE 0x5608 /* free memory associated to vt */
47	47
48	48	struct vt_sizes {
49	49	__u16 v_rows; /* number of rows */
50	50	__u16 v_cols; /* number of columns */
51	51	__u16 v_scrollsize; /* number of lines of scrollback */
52	52	};
53		−#define VT_RESIZE _IO('V', 0x09) /* set kernel's idea of screensize */
	53	+#define VT_RESIZE 0x5609 /* set kernel's idea of screensize */
54	54
55	55	struct vt_consize {
56	56	__u16 v_rows; /* number of rows */
@@ -60,10 +60,10 @@ struct vt_consize { · 3 unmodified lines
60	60	__u16 v_vcol; /* number of pixel columns on screen */
61	61	__u16 v_ccol; /* number of pixel columns per character */
62	62	};
63		−#define VT_RESIZEX _IO('V', 0x0A) /* set kernel's idea of screensize + more */
64		−#define VT_LOCKSWITCH _IO('V', 0x0B) /* disallow vt switching */
65		−#define VT_UNLOCKSWITCH _IO('V', 0x0C) /* allow vt switching */
66		−#define VT_GETHIFONTMASK _IO('V', 0x0D) /* return hi font mask */
	63	+#define VT_RESIZEX 0x560A /* set kernel's idea of screensize + more */
	64	+#define VT_LOCKSWITCH 0x560B /* disallow vt switching */
	65	+#define VT_UNLOCKSWITCH 0x560C /* allow vt switching */
	66	+#define VT_GETHIFONTMASK 0x560D /* return hi font mask */
67	67
68	68	struct vt_event {
69	69	__u32 event;
@@ -77,14 +77,14 @@ struct vt_event { · 7 unmodified lines
77	77	__u32 pad[4]; /* Padding for expansion */
78	78	};
79	79
80		−#define VT_WAITEVENT _IO('V', 0x0E) /* Wait for an event */
	80	+#define VT_WAITEVENT 0x560E /* Wait for an event */
81	81
82	82	struct vt_setactivate {
83	83	__u32 console;
84	84	struct vt_mode mode;
85	85	};
86	86
87		−#define VT_SETACTIVATE _IO('V', 0x0F) /* Activate and set the mode of a console */
	87	+#define VT_SETACTIVATE 0x560F /* Activate and set the mode of a console */
88	88
89	89	/* get console size and cursor position */
90	90	struct vt_consizecsrpos {