Merge branch 'linus' into sched/urgent, to pick up fixes and updates (ea2a6af5) · Commits · e / devices / android_kernel_teracube_emerald

CREDITS

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1564,6 +1564,11 @@ W: http://www.carumba.com/
	D: bug toaster (A1 sauce makes all the difference)		D: bug toaster (A1 sauce makes all the difference)
	D: Random linux hacker		D: Random linux hacker

			N: James Hogan
			E: jhogan@kernel.org
			D: Metag architecture maintainer
			D: TZ1090 SoC maintainer

	N: Tim Hockin		N: Tim Hockin
	E: thockin@hockin.org		E: thockin@hockin.org
	W: http://www.hockin.org/~thockin		W: http://www.hockin.org/~thockin

Documentation/00-INDEX

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -66,8 +66,6 @@ backlight/
	- directory with info on controlling backlights in flat panel displays		- directory with info on controlling backlights in flat panel displays
	bcache.txt		bcache.txt
	- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.		- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.
	blackfin/
	- directory with documentation for the Blackfin arch.
	block/		block/
	- info on the Block I/O (BIO) layer.		- info on the Block I/O (BIO) layer.
	blockdev/		blockdev/
	@@ -114,8 +112,6 @@ cputopology.txt
	- documentation on how CPU topology info is exported via sysfs.		- documentation on how CPU topology info is exported via sysfs.
	crc32.txt		crc32.txt
	- brief tutorial on CRC computation		- brief tutorial on CRC computation
	cris/
	- directory with info about Linux on CRIS architecture.
	crypto/		crypto/
	- directory with info on the Crypto API.		- directory with info on the Crypto API.
	dcdbas.txt		dcdbas.txt
	@@ -172,8 +168,6 @@ fmc/
	- information about the FMC bus abstraction		- information about the FMC bus abstraction
	fpga/		fpga/
	- FPGA Manager Core.		- FPGA Manager Core.
	frv/
	- Fujitsu FR-V Linux documentation.
	futex-requeue-pi.txt		futex-requeue-pi.txt
	- info on requeueing of tasks from a non-PI futex to a PI futex		- info on requeueing of tasks from a non-PI futex to a PI futex
	gcc-plugins.txt		gcc-plugins.txt
	@@ -276,8 +270,6 @@ memory-hotplug.txt
	- Hotpluggable memory support, how to use and current status.		- Hotpluggable memory support, how to use and current status.
	men-chameleon-bus.txt		men-chameleon-bus.txt
	- info on MEN chameleon bus.		- info on MEN chameleon bus.
	metag/
	- directory with info about Linux on Meta architecture.
	mic/		mic/
	- Intel Many Integrated Core (MIC) architecture device driver.		- Intel Many Integrated Core (MIC) architecture device driver.
	mips/		mips/
	@@ -286,8 +278,6 @@ misc-devices/
	- directory with info about devices using the misc dev subsystem		- directory with info about devices using the misc dev subsystem
	mmc/		mmc/
	- directory with info about the MMC subsystem		- directory with info about the MMC subsystem
	mn10300/
	- directory with info about the mn10300 architecture port
	mtd/		mtd/
	- directory with info about memory technology devices (flash)		- directory with info about memory technology devices (flash)
	namespaces/		namespaces/

Documentation/admin-guide/README.rst

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,8 @@ On what hardware does it run?
	Although originally developed first for 32-bit x86-based PCs (386 or higher),		Although originally developed first for 32-bit x86-based PCs (386 or higher),
	today Linux also runs on (at least) the Compaq Alpha AXP, Sun SPARC and		today Linux also runs on (at least) the Compaq Alpha AXP, Sun SPARC and
	UltraSPARC, Motorola 68000, PowerPC, PowerPC64, ARM, Hitachi SuperH, Cell,		UltraSPARC, Motorola 68000, PowerPC, PowerPC64, ARM, Hitachi SuperH, Cell,
	IBM S/390, MIPS, HP PA-RISC, Intel IA-64, DEC VAX, AMD x86-64, AXIS CRIS,		IBM S/390, MIPS, HP PA-RISC, Intel IA-64, DEC VAX, AMD x86-64 Xtensa, and
	Xtensa, Tilera TILE, ARC and Renesas M32R architectures.		ARC architectures.

	Linux is easily portable to most general-purpose 32- or 64-bit architectures		Linux is easily portable to most general-purpose 32- or 64-bit architectures
	as long as they have a paged memory management unit (PMMU) and a port of the		as long as they have a paged memory management unit (PMMU) and a port of the

