David S. Miller a06ee256e5 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-09-25 10:35:29 -07:00
..
alloc.c	net: ethernet: Use DIV_ROUND_UP instead of reimplementing its function	2018-09-12 20:34:47 -07:00
catas.c	net/mlx4_core: Add Crdump FW snapshot support	2018-07-12 17:37:13 -07:00
cmd.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
cq.c
crdump.c	net/mlx4_core: Use devlink region_snapshot parameter	2018-07-12 17:37:13 -07:00
en_clock.c
en_cq.c
en_dcb_nl.c
en_ethtool.c	net/mlx4_en: Verify coalescing parameters are in range	2018-05-10 16:09:05 -04:00
en_main.c
en_netdev.c	mlx4: remove ndo_poll_controller	2018-09-23 21:55:25 -07:00
en_port.c
en_port.h
en_resources.c
en_rx.c	net/mlx4/en_rx: Mark expected switch fall-throughs	2018-08-07 17:54:20 -07:00
en_selftest.c
en_tx.c	net: allow fallback function to pass netdev	2018-07-09 13:57:25 -07:00
eq.c	net/mlx4: Use cpumask_available for eq->affinity_mask	2018-09-21 19:20:22 -07:00
fw_qos.c
fw_qos.h
fw.c	net/mlx4_core: Add health buffer address capability	2018-07-12 17:37:13 -07:00
fw.h	net/mlx4_core: Add health buffer address capability	2018-07-12 17:37:13 -07:00
icm.c	net: ethernet: Use DIV_ROUND_UP instead of reimplementing its function	2018-09-12 20:34:47 -07:00
icm.h
intf.c	net/mlx4: fix spelling mistake: "Inrerface" -> "Interface" and rephrase message	2018-05-23 14:58:10 -04:00
Kconfig
main.c	net/mlx4_core: Allow MTTs starting at any index	2018-07-25 16:30:38 -07:00
Makefile	net/mlx4_core: Add Crdump FW snapshot support	2018-07-12 17:37:13 -07:00
mcg.c	net/mlx4/mcg: Mark expected switch fall-throughs	2018-08-07 17:54:20 -07:00
mlx4_en.h	net: allow ndo_select_queue to pass netdev	2018-07-09 13:41:34 -07:00
mlx4_stats.h
mlx4.h	net/mlx4_core: Allow MTTs starting at any index	2018-07-25 16:30:38 -07:00
mr.c
pd.c
port.c	net: ethernet: mlx4: Remove unnecessary parentheses	2018-06-04 10:14:39 -04:00
profile.c	net/mlx4_core: Allow MTTs starting at any index	2018-07-25 16:30:38 -07:00
qp.c	net/mlx4: Fix irq-unsafe spinlock usage	2018-05-23 15:48:58 -04:00
reset.c
resource_tracker.c	net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper	2018-07-24 16:30:48 -07:00
sense.c
srq.c