From: Greg Kroah-Hartman Date: Tue, 23 Jul 2019 12:15:02 +0000 (+0200) Subject: drop 4.9 patch that broke the build X-Git-Tag: v5.2.3~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b72f464f66bc8e26a99b494153c81635745f1a39;p=thirdparty%2Fkernel%2Fstable-queue.git drop 4.9 patch that broke the build --- diff --git a/queue-4.9/intel_th-pci-add-ice-lake-nnpi-support.patch b/queue-4.9/intel_th-pci-add-ice-lake-nnpi-support.patch deleted file mode 100644 index baf9bd0e550..00000000000 --- a/queue-4.9/intel_th-pci-add-ice-lake-nnpi-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4aa5aed2b6f267592705a526f57518a5d715b769 Mon Sep 17 00:00:00 2001 -From: Alexander Shishkin -Date: Fri, 21 Jun 2019 19:19:30 +0300 -Subject: intel_th: pci: Add Ice Lake NNPI support - -From: Alexander Shishkin - -commit 4aa5aed2b6f267592705a526f57518a5d715b769 upstream. - -This adds Ice Lake NNPI support to the Intel(R) Trace Hub. - -Signed-off-by: Alexander Shishkin -Reviewed-by: Andy Shevchenko -Cc: stable -Link: https://lore.kernel.org/r/20190621161930.60785-5-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 -@@ -100,6 +100,11 @@ static const struct pci_device_id intel_ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e), - .driver_data = (kernel_ulong_t)0, - }, -+ { -+ /* Ice Lake NNPI */ -+ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x45c5), -+ .driver_data = (kernel_ulong_t)&intel_th_2x, -+ }, - { 0 }, - }; - diff --git a/queue-4.9/series b/queue-4.9/series index 9c242315eb7..bbdcf87d2ec 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -102,7 +102,6 @@ fs-proc-proc_sysctl.c-fix-the-default-values-of-i_uid-i_gid-on-proc-sys-inodes.p drm-nouveau-i2c-enable-i2c-pads-busses-during-preinit.patch padata-use-smp_mb-in-padata_reorder-to-avoid-orphaned-padata-jobs.patch 9p-virtio-add-cleanup-path-in-p9_virtio_init.patch -intel_th-pci-add-ice-lake-nnpi-support.patch pci-do-not-poll-for-pme-if-the-device-is-in-d3cold.patch btrfs-add-missing-inode-version-ctime-and-mtime-updates-when-punching-hole.patch libnvdimm-pfn-fix-fsdax-mode-namespace-info-block-zero-fields.patch