diff --git a/Makefile.rhelver b/Makefile.rhelver index 9826d97f6..913f12fc1 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 = 51 +RHEL_RELEASE = 55 # # RHEL_REBASE_NUM diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index ec81faa60..feb58af8b 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2470,6 +2470,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m # CONFIG_INFINIBAND_USNIC is not set +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 917d358c1..6b5972276 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2454,6 +2454,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m # CONFIG_INFINIBAND_USNIC is not set +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index afb08b7c7..e1914d9b4 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2454,6 +2454,7 @@ CONFIG_INFINIBAND_RDMAVT=m CONFIG_INFINIBAND_USER_ACCESS=m # CONFIG_INFINIBAND_USER_MAD is not set # CONFIG_INFINIBAND_USNIC is not set +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d6c15bbc3..273dcc71f 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2438,6 +2438,7 @@ CONFIG_INFINIBAND_RDMAVT=m CONFIG_INFINIBAND_USER_ACCESS=m # CONFIG_INFINIBAND_USER_MAD is not set # CONFIG_INFINIBAND_USNIC is not set +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 5b138fb92..899da065c 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2445,6 +2445,7 @@ CONFIG_INFINIBAND_RDMAVT=m CONFIG_INFINIBAND_USER_ACCESS=m # CONFIG_INFINIBAND_USER_MAD is not set # CONFIG_INFINIBAND_USNIC is not set +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index abf3cf7fd..f0eda631b 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2608,7 +2608,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m # CONFIG_INFINIBAND_USNIC is not set -CONFIG_INFINIBAND_VMWARE_PVRDMA=m +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index e72306591..6addcec90 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2592,7 +2592,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m # CONFIG_INFINIBAND_USNIC is not set -CONFIG_INFINIBAND_VMWARE_PVRDMA=m +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 7f8679628..f97abf24f 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -2648,7 +2648,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m # CONFIG_INFINIBAND_USNIC is not set -CONFIG_INFINIBAND_VMWARE_PVRDMA=m +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index ac993ba8e..c224b2f9f 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -2632,7 +2632,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m # CONFIG_INFINIBAND_USNIC is not set -CONFIG_INFINIBAND_VMWARE_PVRDMA=m +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set diff --git a/kernel.changelog b/kernel.changelog index d65720b5d..88cfd3f86 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,20 @@ +* Mon Mar 04 2024 Fedora Kernel Team [6.8.0-0.rc7.55] +- Linux v6.8.0-0.rc7 +Resolves: + +* Sun Mar 03 2024 Fedora Kernel Team [6.8.0-0.rc6.04b8076df253.54] +- redhat/configs: Disable CONFIG_INFINIBAND_VMWARE_PVRDMA (Kamal Heib) +- Linux v6.8.0-0.rc6.04b8076df253 +Resolves: + +* Sat Mar 02 2024 Fedora Kernel Team [6.8.0-0.rc6.5ad3cb0ed525.53] +- Linux v6.8.0-0.rc6.5ad3cb0ed525 +Resolves: + +* Fri Mar 01 2024 Fedora Kernel Team [6.8.0-0.rc6.87adedeba51a.52] +- Linux v6.8.0-0.rc6.87adedeba51a +Resolves: + * Thu Feb 29 2024 Fedora Kernel Team [6.8.0-0.rc6.805d849d7c3c.51] - gitlab-ci: fix merge tree URL for gating pipelines (Michael Hofmann) - Revert "net: bump CONFIG_MAX_SKB_FRAGS to 45" (Marcelo Ricardo Leitner) diff --git a/kernel.spec b/kernel.spec index 02fb28d61..88d3b1fb8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc6.20240229git805d849d7c3c.51 +%define pkgrelease 0.rc7.55 %define kversion 6 -%define tarfile_release 6.8-rc6-37-g805d849d7c3c +%define tarfile_release 6.8-rc7 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20240229git805d849d7c3c.51%{?buildid}%{?dist} +%define specrelease 0.rc7.55%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -3960,6 +3960,19 @@ fi\ # # %changelog +* Mon Mar 04 2024 Fedora Kernel Team [6.8.0-0.rc7.55] +- Linux v6.8.0-0.rc7 + +* Sun Mar 03 2024 Fedora Kernel Team [6.8.0-0.rc6.04b8076df253.54] +- redhat/configs: Disable CONFIG_INFINIBAND_VMWARE_PVRDMA (Kamal Heib) +- Linux v6.8.0-0.rc6.04b8076df253 + +* Sat Mar 02 2024 Fedora Kernel Team [6.8.0-0.rc6.5ad3cb0ed525.53] +- Linux v6.8.0-0.rc6.5ad3cb0ed525 + +* Fri Mar 01 2024 Fedora Kernel Team [6.8.0-0.rc6.87adedeba51a.52] +- Linux v6.8.0-0.rc6.87adedeba51a + * Thu Feb 29 2024 Fedora Kernel Team [6.8.0-0.rc6.805d849d7c3c.51] - gitlab-ci: fix merge tree URL for gating pipelines (Michael Hofmann) - Revert "net: bump CONFIG_MAX_SKB_FRAGS to 45" (Marcelo Ricardo Leitner) diff --git a/patch-6.8-redhat.patch b/patch-6.8-redhat.patch index e25c31b63..2cb737280 100644 --- a/patch-6.8-redhat.patch +++ b/patch-6.8-redhat.patch @@ -136,7 +136,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 6cdb5717bfe0..dd56cbe27ea7 100644 +index 0e36eff14608..3ed9c1bdd44a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -250,7 +250,7 @@ index d1f3b56e7afc..eaefd0d7cfff 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 0b97bcde70c6..c624a2bee5f8 100644 +index fbc4e60d027c..42df548e212b 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1588,6 +1588,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) @@ -259,8 +259,8 @@ index 0b97bcde70c6..c624a2bee5f8 100644 get_cpu_cap(c); + get_model_name(c); /* RHEL: get model name for unsupported check */ setup_force_cpu_cap(X86_FEATURE_CPUID); + get_cpu_address_sizes(c); cpu_parse_early_param(); - diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 84201071dfac..d00c2713281e 100644 --- a/arch/x86/kernel/setup.c diff --git a/sources b/sources index 3ffc5e088..583dbc185 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.8-rc6-37-g805d849d7c3c.tar.xz) = 363aac713f74b3f07f9a3119b7cc179f9d3cd4bb94b9e2fbaea4deced2f2aa56c645d5dc232c95aa1211e152e072549c2fa0a9842cb16deed294257dc68699c8 -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = e54f08d19c84cf1fb11ea7935a392678944f8276b4af58436fcf58913e9d49fd4b9ae9f4bdfcf57aa4454b3ac341a9ed5ec5d85ceacfa26b6920aabf5ee76379 -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = f5d293151e220344e2f54c6ec84d2ae5b317b83b25c148409e275f1b06133c1d7b0671f57831b2d01a4012038479c326a9b076f98672316da5439b17b9a46191 +SHA512 (linux-6.8-rc7.tar.xz) = 4bc98f8995917afd70343126c50573d6d454d0de5bac4137ccca10864349fa02e845a14ab16f51635959f42862d7f07dbf081ffce01b9e33b966daf5f337db4f +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = 76c6d275c26367da69c2b47ebcc9f8b60eda5a6382039e51b5b7b3158d69d8dd466f6d8fcd073a9bf2e86c149794ee114ba03e9fa5eeacd7879bc9709bbaa87a +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = ad6712cb6e4841fe074fb32e14f08aae28ba849a70774ac2664b86c56dc7196a2dd0b67642c33435142435e3dc6fd4af56f854f751724eb36b862d04c5f4e944