On Thu, 2019-10-24 at 14:57 -0600, Jonathan Corbet wrote: > On Thu, 24 Oct 2019 20:51:23 +0000 > Chris Packham <Chris.Packham@xxxxxxxxxxxxxxxxxxx> wrote: > > > When I do actually get a series that applies to docs-next it'll > > conflict with 59bb47985c1d ("mm, sl[aou]b: guarantee > > natural alignment for kmalloc(power-of-two)") in Linus's tree. > > Alternatively, if I sync up to -rc4, does the problem go away? I should > be able to explain that to Linus without too much trouble... > Yes the series applies cleanly once docs-next is merged with v5.4-rc4. There is a merge conflict between 6ee0fac199e1 ("docs: fix memory.low description in cgroup-v2.rst") in your tree and 9783aa9917f8 ("mm, memcg: proportional memory.{low,min} reclaim") in Linus's tree. Here's the resolution I came up with in my test merge diff --cc Documentation/admin-guide/cgroup-v2.rst index 26d1cde6b34a,5361ebec3361..515c2d9eef84 --- a/Documentation/admin-guide/cgroup-v2.rst +++ b/Documentation/admin-guide/cgroup-v2.rst @@@ -1117,8 -1120,11 +1120,11 @@@ PAGE_SIZE multiple when read back Best-effort memory protection. If the memory usage of a 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 there is no reclaimable - memory available in 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 all ancestor cgroups. If there is memory.low overcommitment