1
0
Fork 0
alistair23-linux/drivers/net/ethernet/mellanox
David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-08-02 10:55:32 -07:00
..
mlx4 net/mlx4_core: Allow MTTs starting at any index 2018-07-25 16:30:38 -07:00
mlx5/core Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2018-08-02 10:55:32 -07:00
mlxfw net/mlxfw: Properly handle dependancy with non-loadable mlx5 2017-07-03 02:32:25 -07:00
mlxsw mlxsw: spectrum_router: Handle sysctl_ip_fwd_update_priority 2018-08-01 09:52:30 -07:00
Kconfig Change Kconfig description 2017-08-14 11:18:16 -07:00
Makefile Add the mlxfw module for Mellanox firmware flash process 2017-05-25 17:46:17 -04:00