Merge branch 'for-4.11/block' into for-4.11/linus-merge (6010720d) · Commits · 戴 / test

Documentation/cdrom/cdrom-standard.tex

+1 −8

Original line number	Diff line number	Diff line
		@@ -249,7 +249,6 @@ struct& cdrom_device_ops\ \{ \hidewidth\cr
		unsigned\ long);\cr
		\noalign{\medskip}
		&const\ int& capability;& capability flags \cr
		&int& n_minors;& number of active minor devices \cr
		\};\cr
		}
		$$
		@@ -258,13 +257,7 @@ it should add a function pointer to this $struct$. When a particular
		function is not implemented, however, this $struct$ should contain a
		NULL instead. The $capability$ flags specify the capabilities of the
		\cdrom\ hardware and/or low-level \cdrom\ driver when a \cdrom\ drive
		is registered with the \UCD. The value $n_minors$ should be a positive
		value indicating the number of minor devices that are supported by
		the low-level device driver, normally~1. Although these two variables
		are `informative' rather than `operational,' they are included in
		$cdrom_device_ops$ because they describe the capability of the {\em
		driver\/} rather than the {\em drive}. Nomenclature has always been
		difficult in computer programming.
		is registered with the \UCD.

		Note that most functions have fewer parameters than their
		$blkdev_fops$ counterparts. This is because very little of the

+13 −2

Original line number	Diff line number	Diff line
		@@ -8612,10 +8612,10 @@ S: Maintained
		F: drivers/net/ethernet/netronome/

		NETWORK BLOCK DEVICE (NBD)
		M: Markus Pargmann <mpa@pengutronix.de>
		M: Josef Bacik <jbacik@fb.com>
		S: Maintained
		L: linux-block@vger.kernel.org
		L: nbd-general@lists.sourceforge.net
		T: git git://git.pengutronix.de/git/mpa/linux-nbd.git
		F: Documentation/blockdev/nbd.txt
		F: drivers/block/nbd.c
		F: include/uapi/linux/nbd.h
		@@ -11089,6 +11089,17 @@ L: linux-mmc@vger.kernel.org
		S: Maintained
		F: drivers/mmc/host/sdhci-spear.c

		SECURE ENCRYPTING DEVICE (SED) OPAL DRIVER
		M: Scott Bauer <scott.bauer@intel.com>
		M: Jonathan Derrick <jonathan.derrick@intel.com>
		M: Rafael Antognolli <rafael.antognolli@intel.com>
		L: linux-block@vger.kernel.org
		S: Supported
		F: block/sed*
		F: block/opal_proto.h
		F: include/linux/sed*
		F: include/uapi/linux/sed*

		SECURITY SUBSYSTEM
		M: James Morris <james.l.morris@oracle.com>
		M: "Serge E. Hallyn" <serge@hallyn.com>

+19 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,25 @@ config BLK_WBT_MQ
		Multiqueue currently doesn't have support for IO scheduling,
		enabling this option is recommended.

		config BLK_DEBUG_FS
		bool "Block layer debugging information in debugfs"
		default y
		depends on DEBUG_FS
		---help---
		Include block layer debugging information in debugfs. This information
		is mostly useful for kernel developers, but it doesn't incur any cost
		at runtime.

		Unless you are building a kernel for a tiny system, you should
		say Y here.

		config BLK_SED_OPAL
		bool "Logic for interfacing with Opal enabled SEDs"
		---help---
		Builds Logic for interfacing with Opal enabled controllers.
		Enabling this option enables users to setup/unlock/lock
		Locking ranges for SED devices using the Opal protocol.

		menu "Partition Types"

		source "block/partitions/Kconfig"

+50 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,56 @@ config DEFAULT_IOSCHED
		default "cfq" if DEFAULT_CFQ
		default "noop" if DEFAULT_NOOP

		config MQ_IOSCHED_DEADLINE
		tristate "MQ deadline I/O scheduler"
		default y
		---help---
		MQ version of the deadline IO scheduler.

		config MQ_IOSCHED_NONE
		bool
		default y

		choice
		prompt "Default single-queue blk-mq I/O scheduler"
		default DEFAULT_SQ_NONE
		help
		Select the I/O scheduler which will be used by default for blk-mq
		managed block devices with a single queue.

		config DEFAULT_SQ_DEADLINE
		bool "MQ Deadline" if MQ_IOSCHED_DEADLINE=y

		config DEFAULT_SQ_NONE
		bool "None"

		endchoice

		config DEFAULT_SQ_IOSCHED
		string
		default "mq-deadline" if DEFAULT_SQ_DEADLINE
		default "none" if DEFAULT_SQ_NONE

		choice
		prompt "Default multi-queue blk-mq I/O scheduler"
		default DEFAULT_MQ_NONE
		help
		Select the I/O scheduler which will be used by default for blk-mq
		managed block devices with multiple queues.

		config DEFAULT_MQ_DEADLINE
		bool "MQ Deadline" if MQ_IOSCHED_DEADLINE=y

		config DEFAULT_MQ_NONE
		bool "None"

		endchoice

		config DEFAULT_MQ_IOSCHED
		string
		default "mq-deadline" if DEFAULT_MQ_DEADLINE
		default "none" if DEFAULT_MQ_NONE

		endmenu

		endif

+4 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-tag.o blk-sysfs.o \
		blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
		blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
		blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \
		blk-mq-sysfs.o blk-mq-cpumap.o ioctl.o \
		blk-mq-sysfs.o blk-mq-cpumap.o blk-mq-sched.o ioctl.o \
		genhd.o scsi_ioctl.o partition-generic.o ioprio.o \
		badblocks.o partitions/

		@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
		obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
		obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
		obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
		obj-$(CONFIG_MQ_IOSCHED_DEADLINE) += mq-deadline.o

		obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
		obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
		@@ -25,3 +26,5 @@ obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
		obj-$(CONFIG_BLK_MQ_PCI) += blk-mq-pci.o
		obj-$(CONFIG_BLK_DEV_ZONED) += blk-zoned.o
		obj-$(CONFIG_BLK_WBT) += blk-wbt.o
		obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
		obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o