aboutsummaryrefslogtreecommitdiffstats
path: root/queue-5.4
diff options
context:
space:
mode:
authorSasha Levin <sashal@kernel.org>2024-03-25 07:16:30 -0400
committerSasha Levin <sashal@kernel.org>2024-03-25 07:18:28 -0400
commit22282cbed13c65a64ae24eacc4eb0782e8003b1e (patch)
tree5bb263d3b060aaf0de4746610d944ad5c29536cd /queue-5.4
parent4028107dbbb6bf4b88c929ae020434d71cb7d6f8 (diff)
downloadstable-queue-22282cbed13c65a64ae24eacc4eb0782e8003b1e.tar.gz
Drop pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'queue-5.4')
-rw-r--r--queue-5.4/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch52
-rw-r--r--queue-5.4/series1
2 files changed, 0 insertions, 53 deletions
diff --git a/queue-5.4/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch b/queue-5.4/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch
deleted file mode 100644
index 8bd4c0b2c9..0000000000
--- a/queue-5.4/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e8f52dae02bfa3f9df767f93237290de6771ab6b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Feb 2024 14:16:34 +0100
-Subject: PCI/AER: Fix rootport attribute paths in ABI docs
-
-From: Johan Hovold <johan+linaro@kernel.org>
-
-[ Upstream commit 0e7d29a39a546161ea3a49e8e282a43212d7ff68 ]
-
-The 'aer_stats' directory never made it into the sixth and final revision
-of the series adding the sysfs AER attributes.
-
-Link: https://lore.kernel.org/r/20240202131635.11405-2-johan+linaro@kernel.org
-Link: https://lore.kernel.org/lkml/20180621184822.GB14136@bhelgaas-glaptop.roam.corp.google.com/
-Fixes: 12833017e581 ("PCI/AER: Add sysfs attributes for rootport cumulative stats")
-Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats
-index 3c9a8c4a25eb8..988724cc85182 100644
---- a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats
-+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats
-@@ -103,19 +103,19 @@ collectors) that are AER capable. These indicate the number of error messages as
- device, so these counters include them and are thus cumulative of all the error
- messages on the PCI hierarchy originating at that root port.
-
--What: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_cor
-+What: /sys/bus/pci/devices/<dev>/aer_rootport_total_err_cor
- Date: July 2018
- KernelVersion: 4.19.0
- Contact: linux-pci@vger.kernel.org, rajatja@google.com
- Description: Total number of ERR_COR messages reported to rootport.
-
--What: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_fatal
-+What: /sys/bus/pci/devices/<dev>/aer_rootport_total_err_fatal
- Date: July 2018
- KernelVersion: 4.19.0
- Contact: linux-pci@vger.kernel.org, rajatja@google.com
- Description: Total number of ERR_FATAL messages reported to rootport.
-
--What: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_nonfatal
-+What: /sys/bus/pci/devices/<dev>/aer_rootport_total_err_nonfatal
- Date: July 2018
- KernelVersion: 4.19.0
- Contact: linux-pci@vger.kernel.org, rajatja@google.com
---
-2.43.0
-
diff --git a/queue-5.4/series b/queue-5.4/series
index ed10f763bc..4f44d13e6d 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -97,7 +97,6 @@ pci-dpc-print-all-tlp-prefixes-not-just-the-first.patch
perf-record-fix-possible-incorrect-free-in-record__s.patch
drm-amd-display-fix-potential-null-pointer-dereferen.patch
perf-evsel-fix-duplicate-initialization-of-data-id-i.patch
-pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch
media-em28xx-annotate-unchecked-call-to-media_device.patch
media-v4l2-tpg-fix-some-memleaks-in-tpg_alloc.patch
media-v4l2-mem2mem-fix-a-memleak-in-v4l2_m2m_registe.patch