Skip to content

Commit acf1036

Browse files
committed
Merge: nvme: update the nvme drivers to the latest upstream version
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6717 # Merge Request Required Information JIRA: https://issues.redhat.com/browse/RHEL-72531 JIRA: https://issues.redhat.com/browse/RHEL-59967 JIRA: https://issues.redhat.com/browse/RHEL-73614 JIRA: https://issues.redhat.com/browse/RHEL-86914 JIRA: https://issues.redhat.com/browse/RHEL-85327 Omitted-fix: 85adf20 Omitted-fix: 650415f CVE: CVE-2025-21927 ## Summary of Changes Update the nvme drivers to the latest version Signed-off-by: Maurizio Lombardi <[email protected]> ## Approved Development Ticket(s) All submissions to CentOS Stream must reference a ticket in [Red Hat Jira](https://issues.redhat.com/). <details><summary>Click for formatting instructions</summary> Please follow the CentOS Stream [contribution documentation](https://docs.centos.org/en-US/stream-contrib/quickstart/) for how to file this ticket and have it approved. List tickets each on their own line of this description using the format "Resolves: RHEL-76229", "Related: RHEL-76229" or "Reverts: RHEL-76229", as appropriate. </details> Approved-by: Ewan D. Milne <[email protected]> Approved-by: Vladis Dronov <[email protected]> Approved-by: Ming Lei <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Augusto Caringi <[email protected]>
2 parents a438402 + b015ed7 commit acf1036

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+7619
-687
lines changed

crypto/Kconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@ config CRYPTO_ACOMP
133133
select CRYPTO_ALGAPI
134134
select CRYPTO_ACOMP2
135135

136+
config CRYPTO_HKDF
137+
tristate
138+
select CRYPTO_SHA256 if !CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
139+
select CRYPTO_SHA512 if !CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
140+
select CRYPTO_HASH2
141+
136142
config CRYPTO_MANAGER
137143
tristate "Cryptographic algorithm manager"
138144
select CRYPTO_MANAGER2

crypto/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o
2626

2727
obj-$(CONFIG_CRYPTO_AKCIPHER2) += akcipher.o
2828
obj-$(CONFIG_CRYPTO_KPP2) += kpp.o
29+
obj-$(CONFIG_CRYPTO_HKDF) += hkdf.o
2930

3031
dh_generic-y := dh.o
3132
dh_generic-y += dh_helper.o

0 commit comments

Comments
 (0)