Documentation/admin-guide/kernel-parameters.rst

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,6 @@ parameter is applicable::
	APM Advanced Power Management support is enabled.		APM Advanced Power Management support is enabled.
	ARM ARM architecture is enabled.		ARM ARM architecture is enabled.
	AX25 Appropriate AX.25 support is enabled.		AX25 Appropriate AX.25 support is enabled.
	BLACKFIN Blackfin architecture is enabled.
	CLK Common clock infrastructure is enabled.		CLK Common clock infrastructure is enabled.
	CMA Contiguous Memory Area support is enabled.		CMA Contiguous Memory Area support is enabled.
	DRM Direct Rendering Management support is enabled.		DRM Direct Rendering Management support is enabled.

Documentation/admin-guide/kernel-parameters.txt

+21 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1025,7 +1025,7 @@
	address. The serial port must already be setup		address. The serial port must already be setup
	and configured. Options are not yet supported.		and configured. Options are not yet supported.

	earlyprintk= [X86,SH,BLACKFIN,ARM,M68k,S390]		earlyprintk= [X86,SH,ARM,M68k,S390]
	earlyprintk=vga		earlyprintk=vga
	earlyprintk=efi		earlyprintk=efi
	earlyprintk=sclp		earlyprintk=sclp
	@@ -1347,10 +1347,6 @@
	If specified, z/VM IUCV HVC accepts connections		If specified, z/VM IUCV HVC accepts connections
	from listed z/VM user IDs only.		from listed z/VM user IDs only.

	hwthread_map= [METAG] Comma-separated list of Linux cpu id to
	hardware thread id mappings.
	Format: <cpu>:<hwthread>

	keep_bootcon [KNL]		keep_bootcon [KNL]
	Do not unregister boot console at start. This is only		Do not unregister boot console at start. This is only
	useful for debugging when something happens in the window		useful for debugging when something happens in the window
	@@ -1766,6 +1762,17 @@

	nohz		nohz
	Disable the tick when a single task runs.		Disable the tick when a single task runs.

			A residual 1Hz tick is offloaded to workqueues, which you
			need to affine to housekeeping through the global
			workqueue's affinity configured via the
			/sys/devices/virtual/workqueue/cpumask sysfs file, or
			by using the 'domain' flag described below.

			NOTE: by default the global workqueue runs on all CPUs,
			so to protect individual CPUs the 'cpumask' file has to
			be configured manually after bootup.

	domain		domain
	Isolate from the general SMP balancing and scheduling		Isolate from the general SMP balancing and scheduling
	algorithms. Note that performing domain isolation this way		algorithms. Note that performing domain isolation this way
	@@ -2237,6 +2244,15 @@
	The memory region may be marked as e820 type 12 (0xc)		The memory region may be marked as e820 type 12 (0xc)
	and is NVDIMM or ADR memory.		and is NVDIMM or ADR memory.

			memmap=<size>%<offset>-<oldtype>+<newtype>
			[KNL,ACPI] Convert memory within the specified region
			from <oldtype> to <newtype>. If "-<oldtype>" is left
			out, the whole region will be marked as <newtype>,
			even if previously unavailable. If "+<newtype>" is left
			out, matching memory will be removed. Types are
			specified as e820 types, e.g., 1 = RAM, 2 = reserved,
			3 = ACPI, 12 = PRAM.

	memory_corruption_check=0/1 [X86]		memory_corruption_check=0/1 [X86]
	Some BIOSes seem to corrupt the first 64k of		Some BIOSes seem to corrupt the first 64k of
	memory when doing things like suspend/resume.		memory when doing things like suspend/resume.