From: Greg Kroah-Hartman Date: Mon, 11 Nov 2019 07:13:56 +0000 (+0100) Subject: drop queue-4.9/intel_th-pci-add-comet-lake-pch-support.patch as it broke the build X-Git-Tag: v4.4.201~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3700e0b2af8a3f0d3dddbd95d19037c4edfb0fe8;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.9/intel_th-pci-add-comet-lake-pch-support.patch as it broke the build --- diff --git a/queue-4.9/intel_th-pci-add-comet-lake-pch-support.patch b/queue-4.9/intel_th-pci-add-comet-lake-pch-support.patch deleted file mode 100644 index a78d5e643b0..00000000000 --- a/queue-4.9/intel_th-pci-add-comet-lake-pch-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3adbb5718dd5264666ddbc2b9b43799d292e9cb6 Mon Sep 17 00:00:00 2001 -From: Alexander Shishkin -Date: Mon, 28 Oct 2019 09:06:50 +0200 -Subject: intel_th: pci: Add Comet Lake PCH support - -From: Alexander Shishkin - -commit 3adbb5718dd5264666ddbc2b9b43799d292e9cb6 upstream. - -This adds support for Intel TH on Comet Lake PCH. - -Signed-off-by: Alexander Shishkin -Reviewed-by: Andy Shevchenko -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20191028070651.9770-7-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 -@@ -96,6 +96,11 @@ static const struct pci_device_id intel_ - .driver_data = (kernel_ulong_t)0, - }, - { -+ /* Comet Lake PCH */ -+ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x06a6), -+ .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/series b/queue-4.9/series index 03a6a3edd90..9ee0013c358 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -19,7 +19,6 @@ ceph-fix-use-after-free-in-__ceph_remove_cap.patch iio-imu-adis16480-make-sure-provided-frequency-is-positive.patch netfilter-nf_tables-align-nft_expr-private-data-to-64-bit.patch netfilter-ipset-fix-an-error-code-in-ip_set_sockfn_get.patch -intel_th-pci-add-comet-lake-pch-support.patch can-usb_8dev-fix-use-after-free-on-disconnect.patch can-c_can-c_can_poll-only-read-status-register-after-status-irq.patch can-peak_usb-fix-a-potential-out-of-sync-while-decoding-packets.patch