| Message ID | 20180112003723.19208-1-saeedm@mellanox.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Saeed Mahameed <saeedm@mellanox.com> Date: Fri, 12 Jan 2018 02:37:12 +0200 > The following series includes fixes to mlx5 core and netdev driver. > To highlight we have two critical fixes in this series: > 1st patch from Eran to address a fix for Host2BMC Breakage. > > 2nd patch from Saeed to address the RDMA IRQ vector affinity settings query > issue, the patch provides the correct mlx5_core implementation for RDMA to > correctly query vector affinity. > I sent this patch privately to Sagi a week a go, so he could to test it > but I didn't hear from him. > > All other patches are trivial misc fixes. > Please pull and let me know if there's any problem. > > for -stable v4.14-y and later: > ("net/mlx5: Fix get vector affinity helper function") > ("{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed") Pulled and queued up for -stable, thanks Saeed. > Note: Merging this series with net-next will produce the following conflict: ... Thanks a lot for this!
Hi Dave, The following series includes fixes to mlx5 core and netdev driver. To highlight we have two critical fixes in this series: 1st patch from Eran to address a fix for Host2BMC Breakage. 2nd patch from Saeed to address the RDMA IRQ vector affinity settings query issue, the patch provides the correct mlx5_core implementation for RDMA to correctly query vector affinity. I sent this patch privately to Sagi a week a go, so he could to test it but I didn't hear from him. All other patches are trivial misc fixes. Please pull and let me know if there's any problem. for -stable v4.14-y and later: ("net/mlx5: Fix get vector affinity helper function") ("{net,ib}/mlx5: Don't disable local loopback multicast traffic when needed") Note: Merging this series with net-next will produce the following conflict: <<<<<<< HEAD u8 disable_local_lb[0x1]; u8 reserved_at_3e2[0x1]; u8 log_min_hairpin_wq_data_sz[0x5]; u8 reserved_at_3e8[0x3]; ======= u8 disable_local_lb_uc[0x1]; u8 disable_local_lb_mc[0x1]; u8 reserved_at_3e3[0x8]; >>>>>>> 359c96447ac2297fabe15ef30b60f3b4b71e7fd0 To resolve, use the following hunk: i.e: <<<<<< u8 disable_local_lb_uc[0x1]; u8 disable_local_lb_mc[0x1]; u8 log_min_hairpin_wq_data_sz[0x5]; u8 reserved_at_3e8[0x3]; >>>>>> Thanks, Saeed. --- The following changes since commit ccc12b11c5332c84442ef120dcd631523be75089: ipv6: sr: fix TLVs not being copied using setsockopt (2018-01-10 16:03:55 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-fixes-2018-01-11 for you to fetch changes up to 237f258c42c905f71c694670fe4d9773d85c36ed: net/mlx5e: Remove timestamp set from netdevice open flow (2018-01-12 02:01:50 +0200) ---------------------------------------------------------------- mlx5-fixes-2018-01-11 ---------------------------------------------------------------- Alaa Hleihel (1): net/mlx5: Fix memory leak in bad flow of mlx5_alloc_irq_vectors Eran Ben Elisha (2): {net,ib}/mlx5: Don't disable local loopback multicast traffic when needed net/mlx5: Fix mlx5_get_uars_page to return error code Feras Daoud (2): net/mlx5: Update ptp_clock_event foreach PPS event net/mlx5e: Remove timestamp set from netdevice open flow Gal Pressman (2): net/mlx5e: Keep updating ethtool statistics when the interface is down net/mlx5e: Don't override netdev features field unless in error flow Maor Gottlieb (1): net/mlx5: Fix error handling in load one Saeed Mahameed (1): net/mlx5: Fix get vector affinity helper function Tariq Toukan (2): net/mlx5e: Add error print in ETS init net/mlx5e: Check support before TC swap in ETS init drivers/infiniband/hw/mlx5/main.c | 11 +++-- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 16 +++++--- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 48 +++++++++++++--------- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 27 ++++++++---- .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 3 +- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 6 ++- drivers/net/ethernet/mellanox/mlx5/core/main.c | 28 ++++++++----- drivers/net/ethernet/mellanox/mlx5/core/uar.c | 14 +++---- drivers/net/ethernet/mellanox/mlx5/core/vport.c | 22 +++++++--- include/linux/mlx5/driver.h | 19 ++++++++- include/linux/mlx5/mlx5_ifc.h | 5 ++- 14 files changed, 135 insertions(+), 71 deletions(-)