Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc3.20230110git5a41237ad1d4.25.vanilla.1.fc37

13 files changed, 25 insertions, 21 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 2d7ebf11e..bae58f2f3 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 = 24
+RHEL_RELEASE = 25
 
 #
 # ZSTREAM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 332eda880..d044efcaa 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/7ff7c7f207816e402953dfbe08fd0396339652d3
- 7ff7c7f207816e402953dfbe08fd0396339652d3 Revert "arm64: remove special treatment for the link order of head.o"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/53da54e5a7627db98a80a14b3bed1abc3128d03a
+ 53da54e5a7627db98a80a14b3bed1abc3128d03a Revert "arm64: remove special treatment for the link order of head.o"
 
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/77542637f2e84a847a7886979e0613332695c181
  77542637f2e84a847a7886979e0613332695c181 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 ea22d1b25..f3b42aceb 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1057,7 +1057,7 @@ CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
-# CONFIG_CRYPTO_CURVE25519 is not set
+CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 2b5d66ef6..9be99094c 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1057,7 +1057,7 @@ CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
-# CONFIG_CRYPTO_CURVE25519 is not set
+CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 76ad070d6..0e9128363 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -891,7 +891,7 @@ CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
-# CONFIG_CRYPTO_CURVE25519 is not set
+CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 6c70cc2d7..7a34c6494 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -891,7 +891,7 @@ CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
-# CONFIG_CRYPTO_CURVE25519 is not set
+CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index f037a2d02..35218843e 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -892,7 +892,7 @@ CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
-# CONFIG_CRYPTO_CURVE25519 is not set
+CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DES_S390=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index d6ebf2be9..95ad4e9ce 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -892,7 +892,7 @@ CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
-# CONFIG_CRYPTO_CURVE25519 is not set
+CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DES_S390=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index fc7a2ddd2..aea7aab3b 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -936,7 +936,7 @@ CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
-# CONFIG_CRYPTO_CURVE25519 is not set
+CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_CURVE25519_X86=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 7843764e1..f07eb9aed 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -936,7 +936,7 @@ CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
-# CONFIG_CRYPTO_CURVE25519 is not set
+CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_CURVE25519_X86=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
diff --git a/kernel.spec b/kernel.spec
index 45f9a7062..d44aab79f 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -126,17 +126,17 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 # define buildid .local
 %define specversion 6.2.0
 %define patchversion 6.2
-%define pkgrelease 0.rc3.20230109git1fe4fd6f5cad.24
+%define pkgrelease 0.rc3.20230110git5a41237ad1d4.25
 %define kversion 6
-%define tarfile_release 6.2-rc3-8-g1fe4fd6f5cad
+%define tarfile_release 6.2-rc3-9-g5a41237ad1d4
 # This is needed to do merge window version magic
 %define patchlevel 2
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.20230109git1fe4fd6f5cad.24%{?buildid}%{?dist}
+%define specrelease 0.rc3.20230110git5a41237ad1d4.25%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.2.0
 
@@ -3188,10 +3188,14 @@ fi
 #
 #
 %changelog
-* Mon Jan 09 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.1fe4fd6f5cad.24]
+* Tue Jan 10 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.5a41237ad1d4.25]
 - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
 - Revert "arm64: remove special treatment for the link order of head.o" (Justin M. Forbes)
 
+* Tue Jan 10 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.5a41237ad1d4.24]
+- redhat/configs: Enable CRYPTO_CURVE25519 in ark (Prarit Bhargava)
+- Linux v6.2.0-0.rc3.5a41237ad1d4
+
 * Mon Jan 09 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc3.1fe4fd6f5cad.23]
 - Linux v6.2.0-0.rc3.1fe4fd6f5cad
 
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch
index be8f006de..a9a16c9cb 100644
--- a/patch-6.2-redhat.patch
+++ b/patch-6.2-redhat.patch
@@ -2534,10 +2534,10 @@ index 5b67f208f7de..060133d19a4b 100644
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/init/Kconfig b/init/Kconfig
-index 7e5c3ddc341d..850393c608ef 100644
+index 0958846b005e..a9f8a5e4f3d8 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1694,7 +1694,7 @@ config AIO
+@@ -1698,7 +1698,7 @@ config AIO
  	  this option saves about 7k.
 
  config IO_URING
diff --git a/sources b/sources
index 2586d4d25..06352d9f7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.2-rc3-8-g1fe4fd6f5cad.tar.xz) = 09b2b69a3fe03133cac47b634816fd0513852b1a9aee75e8ce2485b72f82e43f97354070836e09d77bb41dc50c56066347c687e49ce9fea37a600cc71f71ff74
-SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 63557c49664ad56178e53b9114428721279dcf28bc1db3118167726794a0df4e97faaea60c01bd095b85f50bf5aee0d8568e5ee307376770d03d4172ce2c08b5
-SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = b0b39c742997332c1216a2e34268c74238cacb54b963e2f6b802c693864916d13d92111239b67223ebb8334afff38751a6755e16b5b3a7166afe181a6e61f79d
+SHA512 (linux-6.2-rc3-9-g5a41237ad1d4.tar.xz) = 25574001e584e4bf22be1c9001c3a980ac77e9d61186a72825ad74a7373799d1cad8986bf39f8be75fa94adf1b52a45d0a0ed6e2ffd609dfbd6567f2e95e14ad
+SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 894f1bafba83f7ae9e084e5fc46121a92de66cb0da89bdade41209636c348209c8dd62f8ad8c767d2f0380fa276884a0df3f00954ab3511acee1bf3069e83cba
+SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 22fd3aea3bafdfeed2c1a06c498ffa1e22b143af83b69ff705c72f6c53aab144cad95d93ed3a68149ef522c254f867e5953efa16fb72ee4a87d71c8f653a9d7d