Rebased backport patches over 4.17

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/configure b/configure
index 8d0d954fe5647d29ea5336454cdf8a461b58e90d..1e9287e73cd036a88e246b711e2fd75ea63f0f7b 100755 (executable)
--- a/configure
+++ b/configure
@@ -492,7 +492,6 @@ main()
                                CONFIG_MLX5_INFINIBAND="m"
                                CONFIG_BACKPORT_LRO="m"
                                CONFIG_MLX5_DEBUG="y"
-                               CONFIG_MLX5_ESWITCH="y"
                                add_conf "# Load MLX5 modules" "MLX5_LOAD=yes"
                                ;;
                        --with-mlx4_core-mod)
@@ -505,13 +504,11 @@ main()
                                CONFIG_MLX5_CORE="m"
                                CONFIG_MLX5_CORE_EN="y"
                                CONFIG_MLX5_CORE_EN_DCB="y"
-                               CONFIG_MLX5_ESWITCH="y"
                                ;;
                        --without-mlx5_core-mod)
                                CONFIG_MLX5_CORE=
                                CONFIG_MLX5_CORE_EN=
                                CONFIG_MLX5_CORE_EN_DCB=
-                               CONFIG_MLX5_ESWITCH=
                                ;;
                        --without-mlx4-mod)
                                CONFIG_MLX4_CORE=
@@ -524,7 +521,6 @@ main()
                                CONFIG_MLX5_CORE_EN_DCB=
                                CONFIG_MLX5_INFINIBAND=
                                CONFIG_MLX5_DEBUG=
-                               CONFIG_MLX5_ESWITCH=
                                ;;
                        --with-mlx4_en-mod)
                                CONFIG_MLX4_CORE="m"

diff --git a/patches/0001-drivers-scsi-Makefile-Remove-unused-components.patch b/patches/0001-drivers-scsi-Makefile-Remove-unused-components.patch
index ac3f1a9b253e6160f69412e1476aaf446681ff81..db2511211f749a6dc338a8e67cf5f5f831a215f5 100644 (file)
--- a/patches/0001-drivers-scsi-Makefile-Remove-unused-components.patch
+++ b/patches/0001-drivers-scsi-Makefile-Remove-unused-components.patch
@@ -195,7 +195,7 @@ index xxxxxxx..xxxxxxx xxxxxx
 -NCR_Q720_mod-objs     := NCR_Q720.o ncr53c8xx.o
 -
 -# Files generated that shall be removed upon make clean
--clean-files :=        53c700_d.h 53c700_u.h
+-clean-files :=        53c700_d.h 53c700_u.h scsi_devinfo_tbl.c
 -
 -$(obj)/53c700.o $(MODVERDIR)/$(obj)/53c700.ver: $(obj)/53c700_d.h
 -

diff --git a/patches/0002-BACKPORT-ib_core.patch b/patches/0002-BACKPORT-ib_core.patch
index 55606dcda477565e51b9c56e3173dc849c971dce..a3a509cf1afb9c55c8537bffa96488832993f8be 100644 (file)
--- a/patches/0002-BACKPORT-ib_core.patch
+++ b/patches/0002-BACKPORT-ib_core.patch
@@ -1125,7 +1125,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  
        /*
         * If the combination of the addr and size requested for this memory
-@@ -184,17 +194,34 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
+@@ -181,17 +191,34 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
        if (ret)
                goto out;
  
@@ -1160,7 +1160,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  
                if (ret < 0)
                        goto out;
-@@ -218,7 +245,11 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
+@@ -215,7 +242,11 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
                                  umem->sg_head.sgl,
                                  umem->npages,
                                  DMA_BIDIRECTIONAL,