On Mon, Jan 13, 2025 at 10:34:48AM +0100, Hannes Reinecke wrote: > On 1/12/25 23:38, Keith Busch wrote: > diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig > index 486afe598184..10e453b2436e 100644 > --- a/drivers/nvme/host/Kconfig > +++ b/drivers/nvme/host/Kconfig > @@ -109,7 +109,7 @@ config NVME_HOST_AUTH > bool "NVMe over Fabrics In-Band Authentication in host side" > depends on NVME_CORE > select NVME_AUTH > - select NVME_KEYRING if NVME_TCP_TLS > + select NVME_KEYRING > help > This provides support for NVMe over Fabrics In-Band Authentication in > host side. > > > which obviously needs to be folded into patch 'nvme-tcp: request > secure channel concatenation' (the cited patch is a red herring; > it only exposes the issue, but the issue got introduced with the > patch to nvme-tcp). > > Can you fold it in or shall I resubmit? Sure, I can fold it in. Were you okay with my merge conflict resolution on this patch too?