History

Merge commit '9365f0de4303f82ed4c2db1c39d3de824b249d80' into HEAD

Merge v6.12-rc6 via char-misc-next to get some fixes needed for next few patches in IIO.

Jonathan Cameron committed 2 years ago

Commit e459ca02 parents 56686ac 9365f0d708 files · +8231 −5224Browse files

Showing the changes to include/uapi (2 of 708 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/bpf.h +3 −0
  2. include/uapi/sound/asoc.h +1 −1
include/uapi/linux/bpf.h+3−0
@@ -1121,6 +1121,9 @@ enum bpf_attach_type { · 1120 unmodified lines
1121 1121
1122#define MAX_BPF_ATTACH_TYPE __MAX_BPF_ATTACH_TYPE1122#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 */
1124enum bpf_link_type {1127enum bpf_link_type {
1125 BPF_LINK_TYPE_UNSPEC = 0,1128 BPF_LINK_TYPE_UNSPEC = 0,
1126 BPF_LINK_TYPE_RAW_TRACEPOINT = 1,1129 BPF_LINK_TYPE_RAW_TRACEPOINT = 1,
include/uapi/sound/asoc.h+1−1
@@ -88,7 +88,7 @@ · 87 unmodified lines
88 88
89/* ABI version */89/* ABI version */
90#define SND_SOC_TPLG_ABI_VERSION 0x5 /* current version */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/* Max size of TLV data */93/* Max size of TLV data */
94#define SND_SOC_TPLG_TLV_SIZE 3294#define SND_SOC_TPLG_TLV_SIZE 32

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t