drop 4.9 intel_th patches

diff --git a/queue-4.9/intel_th-pci-add-comet-lake-pch-v-support.patch b/queue-4.9/intel_th-pci-add-comet-lake-pch-v-support.patch
deleted file mode 100644 (file)
index 3a73bc9..0000000
--- a/queue-4.9/intel_th-pci-add-comet-lake-pch-v-support.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e4de2a5d51f97a6e720a1c0911f93e2d8c2f1c08 Mon Sep 17 00:00:00 2001
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Date: Tue, 17 Dec 2019 13:55:24 +0200
-Subject: intel_th: pci: Add Comet Lake PCH-V support
-
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-
-commit e4de2a5d51f97a6e720a1c0911f93e2d8c2f1c08 upstream.
-
-This adds Intel(R) Trace Hub PCI ID for Comet Lake PCH-V.
-
-Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/20191217115527.74383-2-alexander.shishkin@linux.intel.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/hwtracing/intel_th/pci.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/hwtracing/intel_th/pci.c
-+++ b/drivers/hwtracing/intel_th/pci.c
-@@ -96,6 +96,11 @@ static const struct pci_device_id intel_
-               .driver_data = (kernel_ulong_t)0,
-       },
-       {
-+              /* Comet Lake PCH-V */
-+              PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa3a6),
-+              .driver_data = (kernel_ulong_t)&intel_th_2x,
-+      },
-+      {
-               /* Gemini Lake */
-               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e),
-               .driver_data = (kernel_ulong_t)0,

diff --git a/queue-4.9/intel_th-pci-add-elkhart-lake-soc-support.patch b/queue-4.9/intel_th-pci-add-elkhart-lake-soc-support.patch
deleted file mode 100644 (file)
index 22d6c7d..0000000
--- a/queue-4.9/intel_th-pci-add-elkhart-lake-soc-support.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 88385866bab8d5e18c7f45d1023052c783572e03 Mon Sep 17 00:00:00 2001
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Date: Tue, 17 Dec 2019 13:55:25 +0200
-Subject: intel_th: pci: Add Elkhart Lake SOC support
-
-From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-
-commit 88385866bab8d5e18c7f45d1023052c783572e03 upstream.
-
-This adds support for Intel Trace Hub in Elkhart Lake.
-
-Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Cc: stable@vger.kernel.org
-Link: https://lore.kernel.org/r/20191217115527.74383-3-alexander.shishkin@linux.intel.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/hwtracing/intel_th/pci.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/hwtracing/intel_th/pci.c
-+++ b/drivers/hwtracing/intel_th/pci.c
-@@ -105,6 +105,11 @@ static const struct pci_device_id intel_
-               PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e),
-               .driver_data = (kernel_ulong_t)0,
-       },
-+      {
-+              /* Elkhart Lake */
-+              PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4b26),
-+              .driver_data = (kernel_ulong_t)&intel_th_2x,
-+      },
-       { 0 },
- };
- 

diff --git a/queue-4.9/series b/queue-4.9/series
index 0a82556b9ae8e1cf1cdd79e7e0905725cab8aed2..cad6410d7ac4a86782cf6e98c7645e61f4a4aab6 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -101,7 +101,5 @@ sctp-fully-initialize-v4-addr-in-some-functions.patch
 net-dst-force-4-byte-alignment-of-dst_metrics.patch
 usbip-fix-error-path-of-vhci_recv_ret_submit.patch
 usb-ehci-do-not-return-epipe-when-hub-is-disconnected.patch
-intel_th-pci-add-comet-lake-pch-v-support.patch
-intel_th-pci-add-elkhart-lake-soc-support.patch
 platform-x86-hp-wmi-make-buffer-for-hpwmi_feature2_query-128-bytes.patch
 staging-comedi-gsc_hpdi-check-dma_alloc_coherent-return-value.patch