The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack.
Showing the changes to include/uapi/linux (1 of 239 files). Show all
Unified · Split
| @@ -143,6 +143,8 @@ enum perf_event_sample_format { · 142 unmodified lines | |||
| 143 | PERF_SAMPLE_PHYS_ADDR = 1U << 19, | 143 | PERF_SAMPLE_PHYS_ADDR = 1U << 19, |
| 144 | 144 | ||
| 145 | PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */ | 145 | PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */ |
| 146 | |||
| 147 | __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, | ||
| 146 | }; | 148 | }; |
| 147 | 149 | ||
| 148 | /* | 150 | /* |