Merge 4.15-rc8 into usb-next (c182ce9b) · Commits · e / devices / android_kernel_fairphone_FP5

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
		Matthieu CASTET <castet.matthieu@free.fr>

Documentation/ABI/testing/sysfs-devices-system-cpu

+16 −0

Original line number	Diff line number	Diff line
		@@ -375,3 +375,19 @@ Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
		Description: information about CPUs heterogeneity.

		cpu_capacity: capacity of cpu#.

		What: /sys/devices/system/cpu/vulnerabilities
		/sys/devices/system/cpu/vulnerabilities/meltdown
		/sys/devices/system/cpu/vulnerabilities/spectre_v1
		/sys/devices/system/cpu/vulnerabilities/spectre_v2
		Date: January 2018
		Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
		Description: Information about CPU vulnerabilities

		The files are named after the code names of CPU
		vulnerabilities. The output of those files reflects the
		state of the CPUs in the system. Possible output values:

		"Not affected" CPU is not affected by the vulnerability
		"Vulnerable" CPU is affected and no mitigation in effect
		"Mitigation: $M" CPU is affected and mitigation $M is in effect

Documentation/admin-guide/kernel-parameters.txt

+48 −10

Original line number	Diff line number	Diff line
		@@ -713,9 +713,6 @@
		It will be ignored when crashkernel=X,high is not used
		or memory reserved is below 4G.

		crossrelease_fullstack
		[KNL] Allow to record full stack trace in cross-release

		cryptomgr.notests
		[KNL] Disable crypto self-tests

		@@ -2626,6 +2623,11 @@
		nosmt [KNL,S390] Disable symmetric multithreading (SMT).
		Equivalent to smt=1.

		nospectre_v2 [X86] Disable all mitigations for the Spectre variant 2
		(indirect branch prediction) vulnerability. System may
		allow data leaks with this option, which is equivalent
		to spectre_v2=off.

		noxsave [BUGS=X86] Disables x86 extended register state save
		and restore using xsave. The kernel will fallback to
		enabling legacy floating-point and sse state.
		@@ -2712,8 +2714,6 @@
		steal time is computed, but won't influence scheduler
		behaviour

		nopti [X86-64] Disable kernel page table isolation

		nolapic [X86-32,APIC] Do not enable or use the local APIC.

		nolapic_timer [X86-32,APIC] Do not use the local APIC timer.
		@@ -3100,6 +3100,12 @@
		pcie_scan_all Scan all possible PCIe devices. Otherwise we
		only look for one device below a PCIe downstream
		port.
		big_root_window Try to add a big 64bit memory window to the PCIe
		root complex on AMD CPUs. Some GFX hardware
		can resize a BAR to allow access to all VRAM.
		Adding the window is slightly risky (it may
		conflict with unreported devices), so this
		taints the kernel.

		pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power
		Management.
		@@ -3288,11 +3294,20 @@
		pt. [PARIDE]
		See Documentation/blockdev/paride.txt.

		pti= [X86_64]
		Control user/kernel address space isolation:
		on - enable
		off - disable
		auto - default setting
		pti= [X86_64] Control Page Table Isolation of user and
		kernel address spaces. Disabling this feature
		removes hardening, but improves performance of
		system calls and interrupts.

		on - unconditionally enable
		off - unconditionally disable
		auto - kernel detects whether your CPU model is
		vulnerable to issues that PTI mitigates

		Not specifying this option is equivalent to pti=auto.

		nopti [X86_64]
		Equivalent to pti=off

		pty.legacy_count=
		[KNL] Number of legacy pty's. Overwrites compiled-in
		@@ -3943,6 +3958,29 @@
		sonypi.*= [HW] Sony Programmable I/O Control Device driver
		See Documentation/laptops/sonypi.txt

		spectre_v2= [X86] Control mitigation of Spectre variant 2
		(indirect branch speculation) vulnerability.

		on - unconditionally enable
		off - unconditionally disable
		auto - kernel detects whether your CPU model is
		vulnerable

		Selecting 'on' will, and 'auto' may, choose a
		mitigation method at run time according to the
		CPU, the available microcode, the setting of the
		CONFIG_RETPOLINE configuration option, and the
		compiler with which the kernel was built.

		Specific mitigations can also be selected manually:

		retpoline - replace indirect branches
		retpoline,generic - google's original retpoline
		retpoline,amd - AMD-specific minimal thunk

		Not specifying this option is equivalent to
		spectre_v2=auto.

		spia_io_base= [HW,MTD]
		spia_fio_base=
		spia_pedr=

Documentation/filesystems/nilfs2.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ available from the following download page. At least "mkfs.nilfs2",
		cleaner or garbage collector) are required. Details on the tools are
		described in the man pages included in the package.

		Project web page: http://nilfs.sourceforge.net/
		Download page: http://nilfs.sourceforge.net/en/download.html
		Project web page: https://nilfs.sourceforge.io/
		Download page: https://nilfs.sourceforge.io/en/download.html
		List info: http://vger.kernel.org/vger-lists.html#linux-nilfs

		Caveats

Documentation/gpu/i915.rst

+1 −4

Original line number	Diff line number	Diff line
		@@ -341,10 +341,7 @@ GuC
		GuC-specific firmware loader
		----------------------------

		.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
		:doc: GuC-specific firmware loader

		.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c
		.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c
		:internal:

		GuC-based command submission