From mboxrd@z Thu Jan 1 00:00:00 1970 From: Saeed Mahameed Subject: [pull request][net 0/9] Mellanox, mlx5 fixes 2018-12-13 Date: Thu, 13 Dec 2018 08:45:29 -0800 Message-ID: <20181213164538.31436-1-saeedm@mellanox.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: netdev@vger.kernel.org, Saeed Mahameed To: "David S. Miller" Return-path: Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:37113 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727579AbeLMQp7 (ORCPT ); Thu, 13 Dec 2018 11:45:59 -0500 Sender: netdev-owner@vger.kernel.org List-ID: Hi Dave, This series introduces some fixes to the mlx5 core and mlx5e netdevice driver. ======= Conflict with net-next: When merged with net-next this series will cause a moderate conflict: 1) in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c (2 hunks) Take hunks from net only and just replace *attr->mirror_count to *attr->split_count 1.1) there is one more instance of slow_attr->mirror_count to be replaced with slow_attr->split_count, it doesn't appear in the conflict, it will cause a compilation error if left out. 2) in mlx5_ifc.h, take hunks only from net. Example for the merge resolution can be found at: https://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git/commit/?h=merge/mlx5-fixes&id=48830adf29804d85d77ed8a251d625db0eb5b8a8 branch merge/mlx5-fixes of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (I simply merged this pull request tag into net-next and resolved the conflict) I don't know if it's ok with you, but to save your time, you can just: git pull git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux merge/mlx5-fixes Into net-next, before your next net merge, and you will have a clean merge of net into net-next (at least for mlx5 files). ====== Please pull and let me know if there's any problem. For -stable v4.18 338d615be484 ('net/mlx5e: Cancel DIM work on close SQ') 91f40f9904ad ('net/mlx5e: RX, Verify MPWQE stride size is in range') For -stable v4.19 c5c7e1c41bbe ('net/mlx5e: Remove unused UDP GSO remaining counter') Thanks, Saeed. --- The following changes since commit 40e020c129cfc991e8ab4736d2665351ffd1468d: Linux 4.20-rc6 (2018-12-09 15:31:00 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-fixes-2018-12-13 for you to fetch changes up to fa2bf86bab4bbc61e5678a42a14e40075093a98f: net/mlx5e: Cancel DIM work on close SQ (2018-12-13 01:24:44 -0800) ---------------------------------------------------------------- mlx5-fixes-2018-12-13 ---------------------------------------------------------------- Gavi Teitz (1): net/mlx5e: Fix default amount of channels for VF representors Mikhael Goikhman (1): net/mlx5e: Remove unused UDP GSO remaining counter Moshe Shemesh (1): net/mlx5e: RX, Verify MPWQE stride size is in range Or Gerlitz (4): net/mlx5e: Err if asked to mirror a goto chain tc eswitch rule net/mlx5e: Avoid overriding the user provided priority for offloaded tc rules net/mlx5e: Properly initialize flow attributes for slow path eswitch rule deletion net/mlx5e: Avoid encap flows deletion attempt the 1st time a neigh is resolved Tal Gilboa (1): net/mlx5e: Cancel DIM work on close SQ Vu Pham (1): net/mlx5: E-Switch, Fix fdb cap bits swap drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 ++++ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 +++--- drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 2 -- drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 2 -- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 36 +++++++++++++--------- include/linux/mlx5/mlx5_ifc.h | 10 +++--- 6 files changed, 38 insertions(+), 27 deletions(-)