mbox

[pull,request,net-next,00/15] mlx5 cleanup 2020-05-29

Message ID 20200530042626.15837-1-saeedm@mellanox.com
State Accepted
Delegated to: David Miller
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-cleanup-2020-05-29

Message

Saeed Mahameed May 30, 2020, 4:26 a.m. UTC 
Hi Dave/Jakub,

While the TLS RX series is being discussed, If it is ok with you,
i would like to get this cleanup series merged into net-next.

This series provides some trivial fixes, cleanup and follow-up on
previous net-next submissions.

Highlights:
1) XDP data meta setup fix By Jesper.

2) Introduce mpls_entry_encode() in mpls.h as suggested by
Jakub and David Ahern.

3) sparse warnings cleanup. My build script had sparse disabled for a
while now and we've accumulated a number of build warnings.
Now all is clean and sparse is enabled in my build script, i will do my
best to keep the driver clean.

For more information please see tag log below.

Please pull and let me know if there is any problem.

Please note that the series starts with a merge of mlx5-next branch,
to resolve and avoid dependency with rdma tree.

Have a great weekend!
Saeed.

---
The following changes since commit 971ae1ed0346658a70f5b411d59f528b94553009:

  Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux (2020-05-29 14:38:57 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-cleanup-2020-05-29

for you to fetch changes up to eb24387183d37f2f4f456654ef92679b1556f8df:

  net/mlx5e: Make mlx5e_dcbnl_ops static (2020-05-29 21:20:23 -0700)

----------------------------------------------------------------
mlx5-cleanup-2020-05-29

Accumulated cleanup patches and sparse warning fixes for mlx5 driver.

1) sync with mlx5-next branch

2) Eli Cohen declares mpls_entry_encode() helper in mpls.h as suggested
by Jakub Kicinski and David Ahern, and use it in mlx5

3) Jesper Fixes xdp data_meta setup in mlx5

4) Many sparse and build warnings cleanup

----------------------------------------------------------------
Arnd Bergmann (1):
      net/mlx5: reduce stack usage in qp_read_field

Eli Cohen (2):
      net: Make mpls_entry_encode() available for generic users
      net/mlx5e: Use generic API to build MPLS label

Jesper Dangaard Brouer (1):
      mlx5: fix xdp data_meta setup in mlx5e_fill_xdp_buff

Nathan Chancellor (1):
      net/mlx5e: Don't use err uninitialized in mlx5e_attach_decap

Saeed Mahameed (10):
      net/mlx5: Kconfig: Fix spelling typo
      net/mlx5: DR: Fix incorrect type in argument
      net/mlx5: DR: Fix cast to restricted __be32
      net/mlx5: DR: Fix incorrect type in return expression
      net/mlx5: cmd: Fix memset with byte count warning
      net/mlx5: Accel: fpga tls fix cast to __be64 and incorrect argument types
      net/mlx5: IPSec: Fix incorrect type for spi
      net/mlx5e: en_tc: Fix incorrect type in initializer warnings
      net/mlx5e: en_tc: Fix cast to restricted __be32 warning
      net/mlx5e: Make mlx5e_dcbnl_ops static

 drivers/net/ethernet/mellanox/mlx5/core/Kconfig      |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c  |  4 ++--
 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h  |  8 ++++----
 drivers/net/ethernet/mellanox/mlx5/core/cmd.c        | 20 ++++++++++++++------
 drivers/net/ethernet/mellanox/mlx5/core/debugfs.c    | 14 ++++++++++----
 .../ethernet/mellanox/mlx5/core/en/tc_tun_mplsoudp.c | 20 +++-----------------
 .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c   |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c   |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c      |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c      | 12 ++++++------
 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c   |  4 ++--
 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h   |  4 ++--
 .../ethernet/mellanox/mlx5/core/steering/dr_action.c |  2 +-
 .../ethernet/mellanox/mlx5/core/steering/dr_ste.c    |  4 ++--
 include/linux/mlx5/accel.h                           |  2 +-
 include/linux/mlx5/driver.h                          |  2 +-
 include/net/mpls.h                                   | 17 +++++++++++++++++
 net/mpls/internal.h                                  | 11 -----------
 18 files changed, 69 insertions(+), 63 deletions(-)

Comments

David Miller May 31, 2020, 12:54 a.m. UTC | #1 
From: Saeed Mahameed <saeedm@mellanox.com>
Date: Fri, 29 May 2020 21:26:11 -0700

> While the TLS RX series is being discussed, If it is ok with you,
> i would like to get this cleanup series merged into net-next.

This is fine with me, pulled, thanks Saeed.