From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 13 Feb 2019 10:16:22 +0000 (+0100)
Subject: fix up 3.18 queue
X-Git-Tag: v4.9.157~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=447bd6d90727ae4d1495475bba756b06f5027a87;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up 3.18 queue
---

diff --git a/queue-3.18/mei-me-add-ice-lake-point-device-id.patch b/queue-3.18/mei-me-add-ice-lake-point-device-id.patch
deleted file mode 100644
index dccfc78778b..00000000000
--- a/queue-3.18/mei-me-add-ice-lake-point-device-id.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From efe814e90b98aed6d655b5a4092b9114b8b26e42 Mon Sep 17 00:00:00 2001
-From: Tomas Winkler <tomas.winkler@intel.com>
-Date: Thu, 24 Jan 2019 14:45:02 +0200
-Subject: mei: me: add ice lake point device id.
-
-From: Tomas Winkler <tomas.winkler@intel.com>
-
-commit efe814e90b98aed6d655b5a4092b9114b8b26e42 upstream.
-
-Add icelake mei device id.
-
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/misc/mei/hw-me-regs.h |    2 ++
- drivers/misc/mei/pci-me.c     |    2 ++
- 2 files changed, 4 insertions(+)
-
---- a/drivers/misc/mei/hw-me-regs.h
-+++ b/drivers/misc/mei/hw-me-regs.h
-@@ -121,6 +121,8 @@
- #define PCI_CFG_HFS_1         0x40
- #define PCI_CFG_HFS_2         0x48
- 
-+#define MEI_DEV_ID_ICP_LP     0x34E0  /* Ice Lake Point LP */
-+
- /*
-  * MEI HW Section
-  */
---- a/drivers/misc/mei/pci-me.c
-+++ b/drivers/misc/mei/pci-me.c
-@@ -83,6 +83,8 @@ static const struct pci_device_id mei_me
- 	{MEI_PCI_DEVICE(MEI_DEV_ID_WPT_LP, mei_me_pch_cfg)},
- 	{MEI_PCI_DEVICE(MEI_DEV_ID_WPT_LP_2, mei_me_pch_cfg)},
- 
-+	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
-+
- 	/* required last entry */
- 	{0, }
- };
diff --git a/queue-3.18/series b/queue-3.18/series
index f9b473ee390..5bba5d78209 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -76,5 +76,4 @@ mtd-rawnand-gpmi-fix-mx28-bus-master-lockup-problem.patch
 signal-always-notice-exiting-tasks.patch
 signal-better-detection-of-synchronous-signals.patch
 misc-vexpress-off-by-one-in-vexpress_syscfg_exec.patch
-mei-me-add-ice-lake-point-device-id.patch
 debugfs-fix-debugfs_rename-parameter-checking.patch
diff --git a/queue-3.18/signal-better-detection-of-synchronous-signals.patch b/queue-3.18/signal-better-detection-of-synchronous-signals.patch
index 8ef29053fce..f2b44900411 100644
--- a/queue-3.18/signal-better-detection-of-synchronous-signals.patch
+++ b/queue-3.18/signal-better-detection-of-synchronous-signals.patch
@@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	return signr;
  }
  
-+static int dequeue_synchronous_signal(kernel_siginfo_t *info)
++static int dequeue_synchronous_signal(siginfo_t *info)
 +{
 +	struct task_struct *tsk = current;
 +	struct sigpending *pending = &tsk->pending;