linux/drivers/net/ethernet/chelsio/cxgb4
David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were two cases of simple overlapping changes,
nothing serious.

In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-04-23 18:51:33 -04:00
..
clip_tbl.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-01-06 22:54:18 -05:00
clip_tbl.h
cxgb4_dcb.c
cxgb4_dcb.h
cxgb4_debugfs.c cxgb4: allocate resources for CXGB4_ULD_ISCSIT 2016-03-22 00:25:03 -07:00
cxgb4_debugfs.h
cxgb4_ethtool.c cxgb4: Pass correct argument to t4_link_l1cfg() 2015-12-23 22:34:44 -05:00
cxgb4_fcoe.c
cxgb4_fcoe.h
cxgb4_main.c cxgb4/cxgb4vf: Deprecate module parameter dflt_msg_enable 2016-04-06 16:17:25 -04:00
cxgb4_ppm.c cxgb4: add iSCSI DDP page pod manager 2016-03-22 00:25:05 -07:00
cxgb4_ppm.h cxgb4: add iSCSI DDP page pod manager 2016-03-22 00:25:05 -07:00
cxgb4_uld.h cxgb4: update struct cxgb4_lld_info definition 2016-03-22 00:25:04 -07:00
cxgb4.h cxgb4: Stop Rx Queues before freeing it up 2016-04-11 12:21:39 -04:00
l2t.c cxgb4: move VLAN_NONE macro definition 2016-03-22 00:25:05 -07:00
l2t.h cxgb4: move VLAN_NONE macro definition 2016-03-22 00:25:05 -07:00
Makefile cxgb4: update Kconfig and Makefile 2016-03-22 00:25:06 -07:00
sge.c cxgb4: Stop Rx Queues before freeing it up 2016-04-11 12:21:39 -04:00
t4_chip_type.h
t4_hw.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-04-21 12:57:34 -07:00
t4_hw.h cxgb4: Update pm_stats for T6 adapter family 2015-12-23 22:34:44 -05:00
t4_msg.h Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 2016-03-23 15:57:39 -07:00
t4_pci_id_tbl.h cxgb4: Add pci device id for chelsio t520-cr adapter 2016-04-06 14:21:20 -04:00
t4_regs.h cxgb4: Update mps_tcam output to include T6 fields 2015-12-23 22:34:45 -05:00
t4_values.h cxgb4/cxgb4vf: For T6 adapter, set FBMIN to 64 bytes 2016-03-02 14:46:29 -05:00
t4fw_api.h cxgb4: add definitions for iSCSI target ULD 2016-03-22 00:25:04 -07:00
t4fw_version.h