Couple conflicts resolved here: 1) In the MACB driver, a bug fix to properly initialize the RX tail pointer properly overlapped with some changes to support variable sized rings. 2) In XGBE we had a "CONFIG_PM" --> "CONFIG_PM_SLEEP" fix overlapping with a reorganization of the driver to support ACPI, OF, as well as PCI variants of the chip. 3) In 'net' we had several probe error path bug fixes to the stmmac driver, meanwhile a lot of this code was cleaned up and reorganized in 'net-next'. 4) The cls_flower classifier obtained a helper function in 'net-next' called __fl_delete() and this overlapped with Daniel Borkamann's bug fix to use RCU for object destruction in 'net'. It also overlapped with Jiri's change to guard the rhashtable_remove_fast() call with a check against tc_skip_sw(). 5) In mlx4, a revert bug fix in 'net' overlapped with some unrelated changes in 'net-next'. 6) In geneve, a stale header pointer after pskb_expand_head() bug fix in 'net' overlapped with a large reorganization of the same code in 'net-next'. Since the 'net-next' code no longer had the bug in question, there was nothing to do other than to simply take the 'net-next' hunks.
Showing the changes to include/uapi/linux (2 of 191 files). Show all
Unified · Split
| @@ -640,7 +640,7 @@ · 639 unmodified lines | |||
| 640 | * Control a data application associated with the currently viewed channel, | 640 | * Control a data application associated with the currently viewed channel, |
| 641 | * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) | 641 | * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) |
| 642 | */ | 642 | */ |
| 643 | #define KEY_DATA 0x275 | 643 | #define KEY_DATA 0x277 |
| 644 | 644 | ||
| 645 | #define BTN_TRIGGER_HAPPY 0x2c0 | 645 | #define BTN_TRIGGER_HAPPY 0x2c0 |
| 646 | #define BTN_TRIGGER_HAPPY1 0x2c0 | 646 | #define BTN_TRIGGER_HAPPY1 0x2c0 |
| @@ -11,3 +11,4 @@ header-y += tc_vlan.h · 10 unmodified lines | |||
| 11 | header-y += tc_bpf.h | 11 | header-y += tc_bpf.h |
| 12 | header-y += tc_connmark.h | 12 | header-y += tc_connmark.h |
| 13 | header-y += tc_ife.h | 13 | header-y += tc_ife.h |
| 14 | header-y += tc_tunnel_key.h | ||