diff options
| author | Mark Brown <broonie@kernel.org> | 2024-03-13 21:22:15 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-03-13 21:22:15 +0300 |
| commit | e25293d9d92cce24aa4ca21b90064661fe4d3fcf (patch) | |
| tree | 50f45e19a3e397db28b6681d9bf3975f3c6dee8e /include/uapi/linux | |
| parent | 23fb6bc2696119391ec3a92ccaffe50e567c515e (diff) | |
| parent | e8f897f4afef0031fe618a8e94127a0934896aba (diff) | |
| download | linux-e25293d9d92cce24aa4ca21b90064661fe4d3fcf.tar.xz | |
ASoC: Merge up release
In order to apply additional fixes that depend on the fixes merged for
v6.8 merge up the final release.
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/in6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h index c4c53a9ab959..ff8d21f9e95b 100644 --- a/include/uapi/linux/in6.h +++ b/include/uapi/linux/in6.h @@ -145,7 +145,7 @@ struct in6_flowlabel_req { #define IPV6_TLV_PADN 1 #define IPV6_TLV_ROUTERALERT 5 #define IPV6_TLV_CALIPSO 7 /* RFC 5570 */ -#define IPV6_TLV_IOAM 49 /* TEMPORARY IANA allocation for IOAM */ +#define IPV6_TLV_IOAM 49 /* RFC 9486 */ #define IPV6_TLV_JUMBO 194 #define IPV6_TLV_HAO 201 /* home address option */ |