From 036a7ad18b69f386bfc85efe53d41e0478fbc897 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 19 Oct 2022 10:55:28 -0500 Subject: kernel-6.1.0-0.rc1.20221019gitaae703b02f92.17 * Wed Oct 19 2022 Fedora Kernel Team [6.1.0-0.rc1.aae703b02f92.17] - perf tools: Fix man page build wrt perf-arm-coresight.txt (Adrian Hunter) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel-aarch64-debug-rhel.config | 4 +++- kernel-aarch64-rhel.config | 4 +++- kernel-ppc64le-debug-rhel.config | 4 +++- kernel-ppc64le-rhel.config | 4 +++- kernel-s390x-debug-rhel.config | 4 +++- kernel-s390x-rhel.config | 4 +++- kernel-s390x-zfcpdump-rhel.config | 4 +++- kernel-x86_64-debug-rhel.config | 4 +++- kernel-x86_64-rhel.config | 4 +++- kernel.spec | 22 ++++++++++++++++------ parallel_xz.sh | 26 -------------------------- sources | 6 +++--- 14 files changed, 49 insertions(+), 47 deletions(-) delete mode 100755 parallel_xz.sh diff --git a/Makefile.rhelver b/Makefile.rhelver index 6f3deb6db..d93ab4b92 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 = 16 +RHEL_RELEASE = 17 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index e55f4b5d3..6fae95dfc 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/92d99faf46b59fb16843b5bb06fae793419f60f1 - 92d99faf46b59fb16843b5bb06fae793419f60f1 perf tools: Fix man page build wrt perf-arm-coresight.txt +"https://gitlab.com/cki-project/kernel-ark/-/commit"/8b1b0f775cff7f5dc36cc1edf61e3e3971a25059 + 8b1b0f775cff7f5dc36cc1edf61e3e3971a25059 perf tools: Fix man page build wrt perf-arm-coresight.txt "https://gitlab.com/cki-project/kernel-ark/-/commit"/a5465769aab281eaccf26b6b2c1659e26de74074 a5465769aab281eaccf26b6b2c1659e26de74074 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 43c95aae4..f2d39ab22 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3027,7 +3027,9 @@ CONFIG_LOOPBACK_TARGET=m # CONFIG_LPC_ICH is not set # CONFIG_LP_CONSOLE is not set # CONFIG_LPC_SCH is not set -# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=65535 diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 2fd5b5fb6..dce320bc3 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3006,7 +3006,9 @@ CONFIG_LOOPBACK_TARGET=m # CONFIG_LPC_ICH is not set # CONFIG_LP_CONSOLE is not set # CONFIG_LPC_SCH is not set -# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=65535 diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index dd9818780..557f634fb 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2850,7 +2850,9 @@ CONFIG_LPARCFG=y # CONFIG_LPC_ICH is not set # CONFIG_LP_CONSOLE is not set # CONFIG_LPC_SCH is not set -# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=65535 diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 7bb2e81b0..1a28ef5cb 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2830,7 +2830,9 @@ CONFIG_LPARCFG=y # CONFIG_LPC_ICH is not set # CONFIG_LP_CONSOLE is not set # CONFIG_LPC_SCH is not set -# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=65535 diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index b1d401aa0..2634e6a81 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2828,7 +2828,9 @@ CONFIG_LOOPBACK_TARGET=m # CONFIG_LPC_ICH is not set # CONFIG_LP_CONSOLE is not set # CONFIG_LPC_SCH is not set -# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN=y # CONFIG_LSI_ET1011C_PHY is not set CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=65535 diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 261b4cfeb..68828fcbe 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2808,7 +2808,9 @@ CONFIG_LOOPBACK_TARGET=m # CONFIG_LPC_ICH is not set # CONFIG_LP_CONSOLE is not set # CONFIG_LPC_SCH is not set -# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN=y # CONFIG_LSI_ET1011C_PHY is not set CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=65535 diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ca4bf82d2..dd0ef74b3 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2820,7 +2820,9 @@ CONFIG_LOOPBACK_TARGET=y # CONFIG_LPC_ICH is not set # CONFIG_LP_CONSOLE is not set # CONFIG_LPC_SCH is not set -# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN=y # CONFIG_LSI_ET1011C_PHY is not set CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=65535 diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index b3d442dfd..d724db396 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3010,7 +3010,9 @@ CONFIG_LOOPBACK_TARGET=m CONFIG_LPC_ICH=m # CONFIG_LP_CONSOLE is not set CONFIG_LPC_SCH=m -# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=65535 diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 74e76eaf2..2853059a6 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2990,7 +2990,9 @@ CONFIG_LOOPBACK_TARGET=m CONFIG_LPC_ICH=m # CONFIG_LP_CONSOLE is not set CONFIG_LPC_SCH=m -# CONFIG_LRU_GEN is not set +# CONFIG_LRU_GEN_ENABLED is not set +# CONFIG_LRU_GEN_STATS is not set +CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" CONFIG_LSM_MMAP_MIN_ADDR=65535 diff --git a/kernel.spec b/kernel.spec index 480121cef..21a4f908b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -90,7 +90,6 @@ Summary: The Linux kernel %if %{zipmodules} %global zipsed -e 's/\.ko$/\.ko.xz/' -# for parallel xz processes, replace with 1 to go back to single process %endif %if 0%{?fedora} @@ -124,13 +123,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.1.0 %define patchversion 6.1 -%define pkgrelease 0.rc1.20221018gitbb1a1146467a.16 +%define pkgrelease 0.rc1.20221019gitaae703b02f92.17 %define kversion 6 -%define tarfile_release 6.1-rc1-10-gbb1a1146467a +%define tarfile_release 6.1-rc1-25-gaae703b02f92 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20221018gitbb1a1146467a.16%{?buildid}%{?dist} +%define specrelease 0.rc1.20221019gitaae703b02f92.17%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.0 @@ -760,7 +759,6 @@ Source13: redhatsecureboot003.cer Source20: mod-denylist.sh Source21: mod-sign.sh -Source22: parallel_xz.sh %define modsign_cmd %{SOURCE21} @@ -1526,6 +1524,13 @@ done %endif %endif +# Adjust FIPS module name for RHEL +%if 0%{?rhel} +for i in *.config; do + sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API"/' $i +done +%endif + cp %{SOURCE81} . OPTS="" %if %{with_configchecks} @@ -3185,9 +3190,14 @@ fi # # %changelog -* Tue Oct 18 2022 Fedora Kernel Team [6.1.0-0.rc1.bb1a1146467a.16] +* Wed Oct 19 2022 Fedora Kernel Team [6.1.0-0.rc1.aae703b02f92.17] - perf tools: Fix man page build wrt perf-arm-coresight.txt (Adrian Hunter) + +* Wed Oct 19 2022 Fedora Kernel Team [6.1.0-0.rc1.aae703b02f92.16] +- Adjust FIPS module name in RHEL (Vladis Dronov) - spec: prevent git apply from searching for the .git directory (Ondrej Mosnacek) +- redhat: Remove parallel_xz.sh (Prarit Bhargava) +- Linux v6.1.0-0.rc1.aae703b02f92 * Tue Oct 18 2022 Fedora Kernel Team [6.1.0-0.rc1.bb1a1146467a.15] - Linux v6.1.0-0.rc1.bb1a1146467a diff --git a/parallel_xz.sh b/parallel_xz.sh deleted file mode 100755 index f1b6cdd15..000000000 --- a/parallel_xz.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Reads filenames on stdin, xz-compresses each in place. -# Not optimal for "compress relatively few, large files" scenario! - -# How many xz's to run in parallel: -procgroup="" -while test "$#" != 0; do - # Get it from -jNUM - N="${1#-j}" - if test "$N" = "$1"; then - # Not -j - warn and ignore - echo "parallel_xz: warning: unrecognized argument: '$1'" - else - procgroup="$N" - fi - shift -done - -# If told to use only one cpu: -test "$procgroup" || exec xargs -r xz -test "$procgroup" = 1 && exec xargs -r xz - -# xz has some startup cost. If files are really small, -# this cost might be significant. To combat this, -# process several files (in sequence) by each xz process via -n 16: -exec xargs -r -n 16 -P "$procgroup" xz diff --git a/sources b/sources index 9d3bf708b..1d59c6e6b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.1-rc1-10-gbb1a1146467a.tar.xz) = 7159bbec32e9986d14b57614579369c4c24e0525341b15d25866d5258c24f540af021cad79a5929bc5d0e7b9c100f6972b84b40074dae4bec5f44eb73ad25d25 -SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = a532b5319bc6a01bfaaed84fa4aae11354b13aa44b5aa1e0268ebae232d9ae2cb37c123823bd199d61fc859ed3a50a3b98e0f79c9f4debf8a576fea58f3ef7bd -SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = fda42be5101ee28e49f73f60776710cae3f421dce066e6b147debd653a26d3e25e8242a552609a594f8778339d78ef1eb11ae04c641629a2bcb787bb9e0167ca +SHA512 (linux-6.1-rc1-25-gaae703b02f92.tar.xz) = 96d040d877d20c15ef6c76dc3634c9e729a1babd0adf986ed09db8be45dd0093f06543c976e40d3aac8155b8ad6528c2e900e58bf75643f10e577fc96e11a431 +SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 869cdc60b855026d7595a919a294464201a31dc24779c2c41022d7df2d6c7f7ac81f00c30e1dd97e3703f3ba7ffa9630dd7205e4f68d65ab23f6c96a878e54a3 +SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = e62d70501709c2f0fa898475959414ba284e6025fb1cdf99a7601df644c6aa6d86972be8ba63937217dbd0081a132e83da9dd8a945e277e496d064a56233ecb1 -- cgit