diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-08-29 12:13:09 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-08-29 12:13:09 +0300 |
| commit | 3e93d5bbcbfc3808f83712c0701f9d4c148cc8ed (patch) | |
| tree | 2f1ac64d01ba1938b12d6036fa7161340a9abded /include/uapi/linux | |
| parent | 2cbe4ac193ed7172cfd825c0cc46ce4a41be4ba1 (diff) | |
| parent | 3e7fd1febc3156d3d98fba229399a13b12d69707 (diff) | |
| download | linux-3e93d5bbcbfc3808f83712c0701f9d4c148cc8ed.tar.xz | |
Merge tag 'asoc-fix-v6.17-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.17
The main fixes here are for some of the cleanups done in the core in
this release, we had broken component lookup in the case with a single
bus and DMA controller. Otherwise it's driver specific changes, the
shortlogs for the Intel WCL and rsnd drivers look like minor cleanups
but are actually bugfixes (adding an op needed for correct functionality
and reverting an inappropriate helper usage).
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/pfrut.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/raid/md_p.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/pfrut.h b/include/uapi/linux/pfrut.h index 42fa15f8310d..b77d5c210c26 100644 --- a/include/uapi/linux/pfrut.h +++ b/include/uapi/linux/pfrut.h @@ -89,6 +89,7 @@ struct pfru_payload_hdr { __u32 hw_ver; __u32 rt_ver; __u8 platform_id[16]; + __u32 svn_ver; }; enum pfru_dsm_status { diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h index b13946287277..ac74133a4768 100644 --- a/include/uapi/linux/raid/md_p.h +++ b/include/uapi/linux/raid/md_p.h @@ -173,7 +173,7 @@ typedef struct mdp_superblock_s { #else #error unspecified endianness #endif - __u32 resync_offset; /* 11 resync checkpoint sector count */ + __u32 recovery_cp; /* 11 resync checkpoint sector count */ /* There are only valid for minor_version > 90 */ __u64 reshape_position; /* 12,13 next address in array-space for reshape */ __u32 new_level; /* 14 new level we are reshaping to */ |