Hi Dave, 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); Thanks, Saeed. --- The following changes since commit e858faf556d4e14c750ba1e8852783c6f9520a0e: tcp: Reset bytes_acked and bytes_received when disconnecting (2019-07-08 19:29:19 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-fixes-2019-07-11 for you to fetch changes up to ef1ce7d7b67b46661091c7ccc0396186b7a247ef: net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn (2019-07-11 11:45:04 -0700) ---------------------------------------------------------------- mlx5-fixes-2019-07-11 ---------------------------------------------------------------- Aya Levin (3): net/mlx5e: Fix return value from timeout recover function net/mlx5e: Fix error flow in tx reporter diagnose net/mlx5e: IPoIB, Add error path in mlx5_rdma_setup_rn Eli Britstein (1): net/mlx5e: Fix port tunnel GRE entropy control Maor Gottlieb (1): net/mlx5: E-Switch, Fix default encap mode Saeed Mahameed (1): net/mlx5e: Rx, Fix checksum calculation for new hardware drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 10 ++++------ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 +++ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 7 ++++++- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 5 ----- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 7 +++++++ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 9 ++++++++- .../net/ethernet/mellanox/mlx5/core/lib/port_tun.c | 23 ++++------------------ include/linux/mlx5/mlx5_ifc.h | 3 ++- 9 files changed, 35 insertions(+), 33 deletions(-)