linux/drivers/net/ethernet/freescale/fman
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
..
fman_dtsec.c fsl/fman: fix dtsec_set_tx_pause_frames 2016-03-14 15:03:10 -04:00
fman_dtsec.h fsl/fman: Add FMan MAC support 2015-12-27 20:51:40 -05:00
fman_mac.h fsl/fman: remove leftover comment 2016-10-04 10:08:44 +03:00
fman_memac.c net: fsl/fman: fix phydev reference leak 2016-11-27 20:01:15 -05:00
fman_memac.h fsl/fman: Add FMan MAC support 2015-12-27 20:51:40 -05:00
fman_muram.c fsl/fman: split lines over 80 characters 2016-10-04 09:26:05 +03:00
fman_muram.h fsl/fman: split lines over 80 characters 2016-10-04 09:26:05 +03:00
fman_port.c fsl/fman: simplify device tree reads 2016-10-04 09:26:07 +03:00
fman_port.h fsl/fman: Add FMan Port Support 2015-12-27 20:51:40 -05:00
fman_sp.c fsl/fman: fix loadable module compilation 2016-10-04 09:26:05 +03:00
fman_sp.h fsl/fman: Add FMan SP support 2015-12-27 20:51:40 -05:00
fman_tgec.c fsl/fman: fix a leak in tgec_free() 2016-11-25 20:29:48 -05:00
fman_tgec.h fsl/fman: Add FMan MAC support 2015-12-27 20:51:40 -05:00
fman.c fsl/fman: fix return value checking 2016-10-04 09:26:10 +03:00
fman.h
Kconfig fsl/fman: allow modular build 2016-01-04 21:53:42 -05:00
mac.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-12-03 12:29:53 -05:00
mac.h fsl/fman: return a phy_dev pointer from init 2016-10-04 09:26:07 +03:00
Makefile fsl/fman: fix loadable module compilation 2016-10-04 09:26:05 +03:00