From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 12 Jun 2017 14:10:14 +0000 (+0200)
Subject: 3.18-stable patches
X-Git-Tag: v3.18.57~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87fe91d3374c19039c20bed361bd22260c8b3a83;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	mlx5-stop-including-asm-generic-kmap_types.h.patch
---

diff --git a/queue-3.18/mlx5-stop-including-asm-generic-kmap_types.h.patch b/queue-3.18/mlx5-stop-including-asm-generic-kmap_types.h.patch
new file mode 100644
index 00000000000..4692008c1e4
--- /dev/null
+++ b/queue-3.18/mlx5-stop-including-asm-generic-kmap_types.h.patch
@@ -0,0 +1,67 @@
+From adec640e03668e42f30f3b09c0b4d60d44545f6f Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Fri, 28 Aug 2015 09:27:19 +0200
+Subject: mlx5: stop including <asm-generic/kmap_types.h>
+
+From: Christoph Hellwig <hch@lst.de>
+
+commit adec640e03668e42f30f3b09c0b4d60d44545f6f upstream.
+
+<linux/highmem.h> is the placace the get the kmap type flags, asm-generic
+files are generic implementations only to be used by architecture code.
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/infiniband/hw/mlx5/main.c                   |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c       |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c      |    2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/infiniband/hw/mlx5/main.c
++++ b/drivers/infiniband/hw/mlx5/main.c
+@@ -30,7 +30,7 @@
+  * SOFTWARE.
+  */
+ 
+-#include <asm-generic/kmap_types.h>
++#include <linux/highmem.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/errno.h>
+--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+@@ -30,7 +30,7 @@
+  * SOFTWARE.
+  */
+ 
+-#include <asm-generic/kmap_types.h>
++#include <linux/highmem.h>
+ #include <linux/module.h>
+ #include <linux/errno.h>
+ #include <linux/pci.h>
+--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
+@@ -30,7 +30,7 @@
+  * SOFTWARE.
+  */
+ 
+-#include <asm-generic/kmap_types.h>
++#include <linux/highmem.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/errno.h>
+--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+@@ -30,7 +30,7 @@
+  * SOFTWARE.
+  */
+ 
+-#include <asm-generic/kmap_types.h>
++#include <linux/highmem.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/mlx5/driver.h>
diff --git a/queue-3.18/series b/queue-3.18/series
index 04d5958529b..8c9b6704a05 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -42,3 +42,4 @@ rdma-qib-hfi1-fix-mr-reference-count-leak-on-write-with-immediate.patch
 tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch
 usercopy-adjust-tests-to-deal-with-smap-pan.patch
 arm64-ensure-extension-of-smp_store_release-value.patch
+mlx5-stop-including-asm-generic-kmap_types.h.patch