diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-08-04 14:53:15 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-08-04 14:53:15 +0300 |
| commit | 4d84f763f7e137be7eeab30cc7daa9449c9cb053 (patch) | |
| tree | ad8869bf50680b5ee4876fbd8c7d6cd07df39f0d /include/uapi/linux | |
| parent | 788449ae57f4273111b779bbcaad552b67f517d5 (diff) | |
| parent | f803ec63686dec863a33cad87218d7d99c4b5e92 (diff) | |
| download | linux-4d84f763f7e137be7eeab30cc7daa9449c9cb053.tar.xz | |
Merge tag 'asoc-fix-v6.5-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fix for v6.5
Not really a fix, but rather a licensing update for the fsl_micfil
driver.
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/blkzoned.h | 10 | ||||
| -rw-r--r-- | include/uapi/linux/if_packet.h | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/include/uapi/linux/blkzoned.h b/include/uapi/linux/blkzoned.h index b80fcc9ea525..f85743ef6e7d 100644 --- a/include/uapi/linux/blkzoned.h +++ b/include/uapi/linux/blkzoned.h @@ -51,13 +51,13 @@ enum blk_zone_type { * * The Zone Condition state machine in the ZBC/ZAC standards maps the above * deinitions as: - * - ZC1: Empty | BLK_ZONE_EMPTY + * - ZC1: Empty | BLK_ZONE_COND_EMPTY * - ZC2: Implicit Open | BLK_ZONE_COND_IMP_OPEN * - ZC3: Explicit Open | BLK_ZONE_COND_EXP_OPEN - * - ZC4: Closed | BLK_ZONE_CLOSED - * - ZC5: Full | BLK_ZONE_FULL - * - ZC6: Read Only | BLK_ZONE_READONLY - * - ZC7: Offline | BLK_ZONE_OFFLINE + * - ZC4: Closed | BLK_ZONE_COND_CLOSED + * - ZC5: Full | BLK_ZONE_COND_FULL + * - ZC6: Read Only | BLK_ZONE_COND_READONLY + * - ZC7: Offline | BLK_ZONE_COND_OFFLINE * * Conditions 0x5 to 0xC are reserved by the current ZBC/ZAC spec and should * be considered invalid. diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h index 9efc42382fdb..4d0ad22f83b5 100644 --- a/include/uapi/linux/if_packet.h +++ b/include/uapi/linux/if_packet.h @@ -18,7 +18,11 @@ struct sockaddr_ll { unsigned short sll_hatype; unsigned char sll_pkttype; unsigned char sll_halen; - unsigned char sll_addr[8]; + union { + unsigned char sll_addr[8]; + /* Actual length is in sll_halen. */ + __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex); + }; }; /* Packet types */ |