Commit 7f9d04bc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.15-rc4 into staging-next 



We want the staging fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 9a38450a 1291a0d5

Documentation/arm64/silicon-errata.txt

+1 −0
Original line number Diff line number Diff line
@@ -75,3 +75,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   |

| Qualcomm Tech. | Falkor v{1,2}   | E1041           | QCOM_FALKOR_ERRATUM_1041    |

Documentation/cgroup-v2.txt

+7 −0
Original line number Diff line number Diff line
@@ -898,6 +898,13 @@ controller implements weight and absolute bandwidth limit models for 
normal scheduling policy and absolute bandwidth allocation model for

realtime scheduling policy.



WARNING: cgroup2 doesn't yet support control of realtime processes and

the cpu controller can only be enabled when all RT processes are in

the root cgroup.  Be aware that system management software may already

have placed RT processes into nonroot cgroups during the system boot

process, and these processes may need to be moved to the root cgroup

before the cpu controller can be enabled.





CPU Interface Files

~~~~~~~~~~~~~~~~~~~

Documentation/devicetree/bindings/arm/ccn.txt

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required properties: 


Example:



	ccn@0x2000000000 {

	ccn@2000000000 {

		compatible = "arm,ccn-504";

		reg = <0x20 0x00000000 0 0x1000000>;

		interrupts = <0 181 4>;

Documentation/devicetree/bindings/arm/omap/crossbar.txt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ An interrupt consumer on an SoC using crossbar will use: 
	interrupts = <GIC_SPI request_number interrupt_level>



Example:

	device_x@0x4a023000 {

	device_x@4a023000 {

		/* Crossbar 8 used */

		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;

		...

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Required properties: 
- interrupts : Should contain MC General interrupt.



Example:

	memory-controller@0x7000f000 {

	memory-controller@7000f000 {

		compatible = "nvidia,tegra20-mc";

		reg = <0x7000f000 0x024

		       0x7000f03c 0x3c4>;