Doug Berger 0d314502bb net: bcmgenet: correct bad merge ...

As noted in the net-next submission for GENETv5 support [1], there
were merge conflicts with an earlier net submission [2] that had not
yet found its way to the net-next repository.

Unfortunately, when the branches were merged the conflicts were not
correctly resolved.  This commit attempts to correct that.

[1] https://lkml.org/lkml/2017/3/13/1145
[2] https://lkml.org/lkml/2017/3/9/890

Fixes: 101c431492 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
Signed-off-by: Doug Berger <opendmb@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2017-10-26 10:14:54 +09:00

..

bnx2x

bnx2x: Use pci_ari_enabled() instead of local copy

2017-10-06 10:06:06 -07:00

bnxt

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-10-22 13:39:14 +01:00

genet

net: bcmgenet: correct bad merge

2017-10-26 10:14:54 +09:00

b44.c

drivers: net: b44: use setup_timer() helper.

2017-09-21 11:44:39 -07:00

b44.h

net: ethernet: broadcom: b44: use phydev from struct net_device

2016-09-19 21:39:11 -04:00

bcm63xx_enet.c

ethernet/broadcom: Convert timers to use timer_setup()

2017-10-18 12:39:37 +01:00

bcm63xx_enet.h

bcm63xx_enet: remove unneeded include

2017-10-01 23:05:11 -07:00

bcmsysport.c

net: systemport: Guard against unmapped TX ring

2017-10-23 05:28:40 +01:00

bcmsysport.h

net: systemport: Establish lower/upper queue mapping

2017-10-12 12:10:02 -07:00

bgmac-bcma-mdio.c

net: bgmac: use PHY subsystem for initializing PHY

2017-01-31 13:44:49 -05:00

bgmac-bcma.c

net: bgmac: enable master mode for BCM54210E and B50212E PHYs

2017-10-12 22:59:38 -07:00

bgmac-platform.c

net: ethernet: bgmac: Make IDM register space optional

2017-07-15 14:28:27 -07:00

bgmac.c

net: ethernet: bgmac: Make IDM register space optional

2017-07-15 14:28:27 -07:00

bgmac.h

net: ethernet: bgmac: Make IDM register space optional

2017-07-15 14:28:27 -07:00

bnx2_fw.h

bnx2-cnic: Driver Rebranding Changes

2015-02-20 15:46:49 -05:00

bnx2.c

drivers: net: bnx2: use setup_timer() helper.

2017-09-21 11:44:41 -07:00

bnx2.h

ethernet/broadcom: use core min/max MTU checking

2016-10-18 11:34:18 -04:00

cnic_defs.h

cnic: Rebranding cnic driver.

2014-06-25 16:27:27 -07:00

cnic_if.h

cnic: Add the interfaces to get FC-NPIV table.

2015-08-06 21:54:12 -07:00

cnic.c

cnic: Fix an error handling path in 'cnic_alloc_bnx2x_resc()'

2017-09-23 17:04:27 -07:00

cnic.h

cnic: Rebranding cnic driver.

2014-06-25 16:27:27 -07:00

Kconfig

net: systemport: add NET_DSA dependency

2017-10-16 21:21:05 +01:00

Makefile

net: ethernet: bgmac: Add platform device support

2016-07-09 18:10:41 -04:00

sb1250-mac.c

net: ethernet: broadcom: Remove null check before kfree

2017-08-28 15:53:23 -07:00

tg3.c

drivers: net: tg3: use setup_timer() helper.

2017-09-21 11:44:40 -07:00

tg3.h

mdio: Move allocation of interrupts into core

2016-01-07 14:31:26 -05:00