From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 18 Aug 2025 09:20:09 +0000 (+0200)
Subject: fix up some changelog issues that quilt has :(
X-Git-Tag: v6.12.43~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c22b65cdbd423372dde1b86c2892d3a232c3440;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up some changelog issues that quilt has :(
---

diff --git a/queue-6.15/sphinx-kernel_abi-fix-performance-regression-with-o-.patch b/queue-6.15/sphinx-kernel_abi-fix-performance-regression-with-o-.patch
index 1b595560a2..aa8ab347d1 100644
--- a/queue-6.15/sphinx-kernel_abi-fix-performance-regression-with-o-.patch
+++ b/queue-6.15/sphinx-kernel_abi-fix-performance-regression-with-o-.patch
@@ -27,27 +27,27 @@ $ time make O=/tmp/foo SPHINXDIRS=admin-guide htmldocs
 To get the root cause of the problem (ABI files reported as changed),
 I used this changeset:
 
-	diff --git a/Documentation/conf.py b/Documentation/conf.py
-	index e8766e689c1b..ab486623bd8b 100644
-	--- a/Documentation/conf.py
-	+++ b/Documentation/conf.py
-	@@ -571,3 +571,16 @@ def setup(app):
-	     """Patterns need to be updated at init time on older Sphinx versions"""
-
-	     app.connect('config-inited', update_patterns)
-	+    app.connect('env-get-outdated', on_outdated)
-	+
-	+def on_outdated(app, env, added, changed, removed):
-	+    """Track cache outdated due to added/changed/removed files"""
-	+    print("\n[OUTDATED]")
-	+    print(f"Added: {added}")
-	+    print(f"Changed: {changed}")
-	+    print(f"Removed: {removed}")
-	+    print(f"All docs count: {len(env.all_docs)}")
-	+    print(f"Found docs count: {len(env.found_docs)}")
-	+
-	+    # Just return what we have
-	+    return added | changed | removed
+#	diff --git a/Documentation/conf.py b/Documentation/conf.py
+#	index e8766e689c1b..ab486623bd8b 100644
+#	--- a/Documentation/conf.py
+#	+++ b/Documentation/conf.py
+#	@@ -571,3 +571,16 @@ def setup(app):
+#	     """Patterns need to be updated at init time on older Sphinx versions"""
+#
+#	     app.connect('config-inited', update_patterns)
+#	+    app.connect('env-get-outdated', on_outdated)
+#	+
+#	+def on_outdated(app, env, added, changed, removed):
+#	+    """Track cache outdated due to added/changed/removed files"""
+#	+    print("\n[OUTDATED]")
+#	+    print(f"Added: {added}")
+#	+    print(f"Changed: {changed}")
+#	+    print(f"Removed: {removed}")
+#	+    print(f"All docs count: {len(env.all_docs)}")
+#	+    print(f"Found docs count: {len(env.found_docs)}")
+#	+
+#	+    # Just return what we have
+#	+    return added | changed | removed
 
 Reported-by: Akira Yokosawa <akiyks@gmail.com>
 Closes: https://lore.kernel.org/linux-doc/c174f7c5-ec21-4eae-b1c3-f643cca90d9d@gmail.com/
diff --git a/queue-6.16/sphinx-kernel_abi-fix-performance-regression-with-o-.patch b/queue-6.16/sphinx-kernel_abi-fix-performance-regression-with-o-.patch
index 09cf44e4e1..9a23d0ebeb 100644
--- a/queue-6.16/sphinx-kernel_abi-fix-performance-regression-with-o-.patch
+++ b/queue-6.16/sphinx-kernel_abi-fix-performance-regression-with-o-.patch
@@ -27,27 +27,27 @@ $ time make O=/tmp/foo SPHINXDIRS=admin-guide htmldocs
 To get the root cause of the problem (ABI files reported as changed),
 I used this changeset:
 
-	diff --git a/Documentation/conf.py b/Documentation/conf.py
-	index e8766e689c1b..ab486623bd8b 100644
-	--- a/Documentation/conf.py
-	+++ b/Documentation/conf.py
-	@@ -571,3 +571,16 @@ def setup(app):
-	     """Patterns need to be updated at init time on older Sphinx versions"""
-
-	     app.connect('config-inited', update_patterns)
-	+    app.connect('env-get-outdated', on_outdated)
-	+
-	+def on_outdated(app, env, added, changed, removed):
-	+    """Track cache outdated due to added/changed/removed files"""
-	+    print("\n[OUTDATED]")
-	+    print(f"Added: {added}")
-	+    print(f"Changed: {changed}")
-	+    print(f"Removed: {removed}")
-	+    print(f"All docs count: {len(env.all_docs)}")
-	+    print(f"Found docs count: {len(env.found_docs)}")
-	+
-	+    # Just return what we have
-	+    return added | changed | removed
+#	diff --git a/Documentation/conf.py b/Documentation/conf.py
+#	index e8766e689c1b..ab486623bd8b 100644
+#	--- a/Documentation/conf.py
+#	+++ b/Documentation/conf.py
+#	@@ -571,3 +571,16 @@ def setup(app):
+#	     """Patterns need to be updated at init time on older Sphinx versions"""
+#
+#	     app.connect('config-inited', update_patterns)
+#	+    app.connect('env-get-outdated', on_outdated)
+#	+
+#	+def on_outdated(app, env, added, changed, removed):
+#	+    """Track cache outdated due to added/changed/removed files"""
+#	+    print("\n[OUTDATED]")
+#	+    print(f"Added: {added}")
+#	+    print(f"Changed: {changed}")
+#	+    print(f"Removed: {removed}")
+#	+    print(f"All docs count: {len(env.all_docs)}")
+#	+    print(f"Found docs count: {len(env.found_docs)}")
+#	+
+#	+    # Just return what we have
+#	+    return added | changed | removed
 
 Reported-by: Akira Yokosawa <akiyks@gmail.com>
 Closes: https://lore.kernel.org/linux-doc/c174f7c5-ec21-4eae-b1c3-f643cca90d9d@gmail.com/