Hi Dave,

This series adds misc updates to mlx5 driver.

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.

Note: when merged with net there is going to be a small merge conflict
in en_tc.c:
++<<<<<<< HEAD
 +              err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_KERNEL,
 +                                          parse_attr, hdrs, &action, extack);
++=======
+               err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_FDB,
+                                           parse_attr, hdrs, extack);
++>>>>>>> dave/master

Resolution:
+               err = alloc_tc_pedit_action(priv, MLX5_FLOW_NAMESPACE_FDB,
+                                           parse_attr, hdrs, &action, extack);

Thanks,
Saeed.

---
The following changes since commit 0258081d158fd42d968ef997dc2a821ddfb9a999:

  Merge branch 'mlx5-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux (2019-04-02 
15:46:14 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git 
tags/mlx5-updates-2019-04-02

for you to fetch changes up to 0879e2ec5893532cc5e9ef41f3b8115f544509bb:

  net/mlx5e: Unify logic of MTU boundaries (2019-04-02 15:46:31 -0700)

----------------------------------------------------------------
mlx5-updates-2019-04-02

This series provides misc updates to mlx5 driver

1) Aya Levin (1): Handle event of power detection in the PCIE slot

2) Eli Britstein (6):
  Some TC VLAN related updates and fixes to the previous VLAN modify action
  support patchset.
  Offload TC e-switch rules with egress/ingress VLAN devices

3) Max Gurtovoy (1): Fix double mutex initialization in esiwtch.c

4) Tariq Toukan (3): Misc small updates
  A write memory barrier is sufficient in EQ ci update
  Obsolete param field holding a constant value
  Unify logic of MTU boundaries

5) Tonghao Zhang (4): Misc updates to en_tc.c
  Make the log friendly when decapsulation offload not supported
  Remove 'parse_attr' argument in parse_tc_fdb_actions()
  Deletes unnecessary setting of esw_attr->parse_attr
  Return -EOPNOTSUPP when attempting to offload an unsupported action

----------------------------------------------------------------
Aya Levin (1):
      net/mlx5: Handle event of power detection in the PCIE slot

Eli Britstein (6):
      net/mlx5e: Use helpers to get headers criteria and value pointers
      net/mlx5e: Deny VLAN rewrite if there is no VLAN header match
      net/mlx5e: Allow VLAN rewrite of prio field with the same match
      net/mlx5e: Offload TC e-switch rules with egress VLAN device
      net/mlx5e: Offload TC e-switch rules with ingress VLAN device
      net/mlx5e: Do not rewrite fields with the same match

Max Gurtovoy (1):
      net/mlx5: E-Switch, Fix double mutex initialization

Tariq Toukan (3):
      net/mlx5: A write memory barrier is sufficient in EQ ci update
      net/mlx5e: Obsolete param field holding a constant value
      net/mlx5e: Unify logic of MTU boundaries

Tonghao Zhang (4):
      net/mlx5e: Make the log friendly when decapsulation offload not supported
      net/mlx5e: Remove 'parse_attr' argument in parse_tc_fdb_actions()
      net/mlx5e: Deletes unnecessary setting of esw_attr->parse_attr
      net/mlx5e: Return -EOPNOTSUPP when attempting to offload an unsupported 
action

 drivers/net/ethernet/mellanox/mlx5/core/en.h       |   2 +-
 .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c    |   8 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |  24 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_rep.c   |  11 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c    | 301 +++++++++++++++++----
 drivers/net/ethernet/mellanox/mlx5/core/eq.c       |   2 +-
 .../ethernet/mellanox/mlx5/core/eswitch_offloads.c |   2 -
 drivers/net/ethernet/mellanox/mlx5/core/events.c   |  75 +++++
 .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c  |   5 +-
 include/linux/mlx5/device.h                        |   1 +
 10 files changed, 349 insertions(+), 82 deletions(-)

Reply via email to