Merge branch 'for-3.13/post-mq-drivers' into for-linus (1355b37f) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/blockdev/floppy.txt

+3 −3

Original line number	Original line	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:		If you use the floppy driver as a module, use the following syntax:
	modprobe floppy <options>		modprobe floppy floppy="<options>"

	Example:		Example:
	modprobe floppy omnibook messages		modprobe floppy floppy="omnibook messages"

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

	options floppy omnibook messages		options floppy floppy="omnibook messages"

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

+11 −1

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

	config BLK_CPQ_DA		config BLK_CPQ_DA
	tristate "Compaq SMART2 support"		tristate "Compaq SMART2 support"
	depends on PCI && VIRT_TO_BUS		depends on PCI && VIRT_TO_BUS && 0
	help		help
	This is the driver for Compaq Smart Array controllers. Everyone		This is the driver for Compaq Smart Array controllers. Everyone
	using these boards should say Y here. See the file		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		To compile this driver as a module, choose M here: the
	module will be called nvme.		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		config BLK_DEV_OSD
	tristate "OSD object-as-blkdev support"		tristate "OSD object-as-blkdev support"
	depends on SCSI_OSD_ULD		depends on SCSI_OSD_ULD

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ obj-$(CONFIG_CDROM_PKTCDVD) += pktcdvd.o
	obj-$(CONFIG_MG_DISK) += mg_disk.o		obj-$(CONFIG_MG_DISK) += mg_disk.o
	obj-$(CONFIG_SUNVDC) += sunvdc.o		obj-$(CONFIG_SUNVDC) += sunvdc.o
	obj-$(CONFIG_BLK_DEV_NVME) += nvme.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_OSD) += osdblk.o

	obj-$(CONFIG_BLK_DEV_UMEM) += umem.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		obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk.o

	nvme-y := nvme-core.o nvme-scsi.o		nvme-y := nvme-core.o nvme-scsi.o
			skd-y := skd_main.o
	swim_mod-y := swim.o swim_asm.o		swim_mod-y := swim.o swim_asm.o

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5183,7 +5183,7 @@ static int cciss_init_one(struct pci_dev pdev, const struct pci_device_id ent)
	rebuild_lun_table(h, 1, 0);		rebuild_lun_table(h, 1, 0);
	cciss_engage_scsi(h);		cciss_engage_scsi(h);
	h->busy_initializing = 0;		h->busy_initializing = 0;
	return 1;		return 0;

	clean4:		clean4:
	cciss_free_cmd_pool(h);		cciss_free_cmd_pool(h);

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1474,7 +1474,8 @@ enum determine_dev_size {
	DS_ERROR = -1,		DS_ERROR = -1,
	DS_UNCHANGED = 0,		DS_UNCHANGED = 0,
	DS_SHRUNK = 1,		DS_SHRUNK = 1,
	DS_GREW = 2		DS_GREW = 2,
			DS_GREW_FROM_ZERO = 3,
	};		};
	extern enum determine_dev_size		extern enum determine_dev_size
	drbd_determine_dev_size(struct drbd_conf , enum dds_flags, struct resize_parms ) __must_hold(local);		drbd_determine_dev_size(struct drbd_conf , enum dds_flags, struct resize_parms ) __must_hold(local);