Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16008d64 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-3.3/drivers' of git://git.kernel.dk/linux-block:
  mtip32xx: do rebuild monitoring asynchronously
  xen-blkfront: Use kcalloc instead of kzalloc to allocate array
  mtip32xx: uninitialized variable in mtip_quiesce_io()
  mtip32xx: updates based on feedback
  xen-blkback: convert hole punching to discard request on loop devices
  xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io
  xen/blk[front|back]: Enhance discard support with secure erasing support.
  xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together
  mtip32xx: update to new ->make_request() API
  mtip32xx: add module.h include to avoid conflict with moduleh tree
  mtip32xx: mark a few more items static
  mtip32xx: ensure that all local functions are static
  mtip32xx: cleanup compat ioctl handling
  mtip32xx: fix warnings/errors on 32-bit compiles
  block: Add driver for Micron RealSSD pcie flash cards
parents b3c9dd18 85a0f7b2

drivers/block/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ config PARIDE 


source "drivers/block/paride/Kconfig"



source "drivers/block/mtip32xx/Kconfig"



config BLK_CPQ_DA

	tristate "Compaq SMART2 support"

	depends on PCI && VIRT_TO_BUS

drivers/block/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,5 +39,6 @@ obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o 
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

drivers/block/mtip32xx/Kconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#

# mtip32xx device driver configuration

#



config BLK_DEV_PCIESSD_MTIP32XX

	tristate "Block Device Driver for Micron PCIe SSDs"

	depends on HOTPLUG_PCI_PCIE

	help

          This enables the block driver for Micron PCIe SSDs.

drivers/block/mtip32xx/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
#

# Makefile for  Block device driver for Micron PCIe SSD

#



obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx.o