From 033b5413822037b02c025c476c90715acfb7dd76 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 12 Sep 2023 09:46:20 -0500 Subject: [PATCH] kernel-6.6.0-0.rc1.14 * Tue Sep 12 2023 Fedora Kernel Team [6.6.0-0.rc1.14] - New configs in drivers/media (Fedora Kernel Team) - redhat/docs: Add a mention of bugzilla for bugs (Prarit Bhargava) - Fix the fixup of Fedora release (Don Zickus) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-64k-debug-rhel.config | 2 +- kernel-aarch64-64k-rhel.config | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-aarch64-rt-debug-rhel.config | 2 +- kernel-aarch64-rt-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel-x86_64-rt-debug-rhel.config | 2 +- kernel-x86_64-rt-rhel.config | 2 +- kernel.spec | 9 +++++++-- sources | 4 ++-- 18 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 1805083e6..bd68da515 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 = 13 +RHEL_RELEASE = 14 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 9abc4c3b9..77b1c7f9b 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3648,7 +3648,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 00470836f..70515beeb 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3627,7 +3627,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 6c08435a5..0687f57c6 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3644,7 +3644,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 3abb747d5..589e1ef68 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3623,7 +3623,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index d38f3413e..3820790e7 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3689,7 +3689,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index ca3cfa486..759af132a 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3668,7 +3668,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index ac493df69..0e5818758 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3346,7 +3346,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 4bb7fff24..e174d71ec 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3326,7 +3326,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index dd870ee25..3e9fc6984 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3331,7 +3331,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index e80999316..57d157bea 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3311,7 +3311,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 37f7755b2..6545d193a 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3321,7 +3321,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 91b763e95..17f63f463 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3529,7 +3529,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index fd3939e3e..6a8cc02e5 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3509,7 +3509,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 07fa680a8..84ff1b06a 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3574,7 +3574,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 5eecb655c..0f16a3a7d 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3554,7 +3554,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_FPGA=y CONFIG_MLX5_INFINIBAND=m CONFIG_MLX5_IPSEC=y -# CONFIG_MLX5_MACSEC is not set +CONFIG_MLX5_MACSEC=y CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y diff --git a/kernel.spec b/kernel.spec index 7f6d28219..6912a622d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.6.0 %define specversion 6.6.0 %define patchversion 6.6 -%define pkgrelease 0.rc1.13 +%define pkgrelease 0.rc1.14 %define kversion 6 %define tarfile_release 6.6-rc1 # This is needed to do merge window version magic %define patchlevel 6 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.13%{?buildid}%{?dist} +%define specrelease 0.rc1.14%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.6.0 @@ -3694,6 +3694,11 @@ fi\ # # %changelog +* Tue Sep 12 2023 Fedora Kernel Team [6.6.0-0.rc1.14] +- New configs in drivers/media (Fedora Kernel Team) +- redhat/docs: Add a mention of bugzilla for bugs (Prarit Bhargava) +- Fix the fixup of Fedora release (Don Zickus) + * Mon Sep 11 2023 Fedora Kernel Team [6.6.0-0.rc1.13] - Linux v6.6.0-0.rc1 diff --git a/sources b/sources index ec93825d4..93800f4d2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.6-rc1.tar.xz) = 8edd10029f696b63a9db10d21f9c5f960cf750d2fe35c83fa822dc86864148776252c5a4c8a9485f3e63be795882e6ca2baa3d9ec361e90171c454fd420ad961 -SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 28600272fb17600b08aa8fe698c2dd1a62d09c9ffb60a191351eae79ebacf888ddb91f518c8ff9d7cfa29380ae334d5dcd2a3b6cc78ea54608240cd2f588cdc6 -SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 73379173c6af0d7517af2adb440470d2d8b34151cad7b4a9511f480f0fc9092a9629fea582b095fa56f28eb9e56919191828e0e5f34b0415f831cb0278a149b8 +SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 5fd7f4bec7af8ae9a1ac4d51e527bfbb7eae312ea46a4be0d18ad0c70ebbdd20264df96d06e37398434f76097f22f3dbacd87e1c17227d49c375593f1b774fc3 +SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = ec64324b944e0eedc50dbef302ba48c68951c6aa2d68c7aa01e5e1f50b16a077120f19f91d75812dcd92f96bd4a27ecda7e95771b8619b979b0490ae9296cb23