Conflict was two parallel additions of include files to sch_generic.c, no biggie.
Showing the changes to include/uapi/linux (2 of 753 files). Show all
Unified · Split
| @@ -8,11 +8,10 @@ · 7 unmodified lines | ||
| 8 | 8 | #ifndef _UAPI__LINUX_BPF_PERF_EVENT_H__ |
| 9 | 9 | #define _UAPI__LINUX_BPF_PERF_EVENT_H__ |
| 10 | 10 | |
| 11 | −#include <linux/types.h> | |
| 12 | −#include <linux/ptrace.h> | |
| 11 | +#include <asm/bpf_perf_event.h> | |
| 13 | 12 | |
| 14 | 13 | struct bpf_perf_event_data { |
| 15 | − struct pt_regs regs; | |
| 14 | + bpf_user_pt_regs_t regs; | |
| 16 | 15 | __u64 sample_period; |
| 17 | 16 | }; |
| 18 | 17 | |
| @@ -880,6 +880,8 @@ struct usb_wireless_cap_descriptor { /* Ultra Wide Band */ · 879 unmodified lines | ||
| 880 | 880 | __u8 bReserved; |
| 881 | 881 | } __attribute__((packed)); |
| 882 | 882 | |
| 883 | +#define USB_DT_USB_WIRELESS_CAP_SIZE 11 | |
| 884 | + | |
| 883 | 885 | /* USB 2.0 Extension descriptor */ |
| 884 | 886 | #define USB_CAP_TYPE_EXT 2 |
| 885 | 887 | |
| @@ -1072,6 +1074,7 @@ struct usb_ptm_cap_descriptor { · 186 unmodified lines | ||
| 1072 | 1074 | __u8 bDevCapabilityType; |
| 1073 | 1075 | } __attribute__((packed)); |
| 1074 | 1076 | |
| 1077 | +#define USB_DT_USB_PTM_ID_SIZE 3 | |
| 1075 | 1078 | /* |
| 1076 | 1079 | * The size of the descriptor for the Sublink Speed Attribute Count |
| 1077 | 1080 | * (SSAC) specified in bmAttributes[4:0]. |