bump kernel-stable to 6.6.6-018

fedora/diff.config

@@ -1,6 +1,6 @@
 CONFIG_UAPI_HEADER_TEST=y
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT="6.6.4-200.fc39.aarch64"
+CONFIG_BUILD_SALT="6.6.6-200.fc39.aarch64"
 CONFIG_WATCH_QUEUE=y
 CONFIG_NO_HZ_FULL=y
 CONFIG_NO_HZ=y
@@ -15,7 +15,9 @@ CONFIG_PSI=y
 CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_PRINTK_INDEX=y
+CONFIG_UCLAMP_TASK=y
 CONFIG_CFS_BANDWIDTH=y
+CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_MISC=y
 CONFIG_NAMESPACES=y

fedora/log.merge_config

@@ -1293,8 +1293,8 @@ New value: CONFIG_CMA_SIZE_MBYTES=64
   HOSTCC  scripts/kconfig/symbol.o
   HOSTCC  scripts/kconfig/util.o
   HOSTLD  scripts/kconfig/conf
-./.tmp.config.pa48HtCCCc:1271:warning: override: NO_HZ_FULL changes choice state
+./.tmp.config.1lak0U8jig:1271:warning: override: NO_HZ_FULL changes choice state
-./.tmp.config.pa48HtCCCc:1276:warning: override: PREEMPT_VOLUNTARY changes choice state
+./.tmp.config.1lak0U8jig:1276:warning: override: PREEMPT_VOLUNTARY changes choice state
 #
 # configuration written to .config
 #

fedora/rhel.defconfig

@@ -1,6 +1,6 @@
 CONFIG_UAPI_HEADER_TEST=y
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_BUILD_SALT="6.6.4-200.fc39.aarch64"
+CONFIG_BUILD_SALT="6.6.6-200.fc39.aarch64"
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_WATCH_QUEUE=y
@@ -26,10 +26,12 @@ CONFIG_PSI=y
 CONFIG_IKHEADERS=m
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_PRINTK_INDEX=y
+CONFIG_UCLAMP_TASK=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CFS_BANDWIDTH=y
+CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y

kernel-common.inc

@@ -33,7 +33,7 @@
 %global pkg_version %{LKAver}
 
 # Set pkg_release.
-%global pkg_release %{?rc_ver:rc%{rc_ver}.}%{?next_snapshot_date:next%{next_snapshot_date}.}%{release_v}%{?buildid}%{?dist}
+%global pkg_release %{release_v}%{?rc_ver:.rc%{rc_ver}}%{?next_snapshot_date:.next%{next_snapshot_date}}%{?buildid}%{?dist}
 
 # Architectures upon which we can sign the kernel
 # for secure boot authentication.
@@ -141,6 +141,8 @@
 %define defconfig arch/%{asmarch}/configs/defconfig
 %endif
 
+%define elconfig arch/%{asmarch}/configs/el.config
+
 %if %{with_vdso_install}
 %define use_vdso 1
 %define _use_vdso 1
@@ -557,12 +559,13 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -n -p \
 
 mv COPYING COPYING-%{version}-%{release}
 
-cp %{_sourcedir}/config-$(uname -m) .config
+cp %{_sourcedir}/config-$(uname -m) %{elconfig}
 
 # Set the EXTRAVERSION string in the top level Makefile.
 sed -i "s@^EXTRAVERSION.*@EXTRAVERSION = -%{release}.%{_target_cpu}@" Makefile
 
 %ifarch x86_64 || aarch64
+./scripts/kconfig/merge_config.sh %{defconfig} %{elconfig}
 %{__make} ARCH=%{bldarch} listnewconfig | grep -E '^CONFIG_' > newoptions-el9-%{_target_cpu}.txt || true
 if [ -s newoptions-el9-%{_target_cpu}.txt ]; then
 	cat newoptions-el9-%{_target_cpu}.txt
@@ -576,17 +579,17 @@ rm -vf .config*
 openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
 openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
 cat rheldup3.pem rhelkpatch1.pem > certs/rhel.pem
-for i in %{_sourcedir}/config-$(uname -m); do
+for i in %{elconfig}; do
 	sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS="*"@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i
 done
 %else
-for i in %{_sourcedir}/config-$(uname -m); do
+for i in %{elconfig}; do
         sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS="*"@CONFIG_SYSTEM_TRUSTED_KEYS=""@' $i
 done
 %endif
 
 # Adjust the FIPS module name for RHEL9.
-for i in %{_sourcedir}/config-$(uname -m); do
+for i in %{elconfig}; do
 	sed -i 's@CONFIG_CRYPTO_FIPS_NAME=.*@CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux 9 - Kernel Cryptographic API"@' $i
 done
 
@@ -598,14 +601,14 @@ popd > /dev/null
 pushd linux-%{KVERREL} > /dev/null
 
 %ifarch x86_64 || aarch64
-cp %{_sourcedir}/config-$(uname -m) .config
+./scripts/kconfig/merge_config.sh %{defconfig} %{elconfig}
 
 %if %{signkernel} || %{signmodules}
 cp %{SOURCE23} certs/
 %endif
 
 %if %{with_std}
-%{make} %{?_smp_mflags} ARCH=%{bldarch} olddefconfig %{make_target}
+%{make} %{?_smp_mflags} ARCH=%{bldarch} %{make_target}
 
 %{make} %{?_smp_mflags} ARCH=%{bldarch} modules || exit 1
 

kernel-lts.spec

@@ -1,7 +1,7 @@
 %global major_ver 6
 %global minor_ver 1
-%global patch_ver 64
+%global patch_ver 62
-%global release_v 002
+%global release_v 0
 
 Name: kernel-lts
 

kernel-mainline.spec

@@ -1,8 +1,8 @@
 %global major_ver 6
 %global minor_ver 7
 %global patch_ver 0
-%global rc_ver    3
+%global rc_ver    1
-%global release_v 002
+%global release_v 0
 
 Name: kernel-mainline
 

kernel-next.spec

@@ -1,8 +1,8 @@
 %global major_ver 6
 %global minor_ver 7
 %global patch_ver 0
-%global next_snapshot_date 20231201
+%global next_snapshot_date 20231117
-%global release_v 002
+%global release_v 0
 
 Name: kernel-next
 

kernel-stable.spec

@@ -1,7 +1,7 @@
 %global major_ver 6
 %global minor_ver 6
 %global patch_ver 6
-%global release_v 016
+%global release_v 018
 
 Name: kernel-stable