rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-5.17-0.rc0.20220118gitfe81ba137ebc.69

Browse Source 
* Wed Jan 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220118gitfe81ba137ebc.69]
- lib/crypto: add prompts back to crypto libraries (Justin M. Forbes)
- Add packaged but empty /lib/modules/<kver>/systemtap/ (Justin M. Forbes)
- filter-modules.sh.rhel: Add ntc_thermistor to singlemods (Prarit Bhargava)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-01-19 09:54:55 -06:00
parent dcddcf3387
commit 46931d96df
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
27 changed files with 130 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 69 RHEL_RELEASE = 70
# #
# Early y+1 numbering # Early y+1 numbering

4
Patchlist.changelog
View File

@ -1,5 +1,5 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/a39123f046ca62953518ecc7aa207ed281130d18 https://gitlab.com/cki-project/kernel-ark/-/commit/309ccf0b279d3f3e7a88fb8889defc10c5ffa818
a39123f046ca62953518ecc7aa207ed281130d18 lib/crypto: add prompts back to crypto libraries 309ccf0b279d3f3e7a88fb8889defc10c5ffa818 lib/crypto: add prompts back to crypto libraries
https://gitlab.com/cki-project/kernel-ark/-/commit/aa7ea266d2b6a3d865060945da1f8c674640e989 https://gitlab.com/cki-project/kernel-ark/-/commit/aa7ea266d2b6a3d865060945da1f8c674640e989
aa7ea266d2b6a3d865060945da1f8c674640e989 pci.h: Fix static include aa7ea266d2b6a3d865060945da1f8c674640e989 pci.h: Fix static include

6
kernel-aarch64-debug-fedora.config
View File

@ -1288,9 +1288,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m CONFIG_CRYPTO_CRC32_ARM_CE=m
@ -1407,8 +1407,8 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y CONFIG_CRYPTO_POLY1305_NEON=y
CONFIG_CRYPTO_POLY1305=y
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-aarch64-debug-rhel.config
View File

@ -956,9 +956,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@ -1036,8 +1036,8 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y CONFIG_CRYPTO_POLY1305_NEON=y
CONFIG_CRYPTO_POLY1305=y
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-aarch64-fedora.config
View File

@ -1288,9 +1288,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m CONFIG_CRYPTO_CRC32_ARM_CE=m
@ -1407,8 +1407,8 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y CONFIG_CRYPTO_POLY1305_NEON=y
CONFIG_CRYPTO_POLY1305=y
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-aarch64-rhel.config
View File

@ -956,9 +956,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@ -1036,8 +1036,8 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_NEON=y CONFIG_CRYPTO_POLY1305_NEON=y
CONFIG_CRYPTO_POLY1305=y
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-armv7hl-debug-fedora.config
View File

@ -1285,9 +1285,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m CONFIG_CRYPTO_CRC32_ARM_CE=m
@ -1407,7 +1407,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_CRYPTO_POLY1305_ARM=y
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-armv7hl-fedora.config
View File

@ -1285,9 +1285,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m CONFIG_CRYPTO_CRC32_ARM_CE=m
@ -1407,7 +1407,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_CRYPTO_POLY1305_ARM=y
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -1257,9 +1257,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m CONFIG_CRYPTO_CRC32_ARM_CE=m
@ -1378,7 +1378,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_CRYPTO_POLY1305_ARM=y
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-armv7hl-lpae-fedora.config
View File

@ -1257,9 +1257,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32_ARM_CE=m CONFIG_CRYPTO_CRC32_ARM_CE=m
@ -1378,7 +1378,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_CRYPTO_POLY1305_ARM=y
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-i686-debug-fedora.config
View File

@ -1035,8 +1035,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32C_INTEL=m
@ -1119,7 +1119,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-i686-fedora.config
View File

@ -1034,8 +1034,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32C_INTEL=m
@ -1118,7 +1118,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-ppc64le-debug-fedora.config
View File

@ -986,8 +986,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m CONFIG_CRYPTO_CRC32C_VPMSUM=m
@ -1063,7 +1063,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-ppc64le-debug-rhel.config
View File

@ -817,8 +817,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@ -895,7 +895,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-ppc64le-fedora.config
View File

@ -985,8 +985,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m CONFIG_CRYPTO_CRC32C_VPMSUM=m
@ -1062,7 +1062,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-ppc64le-rhel.config
View File

