Commit a9aa31cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.4/drivers' of git://git.kernel.dk/linux-block 

Pull block driver updates from Jens Axboe:
 "Here are the block driver changes for 4.4.  This pull request
  contains:

   - NVMe:
        - Refactor and moving of code to prepare for proper target
          support. From Christoph and Jay.

        - 32-bit nvme warning fix from Arnd.

        - Error initialization fix from me.

        - Proper namespace removal and reference counting support from
          Keith.

        - Device resume fix on IO failure, also from Keith.

        - Dependency fix from Keith, now that nvme isn't under the
          umbrella of the block anymore.

        - Target location and maintainers update from Jay.

   - From Ming Lei, the long awaited DIO/AIO support for loop.

   - Enable BD-RE writeable opens, from Georgios"

* 'for-4.4/drivers' of git://git.kernel.dk/linux-block: (24 commits)
  Update target repo for nvme patch contributions
  NVMe: initialize error to '0'
  nvme: use an integer value to Linux errno values
  nvme: fix 32-bit build warning
  NVMe: Add explicit block config dependency
  nvme: include <linux/types.ĥ> in <linux/nvme.h>
  nvme: move to a new drivers/nvme/host directory
  nvme.h: add missing nvme_id_ctrl endianess annotations
  nvme: move hardware structures out of the uapi version of nvme.h
  nvme: add a local nvme.h header
  nvme: properly handle partially initialized queues in nvme_create_io_queues
  nvme: merge nvme_dev_start, nvme_dev_resume and nvme_async_probe
  nvme: factor reset code into a common helper
  nvme: merge nvme_dev_reset into nvme_reset_failed_dev
  nvme: delete dev from dev_list in nvme_reset
  NVMe: Simplify device resume on io queue failure
  NVMe: Namespace removal simplifications
  NVMe: Reference count open namespaces
  cdrom: Random writing support for BD-RE media
  block: loop: support DIO & AIO
  ...
parents d9734e0d b3975e94

MAINTAINERS

+5 −3
Original line number Diff line number Diff line
@@ -7486,11 +7486,13 @@ F: drivers/video/fbdev/riva/ 
F:	drivers/video/fbdev/nvidia/



NVM EXPRESS DRIVER

M:	Matthew Wilcox <willy@linux.intel.com>

M:	Keith Busch <keith.busch@intel.com>

M:	Jens Axboe <axboe@fb.com>

L:	linux-nvme@lists.infradead.org

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

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git

W:	https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/

S:	Supported

F:	drivers/block/nvme*

F:	drivers/nvme/host/

F:	include/linux/nvme.h



NVMEM FRAMEWORK

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ source "drivers/pnp/Kconfig" 


source "drivers/block/Kconfig"



source "drivers/nvme/Kconfig"



# misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4



source "drivers/misc/Kconfig"

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ obj-$(CONFIG_NUBUS) += nubus/ 
obj-y				+= macintosh/

obj-$(CONFIG_IDE)		+= ide/

obj-$(CONFIG_SCSI)		+= scsi/

obj-y				+= nvme/

obj-$(CONFIG_ATA)		+= ata/

obj-$(CONFIG_TARGET_CORE)	+= target/

obj-$(CONFIG_MTD)		+= mtd/

drivers/block/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -310,17 +310,6 @@ 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_SKD

	tristate "STEC S1120 Block Driver"

	depends on PCI

drivers/block/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 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_SKD)	+= skd.o

obj-$(CONFIG_BLK_DEV_OSD)	+= osdblk.o
@@ -44,6 +43,5 @@ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/ 
obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o

obj-$(CONFIG_ZRAM) += zram/



nvme-y		:= nvme-core.o nvme-scsi.o

skd-y		:= skd_main.o

swim_mod-y	:= swim.o swim_asm.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE