Cross-merge bpf and other fixes after downstream PRs. No conflicts.
Showing the changes to include/uapi/linux (1 of 1994 files). Show all
Unified · Split
| @@ -1010,7 +1010,9 @@ struct io_uring_zcrx_ifq_reg { · 1009 unmodified lines | |||
| 1010 | __u64 region_ptr; /* struct io_uring_region_desc * */ | 1010 | __u64 region_ptr; /* struct io_uring_region_desc * */ |
| 1011 | 1011 | ||
| 1012 | struct io_uring_zcrx_offsets offsets; | 1012 | struct io_uring_zcrx_offsets offsets; |
| 1013 | __u64 __resv[4]; | 1013 | __u32 zcrx_id; |
| 1014 | __u32 __resv2; | ||
| 1015 | __u64 __resv[3]; | ||
| 1014 | }; | 1016 | }; |
| 1015 | 1017 | ||
| 1016 | #ifdef __cplusplus | 1018 | #ifdef __cplusplus |