From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Nov 2013 03:13:05 +0000 (+0900)
Subject: Merge branch 'for-3.13/drivers' of git://git.kernel.dk/linux-block
X-Git-Tag: v4.9.8~7472
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5eea9be8b2478dbc2f9fb1cd6228a90e8dba804e;p=platform%2Fkernel%2Flinux-rpi3.git

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

5eea9be8b2478dbc2f9fb1cd6228a90e8dba804e
diff --cc drivers/block/Makefile
index 03b3b4a,f33b366..8cc98cd
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@@ -41,7 -42,7 +42,8 @@@ obj-$(CONFIG_BLK_DEV_RBD)     += rbd.
  obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX)	+= mtip32xx/
  
  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