From: Greg Kroah-Hartman Date: Sun, 29 Dec 2019 15:14:09 +0000 (+0100) Subject: drop 4.4 intel_th patches X-Git-Tag: v4.14.161~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c00495d0c9869881763257a1d9e7d7b5eb3e519;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.4 intel_th patches --- diff --git a/queue-4.4/intel_th-pci-add-comet-lake-pch-v-support.patch b/queue-4.4/intel_th-pci-add-comet-lake-pch-v-support.patch deleted file mode 100644 index 978478ebdcb..00000000000 --- a/queue-4.4/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 -Date: Tue, 17 Dec 2019 13:55:24 +0200 -Subject: intel_th: pci: Add Comet Lake PCH-V support - -From: Alexander Shishkin - -commit e4de2a5d51f97a6e720a1c0911f93e2d8c2f1c08 upstream. - -This adds Intel(R) Trace Hub PCI ID for Comet Lake PCH-V. - -Signed-off-by: Alexander Shishkin -Reviewed-by: Andy Shevchenko -Cc: -Link: https://lore.kernel.org/r/20191217115527.74383-2-alexander.shishkin@linux.intel.com -Signed-off-by: Greg Kroah-Hartman - ---- - 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 -@@ -83,6 +83,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.4/intel_th-pci-add-elkhart-lake-soc-support.patch b/queue-4.4/intel_th-pci-add-elkhart-lake-soc-support.patch deleted file mode 100644 index 9c793a56523..00000000000 --- a/queue-4.4/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 -Date: Tue, 17 Dec 2019 13:55:25 +0200 -Subject: intel_th: pci: Add Elkhart Lake SOC support - -From: Alexander Shishkin - -commit 88385866bab8d5e18c7f45d1023052c783572e03 upstream. - -This adds support for Intel Trace Hub in Elkhart Lake. - -Signed-off-by: Alexander Shishkin -Reviewed-by: Andy Shevchenko -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 - ---- - 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 -@@ -92,6 +92,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.4/series b/queue-4.4/series index 0129d72a418..87ec4488cfb 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -81,7 +81,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