diff --git a/[refs] b/[refs] index e1562edb0feb..704b57cadb2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa92282149842645931580225647238428374758 +refs/heads/master: 19e899b2f9f89f4a290dd5c9c24d15987a18ab21 diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index 740a9c1b81aa..d4f95eb51dc1 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/drivers/block/nvme.c @@ -245,7 +245,6 @@ static int nvme_submit_cmd(struct nvme_queue *nvmeq, struct nvme_command *cmd) { unsigned long flags; u16 tail; - /* XXX: Need to check tail isn't going to overrun head */ spin_lock_irqsave(&nvmeq->q_lock, flags); tail = nvmeq->sq_tail; memcpy(&nvmeq->sq_cmds[tail], cmd, sizeof(*cmd)); diff --git a/trunk/include/linux/nvme.h b/trunk/include/linux/nvme.h index c46a9b7988fb..6b5a8d19daf5 100644 --- a/trunk/include/linux/nvme.h +++ b/trunk/include/linux/nvme.h @@ -323,7 +323,6 @@ struct nvme_command { }; }; -/* XXX: Sync with spec */ enum { NVME_SC_SUCCESS = 0x0, NVME_SC_INVALID_OPCODE = 0x1,