Commit 5eea9be8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block driver updates from Jens Axboe:
 "This is the block driver pull request for 3.13.  As with the core pull
  request just sent out, this was rebased on top of the core branch
  again after the immutable series was pulled.  This also means that
  bcache gets to sit the initial pull over.  I will send a second driver
  pull request in the merge window to get those fixes in, once they have
  been rebased and tested on top of the non-immutable stack.

  This pull request contains:

   - Add support for the sTec Kronos pci-e flash card from sTec.  Also
     has various cleanups for this driver, from myself, Bart, Mike
     Snizter, and Wei Yongjun.

   - Add surprise removal support for the micron mtip32xx driver from
     Micron.

   - Floppy documentation fix from Ben Harris.

   - debugfs bug fix for pktcdvd from Dan Carpenter.

   - Fix for the mtip32xx driver stack usage in the debugfs path,
     dynamically allocating those buffers instead.  From David Milburn.

   - Disable cpqarray in Kconfig.  The plan is to remove it on request
     of HP, but lets disable it for a few revisions just to see if
     anyone yells.

   - drbd fixes from Lars Ellenberg and Philipp Reisner.

   - Elevator switch fix for the s390 block driver from Heiko Carstens.

   - loop crash fix on IO to unassigned device from Mikulas Patocka.

   - A series of bug fixes for the IBM rsxx pci-e flash driver from
     Philip J Kelleher.

   - cciss probe fix from Stephen Cameron.

   - Xen block front/back fixes from Roger Pau Monne and Vegard Nossum"

* 'for-3.13/drivers' of git://git.kernel.dk/linux-block: (41 commits)
  floppy: Correct documentation of driver options when used as a module.
  pktcdvd: debugfs functions return NULL on error
  xen-blkfront: restore the non-persistent data path
  skd: fix formatting in skd_s1120.h
  skd: reorder construct/destruct code
  skd: cleanup skd_do_inq_page_da()
  skd: remove SKD_OMIT_FROM_SRC_DIST ifdefs
  skd: remove redundant skdev->pdev assignment from skd_pci_probe()
  skd: use <asm/unaligned.h>
  skd: remove SCSI subsystem specific includes
  skd: register block device only if some devices are present
  skd: fix error messages in skd_init()
  skd: fix error paths in skd_init()
  skd: fix unregister_blkdev() placement
  skd: more removal of bio-based code
  skd: cleanup the skd_*() function block wrapping
  skd: rip out bio path
  skd: fix error return code in skd_pci_probe()
  s390/dasd: hold request queue sysfs lock when calling elevator_init()
  cciss: return 0 from driver probe function on success, not 1
  ...
parents 0910c0bd f7cb20f0

Documentation/blockdev/floppy.txt

+3 −3
Original line number Diff line number Diff line
@@ -39,15 +39,15 @@ Module configuration options 
============================



 If you use the floppy driver as a module, use the following syntax:

modprobe floppy <options>

modprobe floppy floppy="<options>"



Example:

 modprobe floppy omnibook messages

 modprobe floppy floppy="omnibook messages"



 If you need certain options enabled every time you load the floppy driver,

you can put:



 options floppy omnibook messages

 options floppy floppy="omnibook messages"



in a configuration file in /etc/modprobe.d/.

drivers/block/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ source "drivers/block/mtip32xx/Kconfig" 


config BLK_CPQ_DA

	tristate "Compaq SMART2 support"

	depends on PCI && VIRT_TO_BUS

	depends on PCI && VIRT_TO_BUS && 0

	help

	  This is the driver for Compaq Smart Array controllers.  Everyone

	  using these boards should say Y here.  See the file
@@ -319,6 +319,16 @@ config BLK_DEV_NVME 
	  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

	depends on 64BIT

	---help---

	Saying Y or M here will enable support for the

	STEC, Inc. S1120 PCIe SSD.



	Use device /dev/skd$N amd /dev/skd$Np$M.



config BLK_DEV_OSD

	tristate "OSD object-as-blkdev support"

	depends on SCSI_OSD_ULD

drivers/block/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 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



obj-$(CONFIG_BLK_DEV_UMEM)	+= umem.o
@@ -44,4 +45,5 @@ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/ 
obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o



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

skd-y		:= skd_main.o

swim_mod-y	:= swim.o swim_asm.o

drivers/block/cciss.c

+1 −1
Original line number Diff line number Diff line
@@ -5183,7 +5183,7 @@ reinit_after_soft_reset: 
	rebuild_lun_table(h, 1, 0);

	cciss_engage_scsi(h);

	h->busy_initializing = 0;

	return 1;

	return 0;



clean4:

	cciss_free_cmd_pool(h);

drivers/block/drbd/drbd_int.h

+2 −1
Original line number Diff line number Diff line
@@ -1474,7 +1474,8 @@ enum determine_dev_size { 
	DS_ERROR = -1,

	DS_UNCHANGED = 0,

	DS_SHRUNK = 1,

	DS_GREW = 2

	DS_GREW = 2,

	DS_GREW_FROM_ZERO = 3,

};

extern enum determine_dev_size

drbd_determine_dev_size(struct drbd_conf *, enum dds_flags, struct resize_parms *) __must_hold(local);

CRA Git | Maintained and supported by SUSTech CRA and CCSE