Merge tag 'v5.4-rc4' into docs-next
authorJonathan Corbet <corbet@lwn.net>
Tue, 29 Oct 2019 10:43:29 +0000 (04:43 -0600)
committerJonathan Corbet <corbet@lwn.net>
Tue, 29 Oct 2019 10:43:29 +0000 (04:43 -0600)
I need to pick up the independent changes made to
Documentation/core-api/memory-allocation.rst to be able to merge further
work without creating a total mess.

1  2 
CREDITS
Documentation/admin-guide/cgroup-v2.rst
Documentation/admin-guide/kernel-parameters.txt
Documentation/hwmon/inspur-ipsps1.rst
Documentation/networking/device_drivers/pensando/ionic.rst
MAINTAINERS
fs/cifs/cifsfs.c

diff --cc CREDITS
Simple merge
@@@ -1117,8 -1120,11 +1120,12 @@@ 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
 -      from unprotected cgroups.  Above the effective low boundary (or
 +      memory won't be reclaimed unless there is no reclaimable
 +      memory available in 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
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge