Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/netconsole.c net/bridge/br_private.h Three mostly trivial conflicts. The net/bridge/br_private.h conflict was a function signature (argument addition) change overlapping with the extern removals from Joe Perches. In drivers/net/netconsole.c we had one change adjusting a printk message whilst another changed "printk(KERN_INFO" into "pr_info(". Lastly, the emulex change was a new inline function addition overlapping with Joe Perches's extern removals.
Showing the changes to include/uapi/linux (1 of 189 files). Show all
Unified · Split
| @@ -456,13 +456,15 @@ struct perf_event_mmap_page { · 455 unmodified lines | ||
| 456 | 456 | /* |
| 457 | 457 | * Control data for the mmap() data buffer. |
| 458 | 458 | * |
| 459 | − * User-space reading the @data_head value should issue an rmb(), on | |
| 460 | − * SMP capable platforms, after reading this value -- see | |
| 461 | − * perf_event_wakeup(). | |
| 459 | + * User-space reading the @data_head value should issue an smp_rmb(), | |
| 460 | + * after reading this value. | |
| 462 | 461 | * |
| 463 | 462 | * When the mapping is PROT_WRITE the @data_tail value should be |
| 464 | − * written by userspace to reflect the last read data. In this case | |
| 465 | − * the kernel will not over-write unread data. | |
| 463 | + * written by userspace to reflect the last read data, after issueing | |
| 464 | + * an smp_mb() to separate the data read from the ->data_tail store. | |
| 465 | + * In this case the kernel will not over-write unread data. | |
| 466 | + * | |
| 467 | + * See perf_output_put_handle() for the data ordering. | |
| 466 | 468 | */ |
| 467 | 469 | __u64 data_head; /* head in the data section */ |
| 468 | 470 | __u64 data_tail; /* user-space written tail */ |