From dc91e7126fd789d7f5453b9ac8fa676d6a072526 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 2 Dec 2022 09:58:15 -0600 Subject: kernel-6.1.0-0.rc7.20221202gita4412fdd49dc.55 * Fri Dec 02 2022 Fedora Kernel Team [6.1.0-0.rc7.a4412fdd49dc.55] - Linux v6.1.0-0.rc7.a4412fdd49dc Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 1 + kernel-aarch64-rhel.config | 1 + kernel-armv7hl-debug-fedora.config | 1 + kernel-armv7hl-fedora.config | 1 + kernel-armv7hl-lpae-debug-fedora.config | 1 + kernel-armv7hl-lpae-fedora.config | 1 + kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 1 + kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 1 + kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 1 + kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-fedora.config | 1 + kernel-x86_64-rhel.config | 1 + kernel.spec | 9 ++++++--- sources | 6 +++--- 24 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 16c18b9f9..9de7b59a5 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 54 +RHEL_RELEASE = 55 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 0c84a107a..c947aaf60 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2427,6 +2427,7 @@ CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set CONFIG_FUJITSU_ERRATUM_010001=y # CONFIG_FUJITSU_ES is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index ed90aa699..e9b573c2c 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1859,6 +1859,7 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y CONFIG_FUJITSU_ERRATUM_010001=y # CONFIG_FUJITSU_ES is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 17adef3ed..3ca8bd449 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2411,6 +2411,7 @@ CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set CONFIG_FUJITSU_ERRATUM_010001=y # CONFIG_FUJITSU_ES is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 8b3d6306b..5e6720bc1 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1843,6 +1843,7 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y CONFIG_FUJITSU_ERRATUM_010001=y # CONFIG_FUJITSU_ES is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 364832186..e0924aa7a 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2416,6 +2416,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 897457e00..eb2639fc5 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2401,6 +2401,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 48298249a..5ced3d66f 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2370,6 +2370,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 4e6333703..70bfe0d66 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2355,6 +2355,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index db84cd874..f5ddfb86b 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1923,6 +1923,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTR_FIXUP_SELFTEST is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index faf718fd3..57e5f633f 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1687,6 +1687,7 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTR_FIXUP_SELFTEST is not set CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 4353a3dc4..b851f191f 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1906,6 +1906,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTR_FIXUP_SELFTEST is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 97825df3f..d8801bd43 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1671,6 +1671,7 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTR_FIXUP_SELFTEST is not set CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1669a9854..6c16277fb 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1922,6 +1922,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 9f69c7e8c..8f1140c09 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1691,6 +1691,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 7990204b6..5c4d928fc 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1905,6 +1905,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 26ffce6ed..ab06a8fba 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1675,6 +1675,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 24320a4fb..8cb1eec59 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1682,6 +1682,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_FTRACE_SYSCALLS=y CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index cb9e89c2b..61d9b21e2 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2083,6 +2083,7 @@ CONFIG_FTRACE=y CONFIG_FUJITSU_ES=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 0486fa18b..027957ca9 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1794,6 +1794,7 @@ CONFIG_FUJITSU_ERRATUM_010001=y CONFIG_FUJITSU_ES=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e72ab798c..fa7822334 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2066,6 +2066,7 @@ CONFIG_FTRACE=y CONFIG_FUJITSU_ES=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 8f0733f2c..29efe2b01 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1778,6 +1778,7 @@ CONFIG_FUJITSU_ERRATUM_010001=y CONFIG_FUJITSU_ES=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/kernel.spec b/kernel.spec index 375f06cdf..3dd82d6d4 100755 --- a/kernel.spec +++ b/kernel.spec @@ -123,13 +123,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.1.0 %define patchversion 6.1 -%define pkgrelease 0.rc7.20221201gitef4d3ea40565.54 +%define pkgrelease 0.rc7.20221202gita4412fdd49dc.55 %define kversion 6 -%define tarfile_release 6.1-rc7-103-gef4d3ea40565 +%define tarfile_release 6.1-rc7-123-ga4412fdd49dc # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20221201gitef4d3ea40565.54%{?buildid}%{?dist} +%define specrelease 0.rc7.20221202gita4412fdd49dc.55%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.0 @@ -3191,6 +3191,9 @@ fi # # %changelog +* Fri Dec 02 2022 Fedora Kernel Team [6.1.0-0.rc7.a4412fdd49dc.55] +- Linux v6.1.0-0.rc7.a4412fdd49dc + * Thu Dec 01 2022 Fedora Kernel Team [6.1.0-0.rc7.ef4d3ea40565.54] - Adjust path to compressed vmlinux kernel image for s390x (Justin M. Forbes) [2149273] - Fedora config updates for 6.1 (Justin M. Forbes) diff --git a/sources b/sources index 6562f9a2f..efbf5e777 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.1-rc7-103-gef4d3ea40565.tar.xz) = 2710adbbd87c748533350d08637803383ad32860a7a829c6adfaa07c6ef76c4a43d46b97ff96665ba23a7479e9f1f62b5aa1d530db83ecea0f49aac5e06b3663 -SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = b3dee1f82ccb9d2eea22cda4eea40a4605a3308acff3f15c32166b79a02a557af2881ff2c17817c9bf43b5cc4ab4cdc70dc92d32229e14aace0180536d7a5a58 -SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 52b7720d83f6c259dfca8ab29ff51f72b817a54bf93aaf9beabb968c5e7d9f5de9f8542f2675a80c737be2b98d9872480e464a7ee4bd189f063b3a0004296b27 +SHA512 (linux-6.1-rc7-123-ga4412fdd49dc.tar.xz) = f6cdc2dfd177c369f22d0a1159d24cabe5e5dec5824e2300fe964d42a85049db7663cfb78ed2ccc34dc94ad0981c71ce097a2bd6908aac47c92076b522ce6f9b +SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 98bd27a85f0526aefaba936b09f5a1d41068d33f940865e7904cc3c6b07ae9ab3135893a2b989ea7a5c3c410a8b150e43348d845b549a3c72e6ce8eb077f2aae +SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = d6b5429f1d3734363a698bc07be4df7190a288228913de89f97bf7bbf1f7aa0d6b5e31d0c3723a87e8d162d1b496a306592cdf6c6d29ba3e1fbbfb63f7ca2b3d -- cgit