David S. Miller 375ca548f7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-02-20 00:34:07 -08:00

..

bnx2x

bnx2x: Remove set but not used variable 'mfw_vn'

2019-02-18 16:47:32 -08:00

bnxt

bnxt_en: Return relevant error code when offload fails

2019-02-19 10:45:14 -08:00

genet

net: phy: fixed-phy: Drop GPIO from fixed_phy_add()

2019-02-04 18:33:36 -08:00

b44.c

net: b44: replace dev_kfree_skb_xxx by dev_consume_skb_xxx for drop profiles

2019-01-29 10:11:42 -08:00

b44.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

bcm63xx_enet.c

cross-tree: phase out dma_zalloc_coherent()

2019-01-08 07:58:37 -05:00

bcm63xx_enet.h

bcm63xx_enet: use platform device id directly for miibus name

2017-12-19 11:07:16 -05:00

bcmsysport.c

net: systemport: Fix reception of BPDUs

2019-02-15 20:37:54 -08:00

bcmsysport.h

net: systemport: Fix WoL with password after deep sleep

2019-02-03 11:23:50 -08: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: mark expected switch fall-through

2017-11-11 18:49:26 +09:00

bgmac.c

net: phy: fixed-phy: Drop GPIO from fixed_phy_add()

2019-02-04 18:33:36 -08:00

bgmac.h

net: bgmac: Correctly annotate register space

2018-04-01 22:20:48 -04:00

bnx2_fw.h

bnx2-cnic: Driver Rebranding Changes

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

bnx2.c

cross-tree: phase out dma_zalloc_coherent()

2019-01-08 07:58:37 -05: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: remove use of VLAN_TAG_PRESENT

2018-11-08 19:49:31 -08:00

cnic.h

cnic: Rebranding cnic driver.

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

Kconfig

bnxt_en: Add hwmon sysfs support to read temperature

2018-08-05 17:08:26 -07:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

sb1250-mac.c

net: broadcom: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles

2019-02-06 17:38:15 -08:00

tg3.c

broadcom: Mark expected switch fall-throughs

2019-01-23 09:06:36 -08:00

tg3.h

tg3: Update copyright

2018-07-16 14:42:10 -07:00