5.10-stable patches

added patches:
	docs-futex-fix-kernel-doc-references-after-code-split-up-preparation.patch
	mips-define-runtime_discard_exit-in-ld-script.patch

diff --git a/queue-5.10/docs-futex-fix-kernel-doc-references-after-code-split-up-preparation.patch b/queue-5.10/docs-futex-fix-kernel-doc-references-after-code-split-up-preparation.patch
new file mode 100644 (file)
index 0000000..14d49ae
--- /dev/null
+++ b/queue-5.10/docs-futex-fix-kernel-doc-references-after-code-split-up-preparation.patch
@@ -0,0 +1,58 @@
+From carnil@debian.org  Sun Apr 23 12:27:47 2023
+From: Salvatore Bonaccorso <carnil@debian.org>
+Date: Sat, 22 Apr 2023 00:17:42 +0200
+Subject: [PATCH v2 stable-5.10.y stable-5.15.y] docs: futex: Fix kernel-doc references after code split-up preparation
+To: stable <stable@vger.kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Sasha Levin <sashal@kernel.org>
+Cc: "Peter Zijlstra" <peterz@infradead.org>, "Thomas Gleixner" <tglx@linutronix.de>, "André Almeida" <andrealmeid@collabora.com>, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, "Jonathan Corbet" <corbet@lwn.net>, "Salvatore Bonaccorso" <carnil@debian.org>
+Message-ID: <20230421221741.1827866-1-carnil@debian.org>
+
+From: Salvatore Bonaccorso <carnil@debian.org>
+
+In upstream commit 77e52ae35463 ("futex: Move to kernel/futex/") the
+futex code from kernel/futex.c was moved into kernel/futex/core.c in
+preparation of the split-up of the implementation in various files.
+
+Point kernel-doc references to the new files as otherwise the
+documentation shows errors on build:
+
+    [...]
+    Error: Cannot open file ./kernel/futex.c
+    Error: Cannot open file ./kernel/futex.c
+    [...]
+    WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -sphinx-version 3.4.3 -internal ./kernel/futex.c' failed with return code 2
+
+There is no direct upstream commit for this change. It is made in
+analogy to commit bc67f1c454fb ("docs: futex: Fix kernel-doc
+references") applied as consequence of the restructuring of the futex
+code.
+
+Fixes: 77e52ae35463 ("futex: Move to kernel/futex/")
+Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/kernel-hacking/locking.rst                    |    2 +-
+ Documentation/translations/it_IT/kernel-hacking/locking.rst |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/Documentation/kernel-hacking/locking.rst
++++ b/Documentation/kernel-hacking/locking.rst
+@@ -1358,7 +1358,7 @@ Mutex API reference
+ Futex API reference
+ ===================
+ 
+-.. kernel-doc:: kernel/futex.c
++.. kernel-doc:: kernel/futex/core.c
+    :internal:
+ 
+ Further reading
+--- a/Documentation/translations/it_IT/kernel-hacking/locking.rst
++++ b/Documentation/translations/it_IT/kernel-hacking/locking.rst
+@@ -1400,7 +1400,7 @@ Riferimento per l'API dei Mutex
+ Riferimento per l'API dei Futex
+ ===============================
+ 
+-.. kernel-doc:: kernel/futex.c
++.. kernel-doc:: kernel/futex/core.c
+    :internal:
+ 
+ Approfondimenti

diff --git a/queue-5.10/mips-define-runtime_discard_exit-in-ld-script.patch b/queue-5.10/mips-define-runtime_discard_exit-in-ld-script.patch
new file mode 100644 (file)
index 0000000..779b674
--- /dev/null
+++ b/queue-5.10/mips-define-runtime_discard_exit-in-ld-script.patch
@@ -0,0 +1,35 @@
+From 6dcbd0a69c84a8ae7a442840a8cf6b1379dc8f16 Mon Sep 17 00:00:00 2001
+From: Jiaxun Yang <jiaxun.yang@flygoat.com>
+Date: Sat, 8 Apr 2023 21:33:48 +0100
+Subject: MIPS: Define RUNTIME_DISCARD_EXIT in LD script
+
+From: Jiaxun Yang <jiaxun.yang@flygoat.com>
+
+commit 6dcbd0a69c84a8ae7a442840a8cf6b1379dc8f16 upstream.
+
+MIPS's exit sections are discarded at runtime as well.
+
+Fixes link error:
+`.exit.text' referenced in section `__jump_table' of fs/fuse/inode.o:
+defined in discarded section `.exit.text' of fs/fuse/inode.o
+
+Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv")
+Reported-by: "kernelci.org bot" <bot@kernelci.org>
+Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/mips/kernel/vmlinux.lds.S |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/mips/kernel/vmlinux.lds.S
++++ b/arch/mips/kernel/vmlinux.lds.S
+@@ -15,6 +15,8 @@
+ #define EMITS_PT_NOTE
+ #endif
+ 
++#define RUNTIME_DISCARD_EXIT
++
+ #include <asm-generic/vmlinux.lds.h>
+ 
+ #undef mips

diff --git a/queue-5.10/series b/queue-5.10/series
index c727640ca256dcb280ac09e542c51501a1f4dbc0..6366a591e2363deb3c9895dd3a1c0890db2df6ff 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -43,3 +43,5 @@ sched-fair-detect-capacity-inversion.patch
 sched-fair-consider-capacity-inversion-in-util_fits_cpu.patch
 sched-uclamp-fix-a-uninitialized-variable-warnings.patch
 sched-fair-fixes-for-capacity-inversion-detection.patch
+mips-define-runtime_discard_exit-in-ld-script.patch
+docs-futex-fix-kernel-doc-references-after-code-split-up-preparation.patch