@ -817,8 +817,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@ -895,7 +895,7 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-s390x-debug-fedora.config
View File

@ -993,8 +993,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m CONFIG_CRYPTO_CRC32C_VPMSUM=m
@ -1065,7 +1065,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PAES_S390=m CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-s390x-debug-rhel.config
View File

@ -817,8 +817,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@ -892,7 +892,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PAES_S390=m CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-s390x-fedora.config
View File

@ -992,8 +992,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_VPMSUM=m CONFIG_CRYPTO_CRC32C_VPMSUM=m
@ -1064,7 +1064,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PAES_S390=m CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-s390x-rhel.config
View File

@ -817,8 +817,8 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20=y CONFIG_CRYPTO_CHACHA20POLY1305=m
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
# CONFIG_CRYPTO_CRC32C_VPMSUM is not set # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
@ -892,7 +892,7 @@ CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PAES_S390=m CONFIG_CRYPTO_PAES_S390=m
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=y CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-x86_64-debug-fedora.config
View File

@ -1057,9 +1057,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32C_INTEL=m
@ -1148,8 +1148,8 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_POLY1305_X86_64=y
CONFIG_CRYPTO_POLY1305=y
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-x86_64-debug-rhel.config
View File

@ -855,9 +855,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32C_INTEL=m
@ -947,8 +947,8 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_POLY1305_X86_64=y
CONFIG_CRYPTO_POLY1305=y
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-x86_64-fedora.config
View File

@ -1056,9 +1056,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32C_INTEL=m
@ -1147,8 +1147,8 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_POLY1305_X86_64=y
CONFIG_CRYPTO_POLY1305=y
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

6
kernel-x86_64-rhel.config
View File

@ -855,9 +855,9 @@ CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CCM=y
CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CFB=y
CONFIG_CRYPTO_CHACHA20POLY1305=y CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_CHACHA20_X86_64=y
CONFIG_CRYPTO_CHACHA20=y
# CONFIG_CRYPTO_CHACHA_S390 is not set # CONFIG_CRYPTO_CHACHA_S390 is not set
CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32C_INTEL=m
@ -947,8 +947,8 @@ CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_OFB=y
CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_PCRYPT=m
CONFIG_CRYPTO_POLY1305=m
CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_POLY1305_X86_64=y
CONFIG_CRYPTO_POLY1305=y
CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SEQIV=y

19
kernel.spec
View File

@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 0 %define debugbuildsenabled 0
%global distro_build 0.rc0.20220118gitfe81ba137ebc.69 %global distro_build 0.rc0.20220119git1d1df41c5a33.70
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0 %define rpmversion 5.17.0
%define patchversion 5.17 %define patchversion 5.17
%define pkgrelease 0.rc0.20220118gitfe81ba137ebc.69 %define pkgrelease 0.rc0.20220119git1d1df41c5a33.70
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 17 %define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.20220118gitfe81ba137ebc.69%{?buildid}%{?dist} %define specrelease 0.rc0.20220119git1d1df41c5a33.70%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -692,7 +692,7 @@ BuildRequires: lld
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.16-10996-gfe81ba137ebc.tar.xz Source0: linux-5.16-11200-g1d1df41c5a33.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1386,8 +1386,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.16-10996-gfe81ba137ebc -c %setup -q -n kernel-5.16-11200-g1d1df41c5a33 -c
mv linux-5.16-10996-gfe81ba137ebc linux-%{KVERREL} mv linux-5.16-11200-g1d1df41c5a33 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -1611,6 +1611,7 @@ BuildKernel() {
mkdir -p $RPM_BUILD_ROOT/%{image_install_path} mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/systemtap
%if %{with_debuginfo} %if %{with_debuginfo}
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path} mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/%{image_install_path}
%endif %endif
@ -2929,6 +2930,7 @@ fi
/lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
/lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\
/lib/modules/%{KVERREL}%{?3:+%{3}}/crashkernel.default\ /lib/modules/%{KVERREL}%{?3:+%{3}}/crashkernel.default\
/lib/modules/%{KVERREL}%{?3:+%{3}}/systemtap\
%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\ %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\
%if %{1}\ %if %{1}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\ /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
@ -2984,9 +2986,10 @@ fi
# #
# #
%changelog %changelog
* Tue Jan 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220118gitfe81ba137ebc.69] * Wed Jan 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220118gitfe81ba137ebc.69]
- filter-modules.sh.rhel: Add ntc_thermistor to singlemods (Prarit Bhargava)
- lib/crypto: add prompts back to crypto libraries (Justin M. Forbes) - lib/crypto: add prompts back to crypto libraries (Justin M. Forbes)
- Add packaged but empty /lib/modules/<kver>/systemtap/ (Justin M. Forbes)
- filter-modules.sh.rhel: Add ntc_thermistor to singlemods (Prarit Bhargava)
* Tue Jan 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220118gitfe81ba137ebc.68] * Tue Jan 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220118gitfe81ba137ebc.68]
- Move CONFIG_SND_SOC_TLV320AIC31XX as it is now selected by CONFIG_SND_SOC_FSL_ASOC_CARD (Justin M. Forbes) - Move CONFIG_SND_SOC_TLV320AIC31XX as it is now selected by CONFIG_SND_SOC_FSL_ASOC_CARD (Justin M. Forbes)

