David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ...

The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

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

2018-08-02 10:55:32 -07:00

..

clip_tbl.c

treewide: kvzalloc() -> kvcalloc()

2018-06-12 16:19:22 -07:00

clip_tbl.h

drivers, net, ethernet: convert clip_entry.refcnt from atomic_t to refcount_t

2017-10-22 02:22:38 +01:00

cudbg_common.c

cxgb4: update dump collection logic to use compression

2018-01-19 14:56:32 -05:00

cudbg_entity.h

cxgb4: move Tx/Rx free pages collection to common code

2018-07-24 10:12:22 -07:00

cudbg_if.h

cxgb4: update LE-TCAM collection for T6

2018-05-16 15:01:30 -04:00

cudbg_lib_common.h

cxgb4: use zlib deflate to compress firmware dump

2018-01-19 14:56:32 -05:00

cudbg_lib.c

cxgb4: move Tx/Rx free pages collection to common code

2018-07-24 10:12:22 -07:00

cudbg_lib.h

cxgb4: collect PCIe configuration logs

2017-12-08 14:31:50 -05:00

cudbg_zlib.c

cxgb4: properly initialize variables

2018-01-24 10:56:59 -05:00

cudbg_zlib.h

cxgb4: enable ZLIB_DEFLATE when building cxgb4

2018-01-24 10:56:59 -05:00

cxgb4_cudbg.c

cxgb4: collect number of free PSTRUCT page pointers

2018-07-24 10:12:21 -07:00

cxgb4_cudbg.h

cxgb4: collect hardware dump in second kernel

2018-05-14 13:46:05 -04:00

cxgb4_dcb.c

cxgb4: do DCB state reset in couple of places

2017-09-25 20:28:14 -07:00

cxgb4_dcb.h

cxgb4: do DCB state reset in couple of places

2017-09-25 20:28:14 -07:00

cxgb4_debugfs.c

cxgb4: print ULD queue information managed by LLD

2018-07-27 13:36:04 -07:00

cxgb4_debugfs.h

VFS: Fix up some ->d_inode accesses in the chelsio driver

2015-04-15 15:06:54 -04:00

cxgb4_ethtool.c

cxgb4: do not return DUPLEX_UNKNOWN when link is down

2018-07-16 13:43:10 -07:00

cxgb4_fcoe.c

cxgb4: fix boolreturn.cocci warnings

2015-03-29 12:15:56 -07:00

cxgb4_fcoe.h

cxgb4: add cxgb4_fcoe.h and macro definitions for FCoE

2015-03-24 15:24:38 -04:00

cxgb4_filter.c

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

2018-05-21 16:01:54 -04:00

cxgb4_filter.h

cxgb4: add support to create hash-filters via tc-flower offload

2017-11-01 22:06:03 +09:00

cxgb4_main.c

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

2018-08-02 10:55:32 -07:00

cxgb4_ptp.c

cxgb4: ptp_clock_register() returns error pointers

2017-07-14 08:18:51 -07:00

cxgb4_ptp.h

cxgb4: time stamping interface for PTP

2017-07-05 09:21:54 +01:00

cxgb4_tc_flower.c

cxgb4: Add flag tc_flower_initialized

2018-06-28 13:51:26 +09:00

cxgb4_tc_flower.h

cxgb4: convert flower table to use rhashtable

2017-11-01 22:06:03 +09:00

cxgb4_tc_u32_parse.h

cxgb4: add support for offloading u32 filters

2016-09-22 01:40:01 -04:00

cxgb4_tc_u32.c

treewide: kvzalloc() -> kvcalloc()

2018-06-12 16:19:22 -07:00

cxgb4_tc_u32.h

net: sched: push cls related args into cls_common structure

2017-08-07 09:42:37 -07:00

cxgb4_uld.c

treewide: kzalloc() -> kcalloc()

2018-06-12 16:19:22 -07:00

cxgb4_uld.h

cxgb4: LLD driver changes to support TLS

2018-03-31 23:37:32 -04:00

cxgb4.h

cxgb4: Add support to read actual provisioned resources

2018-07-05 10:53:30 +09:00

l2t.c

cxgb4: add tc flower match support for tunnel VNI

2018-05-14 22:50:15 -04:00

l2t.h

cxgb4: move VLAN_NONE macro definition

2016-03-22 00:25:05 -07:00

Makefile

cxgb4: Add support to initialise/read SRQ entries

2018-03-22 11:59:11 -04:00

sched.c

cxgb4: Add flag tc_flower_initialized

2018-06-28 13:51:26 +09:00

sched.h

cxgb4: increase max tx rate limit to 100 Gbps

2018-03-09 12:57:35 -05:00

sge.c

cxgb4: specify IQTYPE in fw_iq_cmd

2018-07-11 22:52:10 -07:00

smt.c

cxgb4: introduce SMT ops to prepare for SMAC rewrite support

2017-10-20 13:06:53 +01:00

smt.h

cxgb4: introduce SMT ops to prepare for SMAC rewrite support

2017-10-20 13:06:53 +01:00

srq.c

libcxgb,cxgb4: use __skb_put_zero to simplfy code

2018-04-30 11:53:48 -04:00

srq.h

cxgb4: Add support to initialise/read SRQ entries

2018-03-22 11:59:11 -04:00

t4_chip_type.h

cxgb4: clean up init_one

2018-05-25 14:59:38 -04:00

t4_hw.c

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

2018-07-20 21:17:12 -07:00

t4_hw.h

cxgb4: RSS table is 4k for T6

2017-12-19 14:14:19 -05:00

t4_msg.h

cxgb4: enable inner header checksum calculation

2018-05-11 16:11:50 -04:00

t4_pci_id_tbl.h

cxgb4: Add new T5 PCI device id 0x50ae

2018-06-28 13:51:27 +09:00

t4_regs.h

cxgb4: collect number of free PSTRUCT page pointers

2018-07-24 10:12:21 -07:00

t4_tcb.h

cxgb4: add support to delete hash filter

2017-11-01 22:06:03 +09:00

t4_values.h

cxgb4: Update IngPad and IngPack values

2017-03-22 10:53:49 -07:00

t4fw_api.h

cxgb4: specify IQTYPE in fw_iq_cmd

2018-07-11 22:52:10 -07:00

t4fw_version.h

cxgb4: update latest firmware version supported

2018-05-03 12:52:32 -04:00