Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c816bad authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.11-rc4 into staging-next 



We need the IIO fixes in here as well to handle merge issues.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents b0fe8f7b c02ed2e7

Documentation/admin-guide/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -653,6 +653,9 @@ 
	cpuidle.off=1	[CPU_IDLE]

			disable the cpuidle sub-system



	cpufreq.off=1	[CPU_FREQ]

			disable the cpufreq sub-system



	cpu_init_udelay=N

			[X86] Delay for N microsec between assert and de-assert

			of APIC INIT to start processors.  This delay occurs
@@ -1183,6 +1186,12 @@ 
			functions that can be changed at run time by the

			set_graph_notrace file in the debugfs tracing directory.



	ftrace_graph_max_depth=<uint>

			[FTRACE] Used with the function graph tracer. This is

			the max depth it will trace into a function. This value

			can be changed at run time by the max_graph_depth file

			in the tracefs tracing directory. default: 0 (no limit)



	gamecon.map[2|3]=

			[HW,JOY] Multisystem joystick and NES/SNES/PSX pad

			support via parallel port (up to 5 devices per port)

Documentation/arm64/silicon-errata.txt

+1 −0
Original line number Diff line number Diff line
@@ -68,3 +68,4 @@ stable kernels. 
|                |                 |                 |                             |

| Qualcomm Tech. | Falkor v1       | E1003           | QCOM_FALKOR_ERRATUM_1003    |

| Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |

| Qualcomm Tech. | QDF2400 ITS     | E0065           | QCOM_QDF2400_ERRATUM_0065   |

Documentation/cgroup-v2.txt

+6 −5
Original line number Diff line number Diff line
@@ -1142,8 +1142,8 @@ used by the kernel. 


  pids.max



 A read-write single value file which exists on non-root cgroups.  The

 default is "max".

	A read-write single value file which exists on non-root

	cgroups.  The default is "max".



	Hard limit of number of processes.
@@ -1151,7 +1151,8 @@ used by the kernel. 


	A read-only single value file which exists on all cgroups.



 The number of processes currently in the cgroup and its descendants.

	The number of processes currently in the cgroup and its

	descendants.



Organisational operations are not blocked by cgroup policies, so it is

possible to have pids.current > pids.max.  This can be done by either

Documentation/dev-tools/kcov.rst

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Note that kcov does not aim to collect as much coverage as possible. It aims 
to collect more or less stable coverage that is function of syscall inputs.

To achieve this goal it does not collect coverage in soft/hard interrupts

and instrumentation of some inherently non-deterministic parts of kernel is

disbled (e.g. scheduler, locking).

disabled (e.g. scheduler, locking).



Usage

-----

Documentation/devicetree/bindings/arm/marvell/cp110-system-controller0.txt

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ The following clocks are available: 
   - 1 15	SATA

   - 1 16	SATA USB

   - 1 17	Main

   - 1 18	SD/MMC

   - 1 18	SD/MMC/GOP

   - 1 21	Slow IO (SPI, NOR, BootROM, I2C, UART)

   - 1 22	USB3H0

   - 1 23	USB3H1
@@ -65,7 +65,7 @@ Required properties: 
	"cpm-audio", "cpm-communit", "cpm-nand", "cpm-ppv2", "cpm-sdio",

	"cpm-mg-domain", "cpm-mg-core", "cpm-xor1", "cpm-xor0", "cpm-gop-dp", "none",

	"cpm-pcie_x10", "cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor", "cpm-sata",

	"cpm-sata-usb", "cpm-main", "cpm-sd-mmc", "none", "none", "cpm-slow-io",

	"cpm-sata-usb", "cpm-main", "cpm-sd-mmc-gop", "none", "none", "cpm-slow-io",

	"cpm-usb3h0", "cpm-usb3h1", "cpm-usb3dev", "cpm-eip150", "cpm-eip197";



Example:
@@ -78,6 +78,6 @@ Example: 
		gate-clock-output-names = "cpm-audio", "cpm-communit", "cpm-nand", "cpm-ppv2", "cpm-sdio",

			"cpm-mg-domain", "cpm-mg-core", "cpm-xor1", "cpm-xor0", "cpm-gop-dp", "none",

			"cpm-pcie_x10", "cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor", "cpm-sata",

			"cpm-sata-usb", "cpm-main", "cpm-sd-mmc", "none", "none", "cpm-slow-io",

			"cpm-sata-usb", "cpm-main", "cpm-sd-mmc-gop", "none", "none", "cpm-slow-io",

			"cpm-usb3h0", "cpm-usb3h1", "cpm-usb3dev", "cpm-eip150", "cpm-eip197";

	};