linux/drivers/net/ethernet/huawei/hinic
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
..
Kconfig net-next/hinic: add arm64 support 2018-04-19 13:34:44 -04:00
Makefile net-next/hinic: Set qp context 2017-08-22 10:48:53 -07:00
hinic_common.c net-next/hinic: Add cmdq commands 2017-08-22 10:48:53 -07:00
hinic_common.h net-next/hinic: Add cmdq commands 2017-08-22 10:48:53 -07:00
hinic_dev.h net-next/hinic: Add ethtool and stats 2017-08-22 10:48:54 -07:00
hinic_hw_api_cmd.c hinic: uninitialized variable in hinic_api_cmd_init() 2017-08-24 21:47:11 -07:00
hinic_hw_api_cmd.h net-next/hinic: Add api cmd commands 2017-08-22 10:48:53 -07:00
hinic_hw_cmdq.c treewide: Use array_size() in vzalloc() 2018-06-12 16:19:22 -07:00
hinic_hw_cmdq.h hinic: Replace PCI pool old API 2018-01-02 16:14:49 -06:00
hinic_hw_csr.h net-next/hinic: Add Rx handler 2017-08-22 10:48:54 -07:00
hinic_hw_dev.c net: hinic: remove redundant pointer pfhwdev 2018-07-04 22:39:11 +09:00
hinic_hw_dev.h net-next/hinic: Add Tx operation 2017-08-22 10:48:54 -07:00
hinic_hw_eqs.c net: hinic: make functions set_ctrl0 and set_ctrl1 static 2017-08-23 22:20:28 -07:00
hinic_hw_eqs.h net-next/hinic: Add ceqs 2017-08-22 10:48:53 -07:00
hinic_hw_if.c net-next/hinic: Add Rx handler 2017-08-22 10:48:54 -07:00
hinic_hw_if.h net-next/hinic: Add Rx handler 2017-08-22 10:48:54 -07:00
hinic_hw_io.c net-next/hinic: Add ceqs 2017-08-22 10:48:53 -07:00
hinic_hw_io.h net-next/hinic: Add cmdq commands 2017-08-22 10:48:53 -07:00
hinic_hw_mgmt.c net-next/hinic: Add Rx mode and link event handler 2017-08-22 10:48:53 -07:00
hinic_hw_mgmt.h net-next/hinic: Add Rx handler 2017-08-22 10:48:54 -07:00
hinic_hw_qp.c net-next/hinic: Add Tx operation 2017-08-22 10:48:54 -07:00
hinic_hw_qp.h net-next/hinic: fix comparison of a uint16_t type with -1 2017-08-28 16:44:39 -07:00
hinic_hw_qp_ctxt.h net-next/hinic: Set qp context 2017-08-22 10:48:53 -07:00
hinic_hw_wq.c net-next/hinic: Add Rx handler 2017-08-22 10:48:54 -07:00
hinic_hw_wq.h net-next/hinic: Add Rx handler 2017-08-22 10:48:54 -07:00
hinic_hw_wqe.h net-next/hinic: Add cmdq commands 2017-08-22 10:48:53 -07:00
hinic_main.c hinic: Link the logical network device to the pci device in sysfs 2018-07-25 13:54:52 -07:00
hinic_port.c net-next/hinic: Add ethtool and stats 2017-08-22 10:48:54 -07:00
hinic_port.h net-next/hinic: Add ethtool and stats 2017-08-22 10:48:54 -07:00
hinic_rx.c hinic: reset irq affinity before freeing irq 2018-06-28 13:34:57 +09:00
hinic_rx.h net-next/hinic: Add ethtool and stats 2017-08-22 10:48:54 -07:00
hinic_tx.c net-next/hinic: fix a problem in hinic_xmit_frame() 2018-07-19 23:27:32 -07:00
hinic_tx.h net-next/hinic: Add ethtool and stats 2017-08-22 10:48:54 -07:00