David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Just minor overlapping changes in the conflicts here.

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

2019-08-06 18:44:57 -07:00

..

bnx2x

bnx2x: Disable multi-cos feature.

2019-07-25 17:09:26 -07:00

bnxt

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

2019-08-06 18:44:57 -07:00

genet

linux/dim: Fix overflow in dim calculation

2019-07-25 11:34:39 -07: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

bcm63xx_enet: use devm_platform_ioremap_resource() to simplify code

2019-08-01 13:10:34 -04:00

bcm63xx_enet.h

bcm63xx_enet: use platform device id directly for miibus name

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

bcmsysport.c

linux/dim: Fix overflow in dim calculation

2019-07-25 11:34:39 -07:00

bcmsysport.h

Merge tag 'blk-dim-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux

2019-06-27 12:42:51 -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: ethernet: support of_get_mac_address new ERR_PTR error

2019-05-07 12:22:47 -07:00

bgmac-platform.c

net: Remove dev_err() usage after platform_get_irq()

2019-07-30 14:37:35 -07:00

bgmac.c

net: Use skb accessors in network drivers

2019-07-22 20:47:56 -07: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

net: broadcom: Use dev_get_drvdata

2019-07-23 13:02: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_if.h

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

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

cnic.c

cnic: Explicitly initialize all reference counts to 0.

2019-08-05 13:21:55 -07:00

cnic.h

…

Kconfig

net: broadcom: Fix manufacturer name in Kconfig help text

2019-08-01 13:45:49 -04: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

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13

2019-05-21 11:28:45 +02:00

tg3.c

net: broadcom: Use dev_get_drvdata

2019-07-23 13:02:41 -07:00

tg3.h

broadcom: tg3: fix use of SPEED_UNKNOWN ethtool constant

2019-04-08 16:30:43 -07:00