Commit 92b5abbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/users/willy/linux-nvme 

* git://git.infradead.org/users/willy/linux-nvme: (105 commits)
  NVMe: Set number of queues correctly
  NVMe: Version 0.8
  NVMe: Set queue flags correctly
  NVMe: Simplify nvme_unmap_user_pages
  NVMe: Mark the end of the sg list
  NVMe: Fix DMA mapping for admin commands
  NVMe: Rename IO_TIMEOUT to NVME_IO_TIMEOUT
  NVMe: Merge the nvme_bio and nvme_prp data structures
  NVMe: Change nvme_completion_fn to take a dev
  NVMe: Change get_nvmeq to take a dev instead of a namespace
  NVMe: Simplify completion handling
  NVMe: Update Identify Controller data structure
  NVMe: Implement doorbell stride capability
  NVMe: Version 0.7
  NVMe: Don't probe namespace 0
  Fix calculation of number of pages in a PRP List
  NVMe: Create nvme_identify and nvme_get_features functions
  NVMe: Fix memory leak in nvme_dev_add()
  NVMe: Fix calls to dma_unmap_sg
  NVMe: Correct sg list setup in nvme_map_user_pages
  ...
parents ccb19d26 df348139

Documentation/ioctl/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ Code Seq#(hex) Include File Comments 
'M'	01-03	drivers/scsi/megaraid/megaraid_sas.h

'M'	00-0F	drivers/video/fsl-diu-fb.h	conflict!

'N'	00-1F	drivers/usb/scanner.h

'N'	40-7F	drivers/block/nvme.c

'O'     00-06   mtd/ubi-user.h		UBI

'P'	all	linux/soundcard.h	conflict!

'P'	60-6F	sound/sscape_ioctl.h	conflict!

drivers/block/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -317,6 +317,17 @@ config BLK_DEV_NBD 


	  If unsure, say N.



config BLK_DEV_NVME

	tristate "NVM Express block device"

	depends on PCI

	---help---

	  The NVM Express driver is for solid state drives directly

	  connected to the PCI or PCI Express bus.  If you know you

	  don't have one of these, it is safe to answer N.



	  To compile this driver as a module, choose M here: the

	  module will be called nvme.



config BLK_DEV_OSD

	tristate "OSD object-as-blkdev support"

	depends on SCSI_OSD_ULD

drivers/block/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ obj-$(CONFIG_XILINX_SYSACE) += xsysace.o 
obj-$(CONFIG_CDROM_PKTCDVD)	+= pktcdvd.o

obj-$(CONFIG_MG_DISK)		+= mg_disk.o

obj-$(CONFIG_SUNVDC)		+= sunvdc.o

obj-$(CONFIG_BLK_DEV_NVME)	+= nvme.o

obj-$(CONFIG_BLK_DEV_OSD)	+= osdblk.o



obj-$(CONFIG_BLK_DEV_UMEM)	+= umem.o

drivers/block/nvme.c

0 → 100644
+1745 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/xen/biomerge.c

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, 
	return __BIOVEC_PHYS_MERGEABLE(vec1, vec2) &&

		((mfn1 == mfn2) || ((mfn1+1) == mfn2));

}

EXPORT_SYMBOL(xen_biovec_phys_mergeable);

CRA Git | Maintained and supported by SUSTech CRA and CCSE