History

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

Cross-merge networking fixes after downstream PR (net-6.17-rc4). No conflicts. Adjacent changes: drivers/net/ethernet/intel/idpf/idpf_txrx.c 02614eee26fb ("idpf: do not linearize big TSO packets") 6c4e68480238 ("idpf: remove obsolete stashing code")

Jakub Kicinski committed 1 year ago

Commit d23ad542 parents 29828b8 9c736ac393 files · +3892 −2259Browse files

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

Unified · Split

3 files
  1. include/uapi/linux/pfrut.h +1 −0
  2. include/uapi/linux/raid/md_p.h +1 −1
  3. include/uapi/linux/vhost.h +2 −2
include/uapi/linux/pfrut.h+1−0
@@ -89,6 +89,7 @@ struct pfru_payload_hdr { · 88 unmodified lines
89 __u32 hw_ver;89 __u32 hw_ver;
90 __u32 rt_ver;90 __u32 rt_ver;
91 __u8 platform_id[16];91 __u8 platform_id[16];
92 __u32 svn_ver;
92};93};
93 94
94enum pfru_dsm_status {95enum pfru_dsm_status {
include/uapi/linux/raid/md_p.h+1−1
@@ -173,7 +173,7 @@ typedef struct mdp_superblock_s { · 172 unmodified lines
173#else173#else
174#error unspecified endianness174#error unspecified endianness
175#endif175#endif
176 __u32 resync_offset; /* 11 resync checkpoint sector count */176 __u32 recovery_cp; /* 11 resync checkpoint sector count */
177 /* There are only valid for minor_version > 90 */177 /* There are only valid for minor_version > 90 */
178 __u64 reshape_position; /* 12,13 next address in array-space for reshape */178 __u64 reshape_position; /* 12,13 next address in array-space for reshape */
179 __u32 new_level; /* 14 new level we are reshaping to */179 __u32 new_level; /* 14 new level we are reshaping to */
include/uapi/linux/vhost.h+2−2
@@ -260,7 +260,7 @@ · 259 unmodified lines
260 * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:260 * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:
261 * - Vhost will create vhost workers as kernel threads.261 * - Vhost will create vhost workers as kernel threads.
262 */262 */
263#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8)263#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8)
264 264
265/**265/**
266 * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.266 * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.
@@ -268,6 +268,6 @@ · 1 unmodified line
268 *268 *
269 * @return: An 8-bit value indicating the current thread mode.269 * @return: An 8-bit value indicating the current thread mode.
270 */270 */
271#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8)271#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8)
272 272
273#endif273#endif