From: Greg Kroah-Hartman Date: Wed, 5 Oct 2022 11:31:20 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.4.217~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbacd1719420cf4e7328e37de3474c0218d6197c;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: docs-update-mediator-information-in-coc-docs.patch makefile.extrawarn-move-wcast-function-type-strict-to-w-1.patch --- diff --git a/queue-5.10/docs-update-mediator-information-in-coc-docs.patch b/queue-5.10/docs-update-mediator-information-in-coc-docs.patch new file mode 100644 index 00000000000..31781165148 --- /dev/null +++ b/queue-5.10/docs-update-mediator-information-in-coc-docs.patch @@ -0,0 +1,31 @@ +From 8bfdfa0d6b929ede7b6189e0e546ceb6a124d05d Mon Sep 17 00:00:00 2001 +From: Shuah Khan +Date: Thu, 1 Sep 2022 15:23:19 -0600 +Subject: docs: update mediator information in CoC docs + +From: Shuah Khan + +commit 8bfdfa0d6b929ede7b6189e0e546ceb6a124d05d upstream. + +Update mediator information in the CoC interpretation document. + +Signed-off-by: Shuah Khan +Link: https://lore.kernel.org/r/20220901212319.56644-1-skhan@linuxfoundation.org +Cc: stable@vger.kernel.org +Signed-off-by: Jonathan Corbet +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/process/code-of-conduct-interpretation.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/process/code-of-conduct-interpretation.rst ++++ b/Documentation/process/code-of-conduct-interpretation.rst +@@ -51,7 +51,7 @@ the Technical Advisory Board (TAB) or ot + uncertain how to handle situations that come up. It will not be + considered a violation report unless you want it to be. If you are + uncertain about approaching the TAB or any other maintainers, please +-reach out to our conflict mediator, Mishi Choudhary . ++reach out to our conflict mediator, Joanna Lee . + + In the end, "be kind to each other" is really what the end goal is for + everybody. We know everyone is human and we all fail at times, but the diff --git a/queue-5.10/makefile.extrawarn-move-wcast-function-type-strict-to-w-1.patch b/queue-5.10/makefile.extrawarn-move-wcast-function-type-strict-to-w-1.patch new file mode 100644 index 00000000000..00240b9c574 --- /dev/null +++ b/queue-5.10/makefile.extrawarn-move-wcast-function-type-strict-to-w-1.patch @@ -0,0 +1,39 @@ +From 2120635108b35ecad9c59c8b44f6cbdf4f98214e Mon Sep 17 00:00:00 2001 +From: Sami Tolvanen +Date: Fri, 30 Sep 2022 20:33:10 +0000 +Subject: Makefile.extrawarn: Move -Wcast-function-type-strict to W=1 + +From: Sami Tolvanen + +commit 2120635108b35ecad9c59c8b44f6cbdf4f98214e upstream. + +We enable -Wcast-function-type globally in the kernel to warn about +mismatching types in function pointer casts. Compilers currently +warn only about ABI incompability with this flag, but Clang 16 will +enable a stricter version of the check by default that checks for an +exact type match. This will be very noisy in the kernel, so disable +-Wcast-function-type-strict without W=1 until the new warnings have +been addressed. + +Cc: stable@vger.kernel.org +Link: https://reviews.llvm.org/D134831 +Link: https://github.com/ClangBuiltLinux/linux/issues/1724 +Suggested-by: Nathan Chancellor +Signed-off-by: Sami Tolvanen +Signed-off-by: Kees Cook +Link: https://lore.kernel.org/r/20220930203310.4010564-1-samitolvanen@google.com +Signed-off-by: Greg Kroah-Hartman +--- + scripts/Makefile.extrawarn | 1 + + 1 file changed, 1 insertion(+) + +--- a/scripts/Makefile.extrawarn ++++ b/scripts/Makefile.extrawarn +@@ -52,6 +52,7 @@ KBUILD_CFLAGS += -Wno-format-zero-length + KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast) + KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare + KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access) ++KBUILD_CFLAGS += $(call cc-disable-warning, cast-function-type-strict) + endif + + endif diff --git a/queue-5.10/series b/queue-5.10/series new file mode 100644 index 00000000000..3d6353b1535 --- /dev/null +++ b/queue-5.10/series @@ -0,0 +1,2 @@ +makefile.extrawarn-move-wcast-function-type-strict-to-w-1.patch +docs-update-mediator-information-in-coc-docs.patch