Merge tag 'v4.8-rc2' into devel (eb899417) · Commits · 戴 / test

Documentation/block/queue-sysfs.txt

+18 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,12 @@ add_random (RW)
		This file allows to turn off the disk entropy contribution. Default
		value of this file is '1'(on).

		dax (RO)
		--------
		This file indicates whether the device supports Direct Access (DAX),
		used by CPU-addressable storage to bypass the pagecache. It shows '1'
		if true, '0' if not.

		discard_granularity (RO)
		-----------------------
		This shows the size of internal allocation of the device in bytes, if
		@@ -46,6 +52,12 @@ hw_sector_size (RO)
		-------------------
		This is the hardware sector size of the device, in bytes.

		io_poll (RW)
		------------
		When read, this file shows the total number of block IO polls and how
		many returned success. Writing '0' to this file will disable polling
		for this device. Writing any non-zero value will enable this feature.

		iostats (RW)
		-------------
		This file is used to control (on/off) the iostats accounting of the
		@@ -151,5 +163,11 @@ device state. This means that it might not be safe to toggle the
		setting from "write back" to "write through", since that will also
		eliminate cache flushes issued by the kernel.

		write_same_max_bytes (RO)
		-------------------------
		This is the number of bytes the device can write in a single write-same
		command. A value of '0' means write-same is not supported by this
		device.


		Jens Axboe <jens.axboe@oracle.com>, February 2009

+1 −0

Original line number	Diff line number	Diff line
		@@ -1004,6 +1004,7 @@ N: meson
		ARM/Annapurna Labs ALPINE ARCHITECTURE
		M: Tsahee Zidenberg <tsahee@annapurnalabs.com>
		M: Antoine Tenart <antoine.tenart@free-electrons.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		F: arch/arm/mach-alpine/
		F: arch/arm/boot/dts/alpine*

+1 −8

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 8
		SUBLEVEL = 0
		EXTRAVERSION = -rc1
		EXTRAVERSION = -rc2
		NAME = Psychotic Stoned Sheep

		# DOCUMENTATION
		@@ -635,13 +635,6 @@ endif
		# Tell gcc to never replace conditional load with a non-conditional one
		KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)

		PHONY += gcc-plugins
		gcc-plugins: scripts_basic
		ifdef CONFIG_GCC_PLUGINS
		$(Q)$(MAKE) $(build)=scripts/gcc-plugins
		endif
		@:

		include scripts/Makefile.gcc-plugins

		ifdef CONFIG_READABLE_ASM

+9 −0

Original line number	Diff line number	Diff line
		@@ -461,6 +461,15 @@ config CC_STACKPROTECTOR_STRONG

		endchoice

		config HAVE_ARCH_WITHIN_STACK_FRAMES
		bool
		help
		An architecture should select this if it can walk the kernel stack
		frames to determine if an object is part of either the arguments
		or local variables (i.e. that it excludes saved return addresses,
		and similar) by implementing an inline arch_within_stack_frames(),
		which is used by CONFIG_HARDENED_USERCOPY.

		config HAVE_CONTEXT_TRACKING
		bool
		help

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ config ARM
		select HARDIRQS_SW_RESEND
		select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
		select HAVE_ARCH_BITREVERSE if (CPU_32v7M \|\| CPU_32v7) && !CPU_32v6
		select HAVE_ARCH_HARDENED_USERCOPY
		select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
		select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
		select HAVE_ARCH_MMAP_RND_BITS if MMU