History

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
  1. include/uapi/linux/pfrut.h +1 −0
  2. include/uapi/linux/raid/md_p.h +1 −1
include/uapi/linux/pfrut.h+1−0
@@ -89,6 +89,7 @@ struct pfru_payload_hdr { · 88 unmodified lines
8989 __u32 hw_ver;
9090 __u32 rt_ver;
9191 __u8 platform_id[16];
92+ __u32 svn_ver;
9293 };
9394
9495 enum pfru_dsm_status {
include/uapi/linux/raid/md_p.h+1−1
@@ -173,7 +173,7 @@ typedef struct mdp_superblock_s { · 172 unmodified lines
173173 #else
174174 #error unspecified endianness
175175 #endif
176− __u32 resync_offset; /* 11 resync checkpoint sector count */
176+ __u32 recovery_cp; /* 11 resync checkpoint sector count */
177177 /* There are only valid for minor_version > 90 */
178178 __u64 reshape_position; /* 12,13 next address in array-space for reshape */
179179 __u32 new_level; /* 14 new level we are reshaping to */