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

..

adapter.h

net: cxgb3: Use net_device_stats from struct net_device

2017-04-07 07:03:33 -07:00

ael1002.c

chelsio: constify cphy_ops structures

2016-01-04 21:58:28 -05:00

aq100x.c

chelsio: constify cphy_ops structures

2016-01-04 21:58:28 -05:00

common.h

chelsio: constify cphy_ops structures

2016-01-04 21:58:28 -05:00

cxgb3_ctl_defs.h

…

cxgb3_defs.h

treewide: use kv[mz]alloc* rather than opencoded variants

2017-05-08 17:15:13 -07:00

cxgb3_ioctl.h

…

cxgb3_main.c

net: cxgb3_main: Fix a resource leak in a error path in 'init_one()'

2019-08-06 11:34:23 -07:00

cxgb3_offload.c

net: cxgb3: remove redundant null pointer check before kfree_skb

2018-09-21 09:04:37 -07:00

cxgb3_offload.h

…

firmware_exports.h

…

l2t.c

cxgb3/l2t: Use struct_size() in kvzalloc()

2019-04-01 15:01:46 -07:00

l2t.h

cxgb3/l2t: Fix undefined behaviour

2019-04-01 15:01:46 -07:00

Makefile

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

mc5.c

net: ethernet: chelsio: cxgb3: mc5.c: Remove some unused functions

2015-01-02 16:32:37 -05:00

regs.h

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

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

sge_defs.h

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

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

sge.c

net: Use skb_frag_off accessors

2019-07-30 14:21:32 -07:00

t3_cpl.h

…

t3_hw.c

net: cxgb3: fix various indentation issues

2019-01-10 09:30:08 -05:00

t3cdev.h

RDMA/cxgb3: Annotate an RCU pointer

2017-10-14 20:47:05 -04:00

version.h

cxgb3: update firmware version

2012-02-15 15:48:19 -05:00

vsc8211.c

chelsio: constify cphy_ops structures

2016-01-04 21:58:28 -05:00

xgmac.c

…