Merge remote-tracking branch 'up/f38' into f38-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-08-05 17:14:09 +03:00
commit ffd4213cb4
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
30 changed files with 40 additions and 36 deletions

View File

@ -1213,7 +1213,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1213,7 +1213,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1558,7 +1558,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1210,7 +1210,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1558,7 +1558,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1210,7 +1210,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1223,7 +1223,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1223,7 +1223,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1510,7 +1510,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1510,7 +1510,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1481,7 +1481,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1481,7 +1481,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1139,7 +1139,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -994,7 +994,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1137,7 +1137,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -994,7 +994,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1144,7 +1144,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -995,7 +995,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1142,7 +1142,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -995,7 +995,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=m

View File

@ -1000,7 +1000,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH=y

View File

@ -1248,7 +1248,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m

View File

@ -1053,7 +1053,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m

View File

@ -1246,7 +1246,7 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m

View File

@ -1053,7 +1053,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m

View File

@ -1069,7 +1069,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m

View File

@ -1069,7 +1069,7 @@ CONFIG_CRYPTO_SHA512=y
# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
# CONFIG_CRYPTO_SM4_GENERIC is not set
# CONFIG_CRYPTO_SM4 is not set
CONFIG_CRYPTO_STATS=y
# CONFIG_CRYPTO_STATS is not set
# CONFIG_CRYPTO_STREEBOG is not set
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m

View File

@ -171,18 +171,18 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
# define buildid .local
%define specrpmversion 6.4.7
%define specversion 6.4.7
%define specrpmversion 6.4.8
%define specversion 6.4.8
%define patchversion 6.4
%define pkgrelease 200
%define kversion 6
%define tarfile_release 6.4.7
%define tarfile_release 6.4.8
# This is needed to do merge window version magic
%define patchlevel 4
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 200%{?buildid}.0.riscv64%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.4.7
%define kabiversion 6.4.8
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@ -3753,9 +3753,13 @@ fi\
#
#
%changelog
* Fri Jul 28 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.4.7-0.riscv64]
* Sat Aug 05 2023 David Abdurachmanov <davidlt@rivosinc.com> [6.4.8-0.riscv64]
- Add support for riscv64
* Thu Aug 03 2023 Augusto Caringi <acaringi@redhat.com> [6.4.8-0]
- redhat: configs: Disable CONFIG_CRYPTO_STATS since performance issue for storage (Kate Hsuan) [2227793]
- Linux v6.4.8
* Thu Jul 27 2023 Augusto Caringi <acaringi@redhat.com> [6.4.7-0]
- Linux v6.4.7

View File

@ -39,7 +39,7 @@
38 files changed, 498 insertions(+), 179 deletions(-)
diff --git a/Makefile b/Makefile
index b3dc3b5f14ca..fb6ef27d6de3 100644
index 9607ce0b8a10..fae90de1f7f8 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \

View File

@ -1,3 +1,3 @@
SHA512 (linux-6.4.7.tar.xz) = d9b635c794ea1437a47156199429670ed9e887fa2aa2dae8220245a98c1d0d0b55b25ff5e19bcfa9a99d60d3f809d8e8e9fd0d2aeae83683eb4f853140c61031
SHA512 (kernel-abi-stablelists-6.4.7.tar.bz2) = 141fed2100b1f4868685c6f9fe0dd25a941103e336ead6bc224da3439d98045da9bd399189997fa350ea4cec82e89a2e5a3596ba9923f18a4752a174853555bc
SHA512 (kernel-kabi-dw-6.4.7.tar.bz2) = 47d8dd49caaf02cc283299aae358e4752f7638194db368cd94de27358304a7216d34a958ee21df1873d9cea192dca5b43571364d61f54fd99c3b2bb546b05538
SHA512 (linux-6.4.8.tar.xz) = 1bd97aaaef28da9c26e9a7828920de5bef737fe5488ee894a8a5bd59847efc138f093c0d4d57e3799e4fca47ca7bd54d6812fe9bd9f8917b41db970b86f7c94a
SHA512 (kernel-abi-stablelists-6.4.8.tar.bz2) = 5cd09d80efcca8f2a80417282d787c42dd671faae06a23ccf0fcf6debdea5b43c23960eec8a487e8ea48c5a1fc3344f84aaf3de4806e0a4fbd90184afbc75f1e
SHA512 (kernel-kabi-dw-6.4.8.tar.bz2) = e486fdbacaeb3c8b921146062f8980b7c99b55c20889e3fdd90d2ec99c166e592fb381bc291bfadc7d83e91a38cb5d54fd266722d8d877ab996979c561dd1366