| Message ID | 20241202142959.81321-7-hare@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | nvme: implement secure concatenation | expand |
diff --git a/drivers/nvme/common/keyring.c b/drivers/nvme/common/keyring.c index 8cb253fcd586..32d16c53133b 100644 --- a/drivers/nvme/common/keyring.c +++ b/drivers/nvme/common/keyring.c @@ -5,7 +5,6 @@ #include <linux/module.h> #include <linux/seq_file.h> -#include <linux/key.h> #include <linux/key-type.h> #include <keys/user-type.h> #include <linux/nvme.h> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 3e416af2659f..b5e11a0f7ba8 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -8,7 +8,6 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/err.h> -#include <linux/key.h> #include <linux/nvme-tcp.h> #include <linux/nvme-keyring.h> #include <net/sock.h> diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 7c51c2a8c109..fa59a7996efa 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -8,7 +8,6 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/err.h> -#include <linux/key.h> #include <linux/nvme-tcp.h> #include <linux/nvme-keyring.h> #include <net/sock.h> diff --git a/include/linux/nvme-keyring.h b/include/linux/nvme-keyring.h index 351a02b1bbc3..009bee8e8090 100644 --- a/include/linux/nvme-keyring.h +++ b/include/linux/nvme-keyring.h @@ -6,6 +6,8 @@ #ifndef _NVME_KEYRING_H #define _NVME_KEYRING_H +#include <linux/key.h> + #if IS_ENABLED(CONFIG_NVME_KEYRING) struct key *nvme_tls_psk_refresh(struct key *keyring,
To avoid build errors when NVME_KEYRING is not set. Signed-off-by: Hannes Reinecke <hare@kernel.org> --- drivers/nvme/common/keyring.c | 1 - drivers/nvme/host/tcp.c | 1 - drivers/nvme/target/tcp.c | 1 - include/linux/nvme-keyring.h | 2 ++ 4 files changed, 2 insertions(+), 3 deletions(-)