Re: [GIT PULL] nvme updates for Linux 7.4

[Keith Busch <kbusch@kernel.org>]

On Thu, Oct 29, 2026 at 08:34:29AM -0600, Keith Busch wrote:
> The following changes since commit 40d070cbb1906896d6fd65c39722d2411830ed9f:
> 
>   block: restore the iterator when rejecting a misaligned bio (2026-10-20 11:11:45 -0600)
> 
> are available in the Git repository at:
> 
>   git://git.infradead.org/nvme.git tags/nvme-7.4-2026-10-28
> 
> for you to fetch changes up to 89480d137bf0d943a82c64f86ae2407a15276b5e:
> 
>   nvmet: don't clear sq->ctrl for a Connect with sqsize 0 (2026-10-28 11:41:43 -0700)

Oh, just fyi, there were some late fixes in nvme-7.3 that are causing a
conflict. Here is my remerge-diff resolution:

---
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
remerge CONFLICT (content): Merge conflict in drivers/nvme/host/multipath.c
index 97e5c41e5e2a4..9e0a0fd77c56e 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -874,12 +874,8 @@ static int nvme_parse_ana_log(struct nvme_ctrl *ctrl, void *data,
 		u32 nr_nsids;
 		size_t nsid_buf_size;
 
-<<<<<<< aa977f5d96745 (block: fix kernel-doc warnings in blk-map.c and blk-mq-dma.c)
 		if (WARN_ON_ONCE(offset > ctrl->ana_log_size ||
 				 sizeof(*desc) > ctrl->ana_log_size - offset))
-=======
-		if (WARN_ON_ONCE(ctrl->ana_log_size - offset < sizeof(*desc)))
->>>>>>> 89480d137bf0d (nvmet: don't clear sq->ctrl for a Connect with sqsize 0)
 			return -EINVAL;
 
 		nr_nsids = le32_to_cpu(desc->nnsids);
@@ -895,11 +891,7 @@ static int nvme_parse_ana_log(struct nvme_ctrl *ctrl, void *data,
 			return -EINVAL;
 
 		offset += sizeof(*desc);
-<<<<<<< aa977f5d96745 (block: fix kernel-doc warnings in blk-map.c and blk-mq-dma.c)
 		if (WARN_ON_ONCE(nsid_buf_size > ctrl->ana_log_size - offset))
-=======
-		if (WARN_ON_ONCE(ctrl->ana_log_size - offset < nsid_buf_size))
->>>>>>> 89480d137bf0d (nvmet: don't clear sq->ctrl for a Connect with sqsize 0)
 			return -EINVAL;
 
 		error = cb(ctrl, desc, data);
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
remerge CONFLICT (content): Merge conflict in drivers/nvme/host/tcp.c
index 4874d6c5b32e5..bc46e5f3eaa79 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1582,17 +1582,6 @@ static void nvme_tcp_free_queue(struct nvme_ctrl *nctrl, int qid)
 	memalloc_noio_restore(noio_flag);
 
 	kfree(queue->pdu);
-<<<<<<< aa977f5d96745 (block: fix kernel-doc warnings in blk-map.c and blk-mq-dma.c)
-	mutex_destroy(&queue->send_mutex);
-	mutex_destroy(&queue->queue_lock);
-	mutex_destroy(&queue->pf_cache_lock);
-=======
-
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-	lockdep_unregister_key(&queue->nvme_tcp_sk_key);
-	lockdep_unregister_key(&queue->nvme_tcp_slock_key);
-#endif
->>>>>>> 89480d137bf0d (nvmet: don't clear sq->ctrl for a Connect with sqsize 0)
 }
 
 static int nvme_tcp_recv_tls_alert(struct nvme_tcp_queue *queue,
@@ -2173,17 +2162,6 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid,
 	/* Use sync variant - see nvme_tcp_free_queue() for explanation */
 	__fput_sync(queue->sock->file);
 	queue->sock = NULL;
-<<<<<<< aa977f5d96745 (block: fix kernel-doc warnings in blk-map.c and blk-mq-dma.c)
-err_destroy_mutex:
-	mutex_destroy(&queue->send_mutex);
-	mutex_destroy(&queue->queue_lock);
-	mutex_destroy(&queue->pf_cache_lock);
-=======
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-	lockdep_unregister_key(&queue->nvme_tcp_sk_key);
-	lockdep_unregister_key(&queue->nvme_tcp_slock_key);
-#endif
->>>>>>> 89480d137bf0d (nvmet: don't clear sq->ctrl for a Connect with sqsize 0)
 	return ret;
 }
 
--