Skip to contentSkip to conversation

Tree updated 2013-05-17

DISCUSSION Matthew Wilcox 2 participants 3 messages May 17, 2013 – May 29, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

I've pulled in a few fixes:

Dan Carpenter (2):
MAINTAINERS: update NVM EXPRESS DRIVER file list
NVMe: check for integer overflow in nvme_map_user_pages()

Keith Busch (1):
NVMe: Do not cancel command multiple times

Sachin Kamat (1):
NVMe: Remove redundant version.h header include

Vishal Verma (1):
NVMe: Fix a signedness bug in nvme_trans_modesel_get_mp

Wei Yongjun (1):
NVMe: fix error return code in nvme_submit_bio_queue()

I'll ask Linus to pull them next week, and they should be in 3.10.

I've also set up separate branches for "just fixes" (fixes-3.10) and features / improvements that aren't bug fixes (master). Right now, they're the same, but I would expect them to diverge fairly shortly.

#2 lore raw

Tree updated 2013-05-29

In reply to Matthew Wilcox
Quoted 10 lines · Matthew Wilcox

Chayan Biswas (1):
Return the result from user admin command IOCTL even in case of failure

Matthew Wilcox (1):
NVMe: Use dma_set_mask() correctly

Ramachandra Rao Gajula (1):
NVMe: Add MSI support

I'll ask Linus to pull on Friday. Please test.

In the MSI patch, there's a missing 'break' after the 'result == 0' case. Otherwise everything looks good to me.

drivers/block/nvme-core.c +1 -0
index 584586f..ce79a59 100644
@@ -1681,6 +1681,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
  			if (result == 0) {
  				for (i = 0; i < nr_io_queues; i++)
  					dev->entry[i].vector = i + pdev->irq;
+                               break;
  			} else if (result > 0) {
  				nr_io_queues = result;
  				continue;
#1 lore raw

Tree updated 2013-05-29

In reply to Matthew Wilcox
Quoted 1 line · Matthew Wilcox

I've pulled in a few fixes:

[...]

Quoted 1 line

I'll ask Linus to pull them next week, and they should be in 3.10.

I didn't end up asking for a pull. I pulled in three more fixes:

Chayan Biswas (1):
Return the result from user admin command IOCTL even in case of failure

Matthew Wilcox (1):
NVMe: Use dma_set_mask() correctly

Ramachandra Rao Gajula (1):
NVMe: Add MSI support

I'll ask Linus to pull on Friday. Please test.