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
  ...

diff --combined drivers/block/Kconfig
index a30aa103f95b33a4567b519250331725dc5f9539,35e56e1c948fa91819eaabb73130b3efa4b68eae..4e4c8a4a5fd3fb4412a19fdbd3f62647b285fd6a
--- 1/drivers/block/Kconfig
--- 2/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@@ -116,8 -116,6 +116,8 @@@ config PARID
  
  source "drivers/block/paride/Kconfig"
  
 +source "drivers/block/mtip32xx/Kconfig"
 +
  config BLK_CPQ_DA
        tristate "Compaq SMART2 support"
        depends on PCI && VIRT_TO_BUS
@@@ -317,6 -315,17 +317,17 @@@ config BLK_DEV_NB
  
          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

diff --combined drivers/block/Makefile
index ad7b74a44ef3dd3e1e1c39f7e44855e45e0bfd56,349539ad3ad95ef33a8d38e5aa30aeea7321235d..5b795059f8fb76107b5f2950dd88c5c9696ad4ee
--- 1/drivers/block/Makefile
--- 2/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@@ -23,6 -23,7 +23,7 @@@ obj-$(CONFIG_XILINX_SYSACE)   += xsysace.
  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
@@@ -39,6 -40,5 +40,6 @@@ obj-$(CONFIG_XEN_BLKDEV_FRONTEND)     += xe
  obj-$(CONFIG_XEN_BLKDEV_BACKEND)      += xen-blkback/
  obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/
  obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o
 +obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX)        += mtip32xx/
  
  swim_mod-y    := swim.o swim_asm.o