Merge v6.12-rc6 via char-misc-next to get some fixes needed for next few patches in IIO.
Showing the changes to include/uapi (2 of 708 files). Show all
Unified · Split
| @@ -1121,6 +1121,9 @@ enum bpf_attach_type { · 1120 unmodified lines | ||
| 1121 | 1121 | |
| 1122 | 1122 | #define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE |
| 1123 | 1123 | |
| 1124 | +/* Add BPF_LINK_TYPE(type, name) in bpf_types.h to keep bpf_link_type_strs[] | |
| 1125 | + * in sync with the definitions below. | |
| 1126 | + */ | |
| 1124 | 1127 | enum bpf_link_type { |
| 1125 | 1128 | BPF_LINK_TYPE_UNSPEC = 0, |
| 1126 | 1129 | BPF_LINK_TYPE_RAW_TRACEPOINT = 1, |
| @@ -88,7 +88,7 @@ · 87 unmodified lines | ||
| 88 | 88 | |
| 89 | 89 | /* ABI version */ |
| 90 | 90 | #define SND_SOC_TPLG_ABI_VERSION 0x5 /* current version */ |
| 91 | −#define SND_SOC_TPLG_ABI_VERSION_MIN 0x4 /* oldest version supported */ | |
| 91 | +#define SND_SOC_TPLG_ABI_VERSION_MIN 0x5 /* oldest version supported */ | |
| 92 | 92 | |
| 93 | 93 | /* Max size of TLV data */ |
| 94 | 94 | #define SND_SOC_TPLG_TLV_SIZE 32 |