From: Saeed Mahameed <saeedm@mellanox.com>
Date: Mon, 22 Apr 2019 22:25:39 +0000 (-0700)
Subject: Merge tag 'v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: for-linus-20190516~37^2~44^2~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c3bdd5e65185f46150b3bac103b3854040487857;p=linux-2.6-block.git

Merge tag 'v5.1-rc1' of git://git./linux/kernel/git/torvalds/linux into mlx5-next

Linux 5.1-rc1

We forgot to reset the branch last merge window thus mlx5-next is outdated
and still based on 5.0-rc2. This merge commit is needed to sync mlx5-next
branch with 5.1-rc1.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---

c3bdd5e65185f46150b3bac103b3854040487857
diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 8a214ada2424,f2260391be5b..6c8a17ca236e
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@@ -40,7 -40,14 +40,9 @@@
  #include "en.h"
  #include "fs_core.h"
  #include "lib/devcom.h"
+ #include "ecpf.h"
+ #include "lib/eq.h"
  
 -enum {
 -	FDB_FAST_PATH = 0,
 -	FDB_SLOW_PATH
 -};
 -
  /* There are two match-all miss flows, one for unicast dst mac and
   * one for multicast.
   */