David S. Miller 71930d6102 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... All conflicts seemed rather trivial, with some guidance from Saeed Mameed on the tc_ct.c one. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-07-11 00:46:00 -07:00
..
ionic_bus_pci.c	ionic: add pcie_print_link_status	2020-06-11 18:26:19 -07:00
ionic_bus.h	ionic: Add basic adminq support	2019-09-05 09:24:43 +02:00
ionic_debugfs.c	ionic: Use debugfs_create_bool() to export bool	2020-05-06 17:46:33 -07:00
ionic_debugfs.h	ionic: Add basic adminq support	2019-09-05 09:24:43 +02:00
ionic_dev.c	ionic: support longer tx sg lists	2020-05-12 12:19:30 -07:00
ionic_dev.h	ionic: more ionic name tweaks	2020-05-12 12:19:30 -07:00
ionic_devlink.c	devlink: Replace devlink_port_attrs_set parameters with a struct	2020-07-09 13:15:29 -07:00
ionic_devlink.h
ionic_ethtool.c	ionic: centralize queue reset code	2020-07-07 15:50:31 -07:00
ionic_ethtool.h	ionic: Add initial ethtool support	2019-09-05 09:24:44 +02:00
ionic_if.h	ionic: updates to ionic FW api description	2020-05-12 12:19:30 -07:00
ionic_lif.c	ionic: centralize queue reset code	2020-07-07 15:50:31 -07:00
ionic_lif.h	ionic: centralize queue reset code	2020-07-07 15:50:31 -07:00
ionic_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-15 13:48:59 -07:00
ionic_regs.h	ionic: make spdxcheck.py happy	2020-03-21 19:53:57 -07:00
ionic_rx_filter.c	ionic: fix unused assignment	2020-04-14 16:30:14 -07:00
ionic_rx_filter.h	ionic: replay filters after fw upgrade	2020-04-08 13:02:32 -07:00
ionic_stats.c	ionic: add more ethtool stats	2020-05-12 12:19:30 -07:00
ionic_stats.h	ionic: add more ethtool stats	2020-05-12 12:19:30 -07:00
ionic_txrx.c	ionic: add more ethtool stats	2020-05-12 12:19:30 -07:00
ionic_txrx.h	ionic: clean tx queue of unfinished requests	2020-03-30 11:40:50 -07:00
ionic.h	ionic: remove support for mgmt device	2020-06-11 12:43:29 -07:00
Makefile	ionic: Add driver stats	2019-09-05 09:24:44 +02:00