From: Sasha Levin Date: Mon, 25 Mar 2024 11:16:30 +0000 (-0400) Subject: Drop pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch X-Git-Tag: v6.8.2~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22282cbed13c65a64ae24eacc4eb0782e8003b1e;p=thirdparty%2Fkernel%2Fstable-queue.git Drop pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch b/queue-4.19/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch deleted file mode 100644 index b23f0885ca4..00000000000 --- a/queue-4.19/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5493b56b9c7ab348581272d7f31bee66032b34c4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Feb 2024 14:16:34 +0100 -Subject: PCI/AER: Fix rootport attribute paths in ABI docs - -From: Johan Hovold - -[ 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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Sasha Levin ---- - 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 ff229d71961c3..afe7bdf4f9ad0 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//aer_stats/aer_rootport_total_err_cor -+What: /sys/bus/pci/devices//aer_rootport_total_err_cor - Date: July 2018 - Kernel Version: 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//aer_stats/aer_rootport_total_err_fatal -+What: /sys/bus/pci/devices//aer_rootport_total_err_fatal - Date: July 2018 - Kernel Version: 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//aer_stats/aer_rootport_total_err_nonfatal -+What: /sys/bus/pci/devices//aer_rootport_total_err_nonfatal - Date: July 2018 - Kernel Version: 4.19.0 - Contact: linux-pci@vger.kernel.org, rajatja@google.com --- -2.43.0 - diff --git a/queue-4.19/series b/queue-4.19/series index e8d6f616e57..3f7848c3a18 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -75,7 +75,6 @@ drm-rockchip-lvds-do-not-print-scary-message-when-pr.patch media-tc358743-register-v4l2-async-device-only-after.patch perf-evsel-fix-duplicate-initialization-of-data-id-i.patch abi-sysfs-bus-pci-devices-aer_stats-uses-an-invalid-.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 diff --git a/queue-5.10/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch b/queue-5.10/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch deleted file mode 100644 index d54cc7b286b..00000000000 --- a/queue-5.10/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f4be41356780b1c9ccf78b5e533bcf8ce69e5060 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Feb 2024 14:16:34 +0100 -Subject: PCI/AER: Fix rootport attribute paths in ABI docs - -From: Johan Hovold - -[ 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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Sasha Levin ---- - 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 860db53037a58..24087d5fd417a 100644 ---- a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -@@ -100,19 +100,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//aer_stats/aer_rootport_total_err_cor -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_fatal -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_nonfatal -+What: /sys/bus/pci/devices//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.10/series b/queue-5.10/series index d576e5f6260..0b82cb5a85b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -128,7 +128,6 @@ hid-lenovo-add-middleclick_workaround-sysfs-knob-for.patch drm-amd-display-fix-a-potential-buffer-overflow-in-d.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 diff --git a/queue-5.15/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch b/queue-5.15/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch deleted file mode 100644 index 4abc38575d9..00000000000 --- a/queue-5.15/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1e5a27c6999cf6f388fc43b3bb47b624915d458b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Feb 2024 14:16:34 +0100 -Subject: PCI/AER: Fix rootport attribute paths in ABI docs - -From: Johan Hovold - -[ 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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Sasha Levin ---- - 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 860db53037a58..24087d5fd417a 100644 ---- a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -@@ -100,19 +100,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//aer_stats/aer_rootport_total_err_cor -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_fatal -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_nonfatal -+What: /sys/bus/pci/devices//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.15/series b/queue-5.15/series index c244ab947bb..a6a3e6e2ebe 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -176,7 +176,6 @@ hid-lenovo-add-middleclick_workaround-sysfs-knob-for.patch drm-amd-display-fix-a-potential-buffer-overflow-in-d.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 clk-meson-add-missing-clocks-to-axg_clk_regmaps.patch media-em28xx-annotate-unchecked-call-to-media_device.patch media-v4l2-tpg-fix-some-memleaks-in-tpg_alloc.patch 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 8bd4c0b2c92..00000000000 --- 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 -Date: Fri, 2 Feb 2024 14:16:34 +0100 -Subject: PCI/AER: Fix rootport attribute paths in ABI docs - -From: Johan Hovold - -[ 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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Sasha Levin ---- - 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//aer_stats/aer_rootport_total_err_cor -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_fatal -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_nonfatal -+What: /sys/bus/pci/devices//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 ed10f763bc3..4f44d13e6df 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 diff --git a/queue-6.1/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch b/queue-6.1/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch deleted file mode 100644 index 720507d705c..00000000000 --- a/queue-6.1/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 03d7f19ce5524ff6fd2d72fbf32e04da2692ea6b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Feb 2024 14:16:34 +0100 -Subject: PCI/AER: Fix rootport attribute paths in ABI docs - -From: Johan Hovold - -[ 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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Sasha Levin ---- - 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 860db53037a58..24087d5fd417a 100644 ---- a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -@@ -100,19 +100,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//aer_stats/aer_rootport_total_err_cor -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_fatal -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_nonfatal -+What: /sys/bus/pci/devices//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-6.1/series b/queue-6.1/series index 0ae5faf54ec..86180deabfb 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -259,7 +259,6 @@ pinctrl-renesas-r8a779g0-add-audio-ssi-pins-groups-a.patch pinctrl-renesas-r8a779g0-add-missing-scif_clk2-pin-g.patch clk-samsung-exynos850-propagate-spi-ipclk-rate-chang.patch perf-evsel-fix-duplicate-initialization-of-data-id-i.patch -pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch clk-meson-add-missing-clocks-to-axg_clk_regmaps.patch media-em28xx-annotate-unchecked-call-to-media_device.patch media-v4l2-tpg-fix-some-memleaks-in-tpg_alloc.patch diff --git a/queue-6.6/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch b/queue-6.6/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch deleted file mode 100644 index d05ebff2f07..00000000000 --- a/queue-6.6/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 10859172756d13acd610a115cc43dda63fd913b2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Feb 2024 14:16:34 +0100 -Subject: PCI/AER: Fix rootport attribute paths in ABI docs - -From: Johan Hovold - -[ 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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Sasha Levin ---- - 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 860db53037a58..24087d5fd417a 100644 ---- a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -@@ -100,19 +100,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//aer_stats/aer_rootport_total_err_cor -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_fatal -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_nonfatal -+What: /sys/bus/pci/devices//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-6.6/series b/queue-6.6/series index 331de7b0db7..3815d2895ba 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -375,7 +375,6 @@ pinctrl-renesas-r8a779g0-add-missing-scif_clk2-pin-g.patch clk-samsung-exynos850-propagate-spi-ipclk-rate-chang.patch media-v4l2-cci-print-leading-0-on-error.patch perf-evsel-fix-duplicate-initialization-of-data-id-i.patch -pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch perf-bpf-clean-up-the-generated-copied-vmlinux.h.patch clk-meson-add-missing-clocks-to-axg_clk_regmaps.patch media-em28xx-annotate-unchecked-call-to-media_device.patch diff --git a/queue-6.7/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch b/queue-6.7/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch deleted file mode 100644 index 4aac53aef71..00000000000 --- a/queue-6.7/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 70def505c2ba9909e477afe63b626d36960b1228 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Feb 2024 14:16:34 +0100 -Subject: PCI/AER: Fix rootport attribute paths in ABI docs - -From: Johan Hovold - -[ 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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Sasha Levin ---- - 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 860db53037a58..24087d5fd417a 100644 ---- a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -@@ -100,19 +100,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//aer_stats/aer_rootport_total_err_cor -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_fatal -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_nonfatal -+What: /sys/bus/pci/devices//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-6.7/series b/queue-6.7/series index 6da57fdd246..e8edd2f7e23 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -422,7 +422,6 @@ pinctrl-renesas-r8a779g0-add-missing-scif_clk2-pin-g.patch clk-samsung-exynos850-propagate-spi-ipclk-rate-chang.patch media-v4l2-cci-print-leading-0-on-error.patch perf-evsel-fix-duplicate-initialization-of-data-id-i.patch -pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch perf-bpf-clean-up-the-generated-copied-vmlinux.h.patch clk-meson-add-missing-clocks-to-axg_clk_regmaps.patch media-em28xx-annotate-unchecked-call-to-media_device.patch diff --git a/queue-6.8/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch b/queue-6.8/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch deleted file mode 100644 index 44211af17e0..00000000000 --- a/queue-6.8/pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From dc836c7d0e6415b21e332910e787e9ea76466480 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 2 Feb 2024 14:16:34 +0100 -Subject: PCI/AER: Fix rootport attribute paths in ABI docs - -From: Johan Hovold - -[ 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 -Signed-off-by: Bjorn Helgaas -Signed-off-by: Sasha Levin ---- - 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 860db53037a58..24087d5fd417a 100644 ---- a/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats -@@ -100,19 +100,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//aer_stats/aer_rootport_total_err_cor -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_fatal -+What: /sys/bus/pci/devices//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//aer_stats/aer_rootport_total_err_nonfatal -+What: /sys/bus/pci/devices//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-6.8/series b/queue-6.8/series index fb3674777d6..6a63834cc3b 100644 --- a/queue-6.8/series +++ b/queue-6.8/series @@ -388,7 +388,6 @@ pinctrl-renesas-r8a779g0-add-missing-scif_clk2-pin-g.patch clk-samsung-exynos850-propagate-spi-ipclk-rate-chang.patch media-v4l2-cci-print-leading-0-on-error.patch perf-evsel-fix-duplicate-initialization-of-data-id-i.patch -pci-aer-fix-rootport-attribute-paths-in-abi-docs.patch perf-bpf-clean-up-the-generated-copied-vmlinux.h.patch clk-meson-add-missing-clocks-to-axg_clk_regmaps.patch media-em28xx-annotate-unchecked-call-to-media_device.patch