Jakub Kicinski 2295cddf99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Minor conflicts in net/mptcp/protocol.h and
tools/testing/selftests/net/Makefile.

In both cases code was added on both sides in the same place
so just keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2020-10-15 12:43:21 -07:00

..

alloc.c

mellanox: Switch to bitmap_zalloc()

2019-03-04 10:19:33 -08:00

catas.c

mlx4: Split restart_one into two functions

2019-09-13 22:11:14 +02:00

cmd.c

drivers: Remove explicit invocations of mmiowb()

2019-04-08 12:01:02 +01:00

cq.c

net: mlx: convert tasklets to use new tasklet_setup() API

2020-09-14 13:02:37 -07:00

crdump.c

net/mlx4_core: Add missing iounmap() in error path

2020-04-25 20:43:56 -07:00

en_clock.c

…

en_cq.c

net/mlx4_en: remove fallback after kzalloc_node()

2018-12-17 11:18:02 -08:00

en_dcb_nl.c

net/mlx4_en: Fix mixed PFC and Global pause user control requests

2018-03-27 12:02:30 -04:00

en_ethtool.c

mlx4: add pause frame stats

2020-09-15 13:26:29 -07:00

en_main.c

net/mlx4_en: Use minimal rx and tx ring sizes on kdump kernel

2018-10-09 11:08:48 -07:00

en_netdev.c

bpf, xdp: Remove XDP_QUERY_PROG and XDP_QUERY_PROG_HW XDP commands

2020-07-25 20:37:02 -07:00

en_port.c

…

en_port.h

…

en_resources.c

…

en_rx.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-10-15 12:43:21 -07:00

en_selftest.c

…

en_tx.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2020-10-15 12:43:21 -07:00

eq.c

net: mlx: convert tasklets to use new tasklet_setup() API

2020-09-14 13:02:37 -07:00

fw_qos.c

…

fw_qos.h

…

fw.c

net/mlx4_core: fix a memory leak bug.

2020-05-23 16:34:37 -07:00

fw.h

net/mlx4_core: Add health buffer address capability

2018-07-12 17:37:13 -07:00

icm.c

net/mlx4: replace pci_{,un}map_sg with dma_{,un}map_sg

2019-01-07 05:14:17 -08:00

icm.h

net/mlx4: Get rid of page operation after dma_alloc_coherent

2019-01-07 05:14:17 -08:00

intf.c

net/mlx4: fix spelling mistake: "Inrerface" -> "Interface" and rephrase message

2018-05-23 14:58:10 -04:00

Kconfig

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

main.c

devlink: Add devlink reload limit option

2020-10-09 12:06:52 -07:00

Makefile

net/mlx4_core: Add Crdump FW snapshot support

2018-07-12 17:37:13 -07:00

mcg.c

net/mlx4: Use fallthrough pseudo-keyword

2020-07-27 13:14:10 -07:00

mlx4_en.h

mlx4: convert to new udp_tunnel_nic infra

2020-07-10 13:54:00 -07:00

mlx4_stats.h

mlx4: add pause frame stats

2020-09-15 13:26:29 -07:00

mlx4.h

net: mlx: convert tasklets to use new tasklet_setup() API

2020-09-14 13:02:37 -07:00

mr.c

net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init()

2020-09-01 13:13:15 -07:00

pd.c

…

port.c

net/mlx4_en: ethtool, Remove unsupported SFP EEPROM high pages query

2019-05-20 11:33:57 -07: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: Dynamically set guaranteed amount of counters per VF

2019-10-29 16:29:43 -07:00

sense.c

…

srq.c

…