162
patch-5.17-redhat.patch
View File

@ -10,7 +10,6 @@
arch/s390/kernel/setup.c | 4 + arch/s390/kernel/setup.c | 4 +
arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/cpu/common.c | 1 +
arch/x86/kernel/setup.c | 70 ++++- arch/x86/kernel/setup.c | 70 ++++-
crypto/Kconfig | 2 -
crypto/rng.c | 73 ++++- crypto/rng.c | 73 ++++-
drivers/acpi/apei/hest.c | 8 + drivers/acpi/apei/hest.c | 8 +
drivers/acpi/irq.c | 17 +- drivers/acpi/irq.c | 17 +-
@ -18,7 +17,7 @@
drivers/ata/libahci.c | 18 ++ drivers/ata/libahci.c | 18 ++
drivers/char/ipmi/ipmi_dmi.c | 15 ++ drivers/char/ipmi/ipmi_dmi.c | 15 ++
drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/char/ipmi/ipmi_msghandler.c | 16 +-
drivers/char/random.c | 115 ++++++++ drivers/char/random.c | 134 ++++++++++
drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/Makefile | 1 +
drivers/firmware/efi/efi.c | 124 ++++++--- drivers/firmware/efi/efi.c | 124 ++++++---
drivers/firmware/efi/secureboot.c | 38 +++ drivers/firmware/efi/secureboot.c | 38 +++
@ -66,8 +65,6 @@
kernel/panic.c | 14 + kernel/panic.c | 14 +
kernel/rh_messages.c | 179 +++++++++++++ kernel/rh_messages.c | 179 +++++++++++++
kernel/sysctl.c | 5 + kernel/sysctl.c | 5 +
lib/Kconfig | 2 +
lib/crypto/Kconfig | 17 +-
mm/cma.c | 10 + mm/cma.c | 10 +
scripts/mod/modpost.c | 8 + scripts/mod/modpost.c | 8 +
scripts/tags.sh | 2 + scripts/tags.sh | 2 +
@ -75,7 +72,7 @@
security/lockdown/Kconfig | 13 + security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 + security/lockdown/lockdown.c | 1 +
security/security.c | 6 + security/security.c | 6 +
77 files changed, 1526 insertions(+), 195 deletions(-) 74 files changed, 1531 insertions(+), 188 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index f5a27f067db9..f4dc42f2f82a 100644 index f5a27f067db9..f4dc42f2f82a 100644
@ -131,7 +128,7 @@ index 000000000000..effb81d04bfd
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 0fc511aac61c..bc784b38679d 100644 index 3f07f0f04475..b96b47caa489 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -388,16 +385,6 @@ index f7a132eb794d..2305f8353e49 100644
unwind_init(); unwind_init();
} }
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 94bfa32cc6a1..442765219c37 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1928,5 +1928,3 @@ source "crypto/asymmetric_keys/Kconfig"
source "certs/Kconfig"
endif # if CRYPTO
-
-source "lib/crypto/Kconfig"
diff --git a/crypto/rng.c b/crypto/rng.c diff --git a/crypto/rng.c b/crypto/rng.c
index fea082b25fe4..50a9d040bed1 100644 index fea082b25fe4..50a9d040bed1 100644
--- a/crypto/rng.c --- a/crypto/rng.c
@ -668,10 +655,10 @@ index c59265146e9c..caa8458edde2 100644
rv = ipmi_register_driver(); rv = ipmi_register_driver();
mutex_unlock(&ipmi_interfaces_mutex); mutex_unlock(&ipmi_interfaces_mutex);
diff --git a/drivers/char/random.c b/drivers/char/random.c diff --git a/drivers/char/random.c b/drivers/char/random.c
index 227fb7802738..2836c089d2f3 100644 index b411182df6f6..ec4b9e43cc65 100644
--- a/drivers/char/random.c --- a/drivers/char/random.c
+++ b/drivers/char/random.c +++ b/drivers/char/random.c
@@ -345,6 +345,7 @@ @@ -344,6 +344,7 @@
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/uuid.h> #include <linux/uuid.h>
@ -679,7 +666,7 @@ index 227fb7802738..2836c089d2f3 100644
#include <crypto/chacha.h> #include <crypto/chacha.h>
#include <crypto/blake2s.h> #include <crypto/blake2s.h>
@@ -359,6 +360,11 @@ @@ -358,6 +359,30 @@
/* #define ADD_INTERRUPT_BENCH */ /* #define ADD_INTERRUPT_BENCH */
@ -687,11 +674,30 @@ index 227fb7802738..2836c089d2f3 100644
+ * Hook for external RNG. + * Hook for external RNG.
+ */ + */
+static const struct random_extrng __rcu *extrng; +static const struct random_extrng __rcu *extrng;
+
+/*
+ * Configuration information
+ */
+#define INPUT_POOL_SHIFT 12
+#define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5))
+#define OUTPUT_POOL_SHIFT 10
+#define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5))
+#define EXTRACT_SIZE (BLAKE2S_HASH_SIZE / 2)
+
+/*
+ * To allow fractional bits to be tracked, the entropy_count field is
+ * denominated in units of 1/8th bits.
+ *
+ * 2*(ENTROPY_SHIFT + poolbitshift) must <= 31, or the multiply in
+ * credit_entropy_bits() needs to be 64 bits wide.
+ */
+#define ENTROPY_SHIFT 3
+#define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
+ +
/* /*
* Configuration information * If the entropy count falls under this number of bits, then we
*/ * should wake up processes which are selecting or polling on write
@@ -493,6 +499,9 @@ static int ratelimit_disable __read_mostly; @@ -486,6 +511,9 @@ static int ratelimit_disable __read_mostly;
module_param_named(ratelimit_disable, ratelimit_disable, int, 0644); module_param_named(ratelimit_disable, ratelimit_disable, int, 0644);
MODULE_PARM_DESC(ratelimit_disable, "Disable random ratelimit suppression"); MODULE_PARM_DESC(ratelimit_disable, "Disable random ratelimit suppression");
@ -701,7 +707,7 @@ index 227fb7802738..2836c089d2f3 100644
/********************************************************************** /**********************************************************************
* *
* OS independent entropy store. Here are the functions which handle * OS independent entropy store. Here are the functions which handle
@@ -1869,6 +1878,13 @@ random_poll(struct file *file, poll_table * wait) @@ -1775,6 +1803,13 @@ static __poll_t random_poll(struct file *file, poll_table *wait)
return mask; return mask;
} }
@ -712,10 +718,10 @@ index 227fb7802738..2836c089d2f3 100644
+ return EPOLLIN | EPOLLRDNORM; + return EPOLLIN | EPOLLRDNORM;
+} +}
+ +
static int static int write_pool(const char __user *buffer, size_t count)
write_pool(struct entropy_store *r, const char __user *buffer, size_t count)
{ {
@@ -1972,7 +1988,58 @@ static int random_fasync(int fd, struct file *filp, int on) size_t bytes;
@@ -1876,7 +1911,58 @@ static int random_fasync(int fd, struct file *filp, int on)
return fasync_helper(fd, filp, on, &fasync); return fasync_helper(fd, filp, on, &fasync);
} }
@ -774,7 +780,7 @@ index 227fb7802738..2836c089d2f3 100644
.read = random_read, .read = random_read,
.write = random_write, .write = random_write,
.poll = random_poll, .poll = random_poll,
@@ -1983,6 +2050,7 @@ const struct file_operations random_fops = { @@ -1887,6 +1973,7 @@ const struct file_operations random_fops = {
}; };
const struct file_operations urandom_fops = { const struct file_operations urandom_fops = {
@ -782,7 +788,7 @@ index 227fb7802738..2836c089d2f3 100644
.read = urandom_read, .read = urandom_read,
.write = random_write, .write = random_write,
.unlocked_ioctl = random_ioctl, .unlocked_ioctl = random_ioctl,
@@ -1991,9 +2059,31 @@ const struct file_operations urandom_fops = { @@ -1895,9 +1982,31 @@ const struct file_operations urandom_fops = {
.llseek = noop_llseek, .llseek = noop_llseek,
}; };
@ -807,14 +813,14 @@ index 227fb7802738..2836c089d2f3 100644
+ .release = extrng_release, + .release = extrng_release,
+}; +};
+ +
SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int,
unsigned int, flags) flags)
{ {
+ const struct random_extrng *rng; + const struct random_extrng *rng;
int ret; int ret;
if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE)) if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE))
@@ -2009,6 +2099,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, @@ -1913,6 +2022,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int,
if (count > INT_MAX) if (count > INT_MAX)
count = INT_MAX; count = INT_MAX;
@ -833,7 +839,7 @@ index 227fb7802738..2836c089d2f3 100644
if (!(flags & GRND_INSECURE) && !crng_ready()) { if (!(flags & GRND_INSECURE) && !crng_ready()) {
if (flags & GRND_NONBLOCK) if (flags & GRND_NONBLOCK)
return -EAGAIN; return -EAGAIN;
@@ -2319,3 +2421,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size) @@ -2220,3 +2341,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size)
add_device_randomness(buf, size); add_device_randomness(buf, size);
} }
EXPORT_SYMBOL_GPL(add_bootloader_randomness); EXPORT_SYMBOL_GPL(add_bootloader_randomness);
@ -2708,10 +2714,10 @@ index 6d72772182c8..fe3b072665fb 100644
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/init/Kconfig b/init/Kconfig diff --git a/init/Kconfig b/init/Kconfig
index fc61bfa5ebb2..c742632d7b5a 100644 index e9119bf54b1f..e3b57b4898fe 100644
--- a/init/Kconfig --- a/init/Kconfig
+++ b/init/Kconfig +++ b/init/Kconfig
@@ -1646,7 +1646,7 @@ config AIO @@ -1645,7 +1645,7 @@ config AIO
this option saves about 7k. this option saves about 7k.
config IO_URING config IO_URING
@ -3035,88 +3041,6 @@ index ef77be575d87..977930662f33 100644
*(int *)table->data = unpriv_enable; *(int *)table->data = unpriv_enable;
} }
return ret; return ret;
diff --git a/lib/Kconfig b/lib/Kconfig
index 655b0e43f260..c20b68ad2bc3 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -122,6 +122,8 @@ config INDIRECT_IOMEM_FALLBACK
mmio accesses when the IO memory address is not a registered
emulated region.
+source "lib/crypto/Kconfig"
+
config CRC_CCITT
tristate "CRC-CCITT functions"
help
diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index 8620f38e117c..e8e525650cf2 100644
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
+menu "Crypto library routines"
+
config CRYPTO_LIB_AES
tristate
@@ -31,7 +33,7 @@ config CRYPTO_ARCH_HAVE_LIB_CHACHA
config CRYPTO_LIB_CHACHA_GENERIC
tristate
- select CRYPTO_ALGAPI
+ select XOR_BLOCKS
help
This symbol can be depended upon by arch implementations of the
ChaCha library interface that require the generic code as a
@@ -40,7 +42,8 @@ config CRYPTO_LIB_CHACHA_GENERIC
of CRYPTO_LIB_CHACHA.
config CRYPTO_LIB_CHACHA
- tristate
+ tristate "ChaCha library interface"
+ depends on CRYPTO
depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA
select CRYPTO_LIB_CHACHA_GENERIC if CRYPTO_ARCH_HAVE_LIB_CHACHA=n
help
@@ -65,7 +68,7 @@ config CRYPTO_LIB_CURVE25519_GENERIC
of CRYPTO_LIB_CURVE25519.
config CRYPTO_LIB_CURVE25519
- tristate
+ tristate "Curve25519 scalar multiplication library"
depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519
select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n
help
@@ -100,7 +103,7 @@ config CRYPTO_LIB_POLY1305_GENERIC
of CRYPTO_LIB_POLY1305.
config CRYPTO_LIB_POLY1305
- tristate
+ tristate "Poly1305 library interface"
depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305
select CRYPTO_LIB_POLY1305_GENERIC if CRYPTO_ARCH_HAVE_LIB_POLY1305=n
help
@@ -109,14 +112,18 @@ config CRYPTO_LIB_POLY1305
is available and enabled.
config CRYPTO_LIB_CHACHA20POLY1305
- tristate
+ tristate "ChaCha20-Poly1305 AEAD support (8-byte nonce library version)"
depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA
depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305
+ depends on CRYPTO
select CRYPTO_LIB_CHACHA
select CRYPTO_LIB_POLY1305
+ select CRYPTO_ALGAPI
config CRYPTO_LIB_SHA256
tristate
config CRYPTO_LIB_SM4
tristate
+
+endmenu
diff --git a/mm/cma.c b/mm/cma.c diff --git a/mm/cma.c b/mm/cma.c
index bc9ca8f3c487..9fa9a485eb3a 100644 index bc9ca8f3c487..9fa9a485eb3a 100644
--- a/mm/cma.c --- a/mm/cma.c
@ -3146,7 +3070,7 @@ index bc9ca8f3c487..9fa9a485eb3a 100644
count, align); count, align);
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index cb8ab7d91d30..5f13183ccc23 100644 index 6bfa33217914..92d936f34b27 100644
--- a/scripts/mod/modpost.c --- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@ -3157,7 +3081,7 @@ index cb8ab7d91d30..5f13183ccc23 100644
/* Are we using CONFIG_MODVERSIONS? */ /* Are we using CONFIG_MODVERSIONS? */
static int modversions = 0; static int modversions = 0;
@@ -2351,6 +2352,12 @@ static void write_buf(struct buffer *b, const char *fname) @@ -2366,6 +2367,12 @@ static void write_buf(struct buffer *b, const char *fname)
} }
} }
@ -3170,7 +3094,7 @@ index cb8ab7d91d30..5f13183ccc23 100644
static void write_if_changed(struct buffer *b, const char *fname) static void write_if_changed(struct buffer *b, const char *fname)
{ {
char *tmp; char *tmp;
@@ -2580,6 +2587,7 @@ int main(int argc, char **argv) @@ -2595,6 +2602,7 @@ int main(int argc, char **argv)
add_depends(&buf, mod); add_depends(&buf, mod);
add_moddevtable(&buf, mod); add_moddevtable(&buf, mod);
add_srcversion(&buf, mod); add_srcversion(&buf, mod);

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.16-10996-gfe81ba137ebc.tar.xz) = 85b8600ab052ea8476540a000f31babd3eda9cb169ca3f7a14b84be2435cc08bf017f98b774583970a3930e837fe5c1ad524ab58939d8436d3de9f6fd293a271 SHA512 (linux-5.16-11200-g1d1df41c5a33.tar.xz) = 8ab47225ed863e7606d8ced78de60cc74521f30a232867b16120758a701490544ace33d1b466220bf147b260b2e679b5f668a88cb31cf8291f8045ad3711a293
SHA512 (kernel-abi-stablelists-5.17.0-0.rc0.20220118gitfe81ba137ebc.69.tar.bz2) = c67db70785b9ae215ac5b15928da303139d296410f8d4ee51bbbf5ba9da22dec97070fb583f3b2f52ac6ebceb38385d2f1e95cf2285e15461fae971282005e1a SHA512 (kernel-abi-stablelists-5.17.0-0.rc0.20220119git1d1df41c5a33.70.tar.bz2) = 5ddc099152345576f60e9ecc28f3af9fb4bff34e35a64e802e2f42e7cc1d68c1c2b5e646a7255931cb303bb1c597beee8b8c3479ce1202623e74ab3d3569eb65
SHA512 (kernel-kabi-dw-5.17.0-0.rc0.20220118gitfe81ba137ebc.69.tar.bz2) = 4811049aec6d2ccf5bbba16ba20d0b5838642cc7de5bef3e2852ae9c5c3af259bc888d67f7d0029152d4ca8d7ce8d78101995f49577d0ca0c791fb0ab9673589 SHA512 (kernel-kabi-dw-5.17.0-0.rc0.20220119git1d1df41c5a33.70.tar.bz2) = 9b7e9c3cb6fafd2a57e9fb2b84f7f61f24836da8b2a583878d68138130e530cfd30b454c6cb898c2ea9db330d7f05280938f3584a8f03545bc8aed2765908bde