Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing.
Showing the changes to include/uapi/linux (1 of 533 files). Show all
Unified · Split
| @@ -380,10 +380,13 @@ struct perf_event_mmap_page { · 379 unmodified lines | |||
| 380 | union { | 380 | union { |
| 381 | __u64 capabilities; | 381 | __u64 capabilities; |
| 382 | struct { | 382 | struct { |
| 383 | __u64 cap_usr_time : 1, | 383 | __u64 cap_bit0 : 1, /* Always 0, deprecated, see commit 860f085b74e9 */ |
| 384 | cap_usr_rdpmc : 1, | 384 | cap_bit0_is_deprecated : 1, /* Always 1, signals that bit 0 is zero */ |
| 385 | cap_usr_time_zero : 1, | 385 | |
| 386 | cap_____res : 61; | 386 | cap_user_rdpmc : 1, /* The RDPMC instruction can be used to read counts */ |
| 387 | cap_user_time : 1, /* The time_* fields are used */ | ||
| 388 | cap_user_time_zero : 1, /* The time_zero field is used */ | ||
| 389 | cap_____res : 59; | ||
| 387 | }; | 390 | }; |
| 388 | }; | 391 | }; |
| 389 | 392 | ||
| @@ -442,12 +445,13 @@ struct perf_event_mmap_page { · 52 unmodified lines | |||
| 442 | * ((rem * time_mult) >> time_shift); | 445 | * ((rem * time_mult) >> time_shift); |
| 443 | */ | 446 | */ |
| 444 | __u64 time_zero; | 447 | __u64 time_zero; |
| 448 | __u32 size; /* Header size up to __reserved[] fields. */ | ||
| 445 | 449 | ||
| 446 | /* | 450 | /* |
| 447 | * Hole for extension of the self monitor capabilities | 451 | * Hole for extension of the self monitor capabilities |
| 448 | */ | 452 | */ |
| 449 | 453 | ||
| 450 | __u64 __reserved[119]; /* align to 1k */ | 454 | __u8 __reserved[118*8+4]; /* align to 1k. */ |
| 451 | 455 | ||
| 452 | /* | 456 | /* |
| 453 | * Control data for the mmap() data buffer. | 457 | * Control data for the mmap() data buffer. |
| @@ -528,6 +532,7 @@ enum perf_event_type { · 74 unmodified lines | |||
| 528 | * u64 len; | 532 | * u64 len; |
| 529 | * u64 pgoff; | 533 | * u64 pgoff; |
| 530 | * char filename[]; | 534 | * char filename[]; |
| 535 | * struct sample_id sample_id; | ||
| 531 | * }; | 536 | * }; |
| 532 | */ | 537 | */ |
| 533 | PERF_RECORD_MMAP = 1, | 538 | PERF_RECORD_MMAP = 1, |