Skip to content

Commit b7a4df5

Browse files
author
CKI KWF Bot
committed
Merge: nvme: Sync nvme drivers with kernel 6.16
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1380 # Merge Request Required Information ## Summary of Changes JIRA: https://issues.redhat.com/browse/RHEL-110941 Sync the nvme drivers with the upstream kernel version 6.16 Omitted-fix: 6ff1bd7 ("nvme-auth: update bi_directional flag") Omitted-fix: df4666a ("nvme-tcp: send only permitted commands for secure concat") Omitted-fix: 10c165a ("nvmet-fcloop: call done callback even when remote port is gone") Signed-off-by: Maurizio Lombardi <mlombard@redhat.com> ## 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 <emilne@redhat.com> Approved-by: Ming Lei <ming.lei@redhat.com> Approved-by: Vladis Dronov <vdronov@redhat.com> Approved-by: Rafael Aquini <raquini@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 9cbd90a + 37d4b62 commit b7a4df5

Some content is hidden

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

45 files changed

+2668
-798
lines changed

crypto/Kconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,12 @@ config CRYPTO_ACOMP
141141
select CRYPTO_ALGAPI
142142
select CRYPTO_ACOMP2
143143

144+
config CRYPTO_HKDF
145+
tristate
146+
select CRYPTO_SHA256 if !CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
147+
select CRYPTO_SHA512 if !CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
148+
select CRYPTO_HASH2
149+
144150
config CRYPTO_MANAGER
145151
tristate "Cryptographic algorithm manager"
146152
select CRYPTO_MANAGER2

crypto/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o
3434
obj-$(CONFIG_CRYPTO_AKCIPHER2) += akcipher.o
3535
obj-$(CONFIG_CRYPTO_SIG2) += sig.o
3636
obj-$(CONFIG_CRYPTO_KPP2) += kpp.o
37+
obj-$(CONFIG_CRYPTO_HKDF) += hkdf.o
3738

3839
dh_generic-y := dh.o
3940
dh_generic-y += dh_helper.o

0 commit comments

Comments
 (0)