Merge 6.17-rc3 into char-misc-next

We need the char/misc/iio fixes in here as well to build on.

Greg Kroah-Hartman committed 1 year ago

Commit 5b9057c2 parents 73c9417 1b237f1375 files · +4394 −1812Browse files

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

Unified · Split

2 files

@@ -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
94	enum pfru_dsm_status {	95	enum pfru_dsm_status {

@@ -173,7 +173,7 @@ typedef struct mdp_superblock_s { · 172 unmodified lines
173	#else	173	#else
174	#error unspecified endianness	174	#error unspecified endianness
175	#endif	175	#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 */