OpenCloudOS-Kernel/drivers/net/ethernet/cavium/liquidio
David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-07-20 21:17:12 -07:00
..
Makefile net: liquidio: clean up Makefile for simpler composite object handling 2018-03-26 02:01:27 +09:00
cn23xx_pf_device.c liquidio: fix hang when re-binding VF host drv after running DPDK VF driver 2018-07-16 14:02:00 -07:00
cn23xx_pf_device.h liquidio: enhanced ethtool --set-channels feature 2018-04-30 09:26:29 -04:00
cn23xx_pf_regs.h liquidio CN23XX: fix for new check patch errors 2016-11-15 22:24:40 -05:00
cn23xx_vf_device.c liquidio: Using NULL instead of plain integer 2018-07-18 13:40:58 -07:00
cn23xx_vf_device.h liquidio: moved wait_for_pending_requests to octeon_network.h 2017-08-14 22:21:39 -07:00
cn23xx_vf_regs.h liquidio CN23XX: VF register definitions 2016-11-30 11:03:08 -05:00
cn66xx_device.c liquidio: fix bug in soft reset failure detection 2017-07-06 10:36:03 +01:00
cn66xx_device.h liquidio CN23XX: copyrights changes and alignment 2016-11-15 22:24:40 -05:00
cn66xx_regs.h liquidio CN23XX: fix for new check patch errors 2016-11-15 22:24:40 -05:00
cn68xx_device.c liquidio CN23XX: fix for new check patch errors 2016-11-15 22:24:40 -05:00
cn68xx_device.h liquidio CN23XX: copyrights changes and alignment 2016-11-15 22:24:40 -05:00
cn68xx_regs.h liquidio CN23XX: copyrights changes and alignment 2016-11-15 22:24:40 -05:00
lio_core.c liquidio: support use of ethtool to set link speed of CN23XX-225 cards 2018-05-07 23:31:23 -04:00
lio_ethtool.c liquidio: support use of ethtool to set link speed of CN23XX-225 cards 2018-05-07 23:31:23 -04:00
lio_main.c Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux 2018-07-20 21:17:12 -07:00
lio_vf_main.c liquidio: correct error msg text when removing VLAN ID 2018-07-16 22:55:29 -07:00
lio_vf_rep.c liquidio: Swap VF representor Tx and Rx statistics 2018-04-24 16:20:32 -04:00
lio_vf_rep.h liquidio: synchronize VF representor names with NIC firmware 2017-11-02 17:04:06 +09:00
liquidio_common.h liquidio: bump up driver version to 1.7.2 to match newer NIC firmware 2018-05-10 17:32:18 -04:00
liquidio_image.h liquidio: allow override of firmware present in flash 2017-09-25 20:25:39 -07:00
octeon_config.h liquidio: xmit_more support 2017-10-28 00:35:23 +09:00
octeon_console.c liquidio: use ktime_get_real_ts64() instead of getnstimeofday64() 2018-07-12 14:55:39 -07:00
octeon_device.c liquidio: enhanced ethtool --set-channels feature 2018-04-30 09:26:29 -04:00
octeon_device.h liquidio: fix kernel panic when NIC firmware is older than 1.7.2 2018-07-07 11:10:35 +09:00
octeon_droq.c treewide: Use array_size() in vzalloc_node() 2018-06-12 16:19:22 -07:00
octeon_droq.h liquidio: Simplified napi poll 2018-03-16 15:03:26 -04:00
octeon_iq.h liquidio: Enhanced ethtool stats 2018-04-17 09:56:52 -04:00
octeon_mailbox.c liquidio: Added ndo_get_vf_stats support 2018-04-20 10:53:46 -04:00
octeon_mailbox.h liquidio: Added ndo_get_vf_stats support 2018-04-20 10:53:46 -04:00
octeon_main.h liquidio: xmit_more support 2017-10-28 00:35:23 +09:00
octeon_mem_ops.c liquidio: stop using huge static buffer, save 4096k in .data 2017-06-22 11:03:00 -04:00
octeon_mem_ops.h liquidio: stop using huge static buffer, save 4096k in .data 2017-06-22 11:03:00 -04:00
octeon_network.h liquidio: monitor all of Octeon's cores in watchdog thread 2018-05-10 17:32:18 -04:00
octeon_nic.c liquidio: xmit_more support 2017-10-28 00:35:23 +09:00
octeon_nic.h liquidio: xmit_more support 2017-10-28 00:35:23 +09:00
request_manager.c liquidio: Use %pad printk format for dma_addr_t values 2018-07-16 13:36:49 -07:00
response_manager.c liquidio: avoid doing useless work 2018-03-08 21:46:12 -05:00
response_manager.h liquidio: fix for vf mac addr command sent to nic firmware 2017-03-21 17:48:29 -07:00