linux/drivers/net/ethernet/cavium/liquidio
David S. Miller 101c431492 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmgenet.c
	net/core/sock.c

Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-03-15 11:59:10 -07:00
..
Makefile liquidio CN23XX: VF config setup 2016-11-30 11:03:08 -05:00
cn23xx_pf_device.c liquidio CN23XX: copyrights changes and alignment 2016-11-15 22:24:40 -05:00
cn23xx_pf_device.h liquidio CN23XX: copyrights changes and alignment 2016-11-15 22:24:40 -05: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 CN23XX: VF xmit 2016-12-08 13:21:39 -05:00
cn23xx_vf_device.h liquidio VF ethtool stats 2016-12-08 18:16:51 -05:00
cn23xx_vf_regs.h liquidio CN23XX: VF register definitions 2016-11-30 11:03:08 -05:00
cn66xx_device.c liquidio CN23XX: copyrights changes and alignment 2016-11-15 22:24:40 -05: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 CN23XX: VF interrupt 2016-11-30 11:03:09 -05:00
lio_ethtool.c liquidio: fix wrong information about channels reported to ethtool 2017-01-06 15:44:19 -05:00
lio_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-03-15 11:59:10 -07:00
lio_vf_main.c liquidio: improve UDP TX performance 2017-03-09 13:07:00 -08:00
liquidio_common.h liquidio: fix for iq and droq cnts going negative 2017-02-01 12:25:40 -05:00
liquidio_image.h liquidio CN23XX: copyrights changes and alignment 2016-11-15 22:24:40 -05:00
octeon_config.h liquidio: improve UDP TX performance 2017-03-09 13:07:00 -08:00
octeon_console.c net: liquidio: fix build errors when linux/phy*.h is removed from net/dsa.h 2017-02-10 13:51:03 -05:00
octeon_device.c liquidio: optimize DMA in NUMA systems 2017-03-12 23:17:00 -07:00
octeon_device.h liquidio: optimize reads from Octeon PCI console 2016-12-29 22:26:03 -05:00
octeon_droq.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-03-15 11:59:10 -07:00
octeon_droq.h liquidio: improve UDP TX performance 2017-03-09 13:07:00 -08:00
octeon_iq.h liquidio: optimize DMA in NUMA systems 2017-03-12 23:17:00 -07:00
octeon_mailbox.c liquidio VF: reduce load time of module 2017-01-12 15:52:56 -05:00
octeon_mailbox.h liquidio VF: reduce load time of module 2017-01-12 15:52:56 -05:00
octeon_main.h liquidio: improve UDP TX performance 2017-03-09 13:07:00 -08:00
octeon_mem_ops.c liquidio: optimize reads from Octeon PCI console 2016-12-29 22:26:03 -05:00
octeon_mem_ops.h liquidio CN23XX: copyrights changes and alignment 2016-11-15 22:24:40 -05:00
octeon_network.h liquidio: improve UDP TX performance 2017-03-09 13:07:00 -08:00
octeon_nic.c liquidio VF: fix incorrect struct being used 2017-01-06 15:31:24 -05:00
octeon_nic.h liquidio CN23XX: fix for new check patch errors 2016-11-15 22:24:40 -05:00
request_manager.c liquidio: optimize DMA in NUMA systems 2017-03-12 23:17:00 -07:00
response_manager.c liquidio VF rx data and ctl path 2016-12-08 13:21:39 -05:00
response_manager.h liquidio CN23XX: copyrights changes and alignment 2016-11-15 22:24:40 -05:00