diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-12 01:06:37 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-12 01:06:37 +0300 |
| commit | 114a5c3240155fdb01bf821c9d326d7bb05bd464 (patch) | |
| tree | 55309a5fa85a6b4ff4a6decb689cd8c6a1b78cd4 /net/xfrm | |
| parent | 08d14c49ac949b0e42f2aa36fb8d5c860cfe130d (diff) | |
| parent | ef1ce7d7b67b46661091c7ccc0396186b7a247ef (diff) | |
| download | linux-114a5c3240155fdb01bf821c9d326d7bb05bd464.tar.xz | |
Merge tag 'mlx5-fixes-2019-07-11' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
Mellanox, mlx5 fixes 2019-07-11
This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
For -stable v4.15
('net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn')
For -stable v5.1
('net/mlx5e: Fix port tunnel GRE entropy control')
('net/mlx5e: Rx, Fix checksum calculation for new hardware')
('net/mlx5e: Fix return value from timeout recover function')
('net/mlx5e: Fix error flow in tx reporter diagnose')
For -stable v5.2
('net/mlx5: E-Switch, Fix default encap mode')
Conflict note: This pull request will produce a small conflict when
merged with net-next.
In drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Take the hunk from net and replace:
esw_offloads_steering_init(esw, vf_nvports, total_nvports);
with:
esw_offloads_steering_init(esw);
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions