Commit 2e79e22e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge v5.4-rc4 into drm-next 



Thierry needs fd70c775 ("drm/bridge: tc358767: fix max_tu_symbol
value") to be able to merge his dp_link patch series.

Some adjacent changes conflicts, plus some clashes in i915 due to
cherry-picking and git trying to be helpful and leaving both versions
in.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents f1b4a921 7d194c21

CREDITS

+4 −0
Original line number Original line Diff line number Diff line
@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18 
S: D-69126 Heidelberg

S: D-69126 Heidelberg

S: Germany

S: Germany





N: Simon Horman

M: horms@verge.net.au

D: Renesas ARM/ARM64 SoC maintainer



N: Christopher Horn

N: Christopher Horn

E: chorn@warwick.net

E: chorn@warwick.net

D: Miscellaneous sysctl hacks

D: Miscellaneous sysctl hacks

Documentation/admin-guide/cgroup-v2.rst

+14 −6
Original line number Original line Diff line number Diff line
@@ -615,8 +615,8 @@ on an IO device and is an example of this type. 
Protections

Protections

-----------

-----------





A cgroup is protected to be allocated upto the configured amount of

A cgroup is protected upto the configured amount of the resource

the resource if the usages of all its ancestors are under their

as long as the usages of all its ancestors are under their

protected levels.  Protections can be hard guarantees or best effort

protected levels.  Protections can be hard guarantees or best effort

soft boundaries.  Protections can also be over-committed in which case

soft boundaries.  Protections can also be over-committed in which case

only upto the amount available to the parent is protected among

only upto the amount available to the parent is protected among
@@ -1096,7 +1096,10 @@ PAGE_SIZE multiple when read back. 
	is within its effective min boundary, the cgroup's memory

	is within its effective min boundary, the cgroup's memory

	won't be reclaimed under any conditions. If there is no

	won't be reclaimed under any conditions. If there is no

	unprotected reclaimable memory available, OOM killer

	unprotected reclaimable memory available, OOM killer

	is invoked.

	is invoked. Above the effective min boundary (or

	effective low boundary if it is higher), pages are reclaimed

	proportionally to the overage, reducing reclaim pressure for

	smaller overages.





       Effective min boundary is limited by memory.min values of

       Effective min boundary is limited by memory.min values of

	all ancestor cgroups. If there is memory.min overcommitment

	all ancestor cgroups. If there is memory.min overcommitment
@@ -1118,7 +1121,10 @@ PAGE_SIZE multiple when read back. 
	Best-effort memory protection.  If the memory usage of a

	Best-effort memory protection.  If the memory usage of a

	cgroup is within its effective low boundary, the cgroup's

	cgroup is within its effective low boundary, the cgroup's

	memory won't be reclaimed unless memory can be reclaimed

	memory won't be reclaimed unless memory can be reclaimed

	from unprotected cgroups.

	from unprotected cgroups.  Above the effective low boundary (or

	effective min boundary if it is higher), pages are reclaimed

	proportionally to the overage, reducing reclaim pressure for

	smaller overages.





	Effective low boundary is limited by memory.low values of

	Effective low boundary is limited by memory.low values of

	all ancestor cgroups. If there is memory.low overcommitment

	all ancestor cgroups. If there is memory.low overcommitment
@@ -2482,8 +2488,10 @@ system performance due to overreclaim, to the point where the feature 
becomes self-defeating.

becomes self-defeating.





The memory.low boundary on the other hand is a top-down allocated

The memory.low boundary on the other hand is a top-down allocated

reserve.  A cgroup enjoys reclaim protection when it's within its low,

reserve.  A cgroup enjoys reclaim protection when it's within its

which makes delegation of subtrees possible.

effective low, which makes delegation of subtrees possible. It also

enjoys having reclaim pressure proportional to its overage when

above its effective low.





The original high boundary, the hard limit, is defined as a strict

The original high boundary, the hard limit, is defined as a strict

limit that can not budge, even if the OOM killer has to be called.

limit that can not budge, even if the OOM killer has to be called.

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -5302,6 +5302,10 @@ 
				the unplug protocol

				the unplug protocol

			never -- do not unplug even if version check succeeds

			never -- do not unplug even if version check succeeds





	xen_legacy_crash	[X86,XEN]

			Crash from Xen panic notifier, without executing late

			panic() code such as dumping handler.



	xen_nopvspin	[X86,XEN]

	xen_nopvspin	[X86,XEN]

			Disables the ticketlock slowpath using Xen PV

			Disables the ticketlock slowpath using Xen PV

			optimizations.

			optimizations.

Documentation/arm64/memory.rst

+8 −1
Original line number Original line Diff line number Diff line
@@ -154,11 +154,18 @@ return virtual addresses to userspace from a 48-bit range. 




Software can "opt-in" to receiving VAs from a 52-bit space by

Software can "opt-in" to receiving VAs from a 52-bit space by

specifying an mmap hint parameter that is larger than 48-bit.

specifying an mmap hint parameter that is larger than 48-bit.



For example:

For example:



.. code-block:: c



   maybe_high_address = mmap(~0UL, size, prot, flags,...);

   maybe_high_address = mmap(~0UL, size, prot, flags,...);





It is also possible to build a debug kernel that returns addresses

It is also possible to build a debug kernel that returns addresses

from a 52-bit space by enabling the following kernel config options:

from a 52-bit space by enabling the following kernel config options:



.. code-block:: sh



   CONFIG_EXPERT=y && CONFIG_ARM64_FORCE_52BIT=y

   CONFIG_EXPERT=y && CONFIG_ARM64_FORCE_52BIT=y





Note that this option is only intended for debugging applications

Note that this option is only intended for debugging applications

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Original line Diff line number Diff line
@@ -107,6 +107,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX2 SMMUv3| #126            | N/A                         |

| Cavium         | ThunderX2 SMMUv3| #126            | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX2 Core  | #219            | CAVIUM_TX2_ERRATUM_219      |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| Freescale/NXP  | LS2080A/LS1043A | A-008585        | FSL_ERRATUM_A008585         |

| Freescale/NXP  | LS2080A/LS1043A | A-008585        | FSL_ERRATUM_A008585         |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

CRA Git | Maintained and supported by SUSTech CRA and CCSE