Merge remote-tracking branches 'asoc/fix/compress', 'asoc/fix/core',... (ce8ee02d) · Commits · 戴 / test

.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-bus-iio-dfsdm-adc-stm32

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/iio/devices/iio:deviceX/in_voltage_spi_clk_freq
		KernelVersion: 4.14
		Contact: arnaud.pouliquen@st.com
		Description:
		For audio purpose only.
		Used by audio driver to set/get the spi input frequency.
		This is mandatory if DFSDM is slave on SPI bus, to
		provide information on the SPI clock frequency during runtime
		Notice that the SPI frequency should be a multiple of sample
		frequency to ensure the precision.
		if DFSDM input is SPI master
		Reading SPI clkout frequency,
		error on writing
		If DFSDM input is SPI Slave:
		Reading returns value previously set.
		Writing value before starting conversions.
		No newline at end of file

Documentation/admin-guide/kernel-parameters.rst

+1 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,7 @@ parameter is applicable::
		IPV6 IPv6 support is enabled.
		ISAPNP ISA PnP code is enabled.
		ISDN Appropriate ISDN support is enabled.
		ISOL CPU Isolation is enabled.
		JOY Appropriate joystick support is enabled.
		KGDB Kernel debugger support is enabled.
		KVM Kernel Virtual Machine support is enabled.

Documentation/admin-guide/kernel-parameters.txt

+15 −3

Original line number	Diff line number	Diff line
		@@ -328,11 +328,15 @@
		not play well with APC CPU idle - disable it if you have
		APC and your system crashes randomly.

		apic= [APIC,X86-32] Advanced Programmable Interrupt Controller
		apic= [APIC,X86] Advanced Programmable Interrupt Controller
		Change the output verbosity whilst booting
		Format: { quiet (default) \| verbose \| debug }
		Change the amount of debugging information output
		when initialising the APIC and IO-APIC components.
		For X86-32, this can also be used to specify an APIC
		driver name.
		Format: apic=driver_name
		Examples: apic=bigsmp

		apic_extnmi= [APIC,X86] External NMI delivery setting
		Format: { bsp (default) \| all \| none }
		@@ -1737,7 +1741,7 @@
		isapnp= [ISAPNP]
		Format: <RDP>,<reset>,<pci_scan>,<verbosity>

		isolcpus= [KNL,SMP] Isolate a given set of CPUs from disturbance.
		isolcpus= [KNL,SMP,ISOL] Isolate a given set of CPUs from disturbance.
		[Deprecated - use cpusets instead]
		Format: [flag-list,]<cpu-list>

		@@ -2662,7 +2666,7 @@
		Valid arguments: on, off
		Default: on

		nohz_full= [KNL,BOOT]
		nohz_full= [KNL,BOOT,SMP,ISOL]
		The argument is a cpu list, as described above.
		In kernels built with CONFIG_NO_HZ_FULL=y, set
		the specified list of CPUs whose tick will be stopped
		@@ -2708,6 +2712,8 @@
		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.
		@@ -3282,6 +3288,12 @@
		pt. [PARIDE]
		See Documentation/blockdev/paride.txt.

		pti= [X86_64]
		Control user/kernel address space isolation:
		on - enable
		off - disable
		auto - default setting

		pty.legacy_count=
		[KNL] Number of legacy pty's. Overwrites compiled-in
		default number.

Documentation/admin-guide/thunderbolt.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ If supported by your machine this will be exposed by the WMI bus with
		a sysfs attribute called "force_power".

		For example the intel-wmi-thunderbolt driver exposes this attribute in:
		/sys/devices/platform/PNP0C14:00/wmi_bus/wmi_bus-PNP0C14:00/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power
		/sys/bus/wmi/devices/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power

		To force the power to on, write 1 to this attribute file.
		To disable force power, write 0 to this attribute file.

Admin message