AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 01:40:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
308d3165d8
linux_dsm_epyc7002/net/dsa
History
David S. Miller 2745529ac7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
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.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-12-03 12:29:53 -05:00
..
dsa2.c net: dsa: fix unbalanced dsa_switch_tree reference counting 2016-11-28 16:15:45 -05:00
dsa_priv.h net-next: dsa: add Qualcomm tag RX/TX handler 2016-09-16 04:31:51 -04:00
dsa.c of_mdio: add helper to deregister fixed-link PHYs 2016-11-29 23:17:02 -05:00
Kconfig net-next: dsa: add Qualcomm tag RX/TX handler 2016-09-16 04:31:51 -04:00
Makefile net-next: dsa: add Qualcomm tag RX/TX handler 2016-09-16 04:31:51 -04:00
slave.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-12-03 12:29:53 -05:00
tag_brcm.c net: dsa: Add a ports structure and use it in the switch structure 2016-06-04 14:29:53 -07:00
tag_dsa.c net: dsa: Add a ports structure and use it in the switch structure 2016-06-04 14:29:53 -07:00
tag_edsa.c net: dsa: Add a ports structure and use it in the switch structure 2016-06-04 14:29:53 -07:00
tag_qca.c net-next: dsa: add Qualcomm tag RX/TX handler 2016-09-16 04:31:51 -04:00
tag_trailer.c net: dsa: Add a ports structure and use it in the switch structure 2016-06-04 14:29:53 -07:00