Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux (2e6d603e) · Commits · e / devices / android_kernel_fairphone_FP5

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/powerpc/4xx/emac.txt

+60 −2

Original line number	Diff line number	Diff line
		@@ -71,6 +71,9 @@
		For Axon it can be absent, though my current driver
		doesn't handle phy-address yet so for now, keep
		0x00ffffff in it.
		- phy-handle : Used to describe configurations where a external PHY
		is used. Please refer to:
		Documentation/devicetree/bindings/net/ethernet.txt
		- rx-fifo-size-gige : 1 cell, Rx fifo size in bytes for 1000 Mb/sec
		operations (if absent the value is the same as
		rx-fifo-size). For Axon, either absent or 2048.
		@@ -81,8 +84,22 @@
		offload, phandle of the TAH device node.
		- tah-channel : 1 cell, optional. If appropriate, channel used on the
		TAH engine.
		- fixed-link : Fixed-link subnode describing a link to a non-MDIO
		managed entity. See
		Documentation/devicetree/bindings/net/fixed-link.txt
		for details.
		- mdio subnode : When the EMAC has a phy connected to its local
		mdio, which us supported by the kernel's network
		PHY library in drivers/net/phy, there must be device
		tree subnode with the following required properties:
		- #address-cells: Must be <1>.
		- #size-cells: Must be <0>.

		Example:
		For PHY definitions: Please refer to
		Documentation/devicetree/bindings/net/phy.txt and
		Documentation/devicetree/bindings/net/ethernet.txt

		Examples:

		EMAC0: ethernet@40000800 {
		device_type = "network";
		@@ -104,6 +121,48 @@
		zmii-channel = <0>;
		};

		EMAC1: ethernet@ef600c00 {
		device_type = "network";
		compatible = "ibm,emac-apm821xx", "ibm,emac4sync";
		interrupt-parent = <&EMAC1>;
		interrupts = <0 1>;
		#interrupt-cells = <1>;
		#address-cells = <0>;
		#size-cells = <0>;
		interrupt-map = <0 &UIC2 0x10 IRQ_TYPE_LEVEL_HIGH /* Status */
		1 &UIC2 0x14 IRQ_TYPE_LEVEL_HIGH /* Wake */>;
		reg = <0xef600c00 0x000000c4>;
		local-mac-address = [000000000000]; /* Filled in by U-Boot */
		mal-device = <&MAL0>;
		mal-tx-channel = <0>;
		mal-rx-channel = <0>;
		cell-index = <0>;
		max-frame-size = <9000>;
		rx-fifo-size = <16384>;
		tx-fifo-size = <2048>;
		fifo-entry-size = <10>;
		phy-mode = "rgmii";
		phy-handle = <&phy0>;
		phy-map = <0x00000000>;
		rgmii-device = <&RGMII0>;
		rgmii-channel = <0>;
		tah-device = <&TAH0>;
		tah-channel = <0>;
		has-inverted-stacr-oc;
		has-new-stacr-staopc;

		mdio {
		#address-cells = <1>;
		#size-cells = <0>;

		phy0: ethernet-phy@0 {
		compatible = "ethernet-phy-ieee802.3-c22";
		reg = <0>;
		};
		};
		};


		ii) McMAL node

		Required properties:
		@@ -145,4 +204,3 @@
		- revision : as provided by the RGMII new version register if
		available.
		For Axon: 0x0000012a