Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0acbae5b authored by Treehugger Robot's avatar Treehugger Robot
Browse files

Merge "Merge tag 'android11-5.4.259_r00' into android11-5.4" into android11-5.4

parents e8f8c3db b40f1a5d

Documentation/admin-guide/sysctl/net.rst

+9 −9
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ see only some of them, depending on your kernel's configuration. 


Table : Subdirectories in /proc/sys/net



 ========= =================== = ========== ==================

 ========= =================== = ========== ===================

 Directory Content               Directory  Content

 ========= =================== = ========== ==================

 ========= =================== = ========== ===================

 802       E802 protocol         mptcp      Multipath TCP

 appletalk Appletalk protocol    netfilter  Network Filter

 ax25      AX25                  netrom     NET/ROM
@@ -42,7 +42,7 @@ Table : Subdirectories in /proc/sys/net 
 ethernet  Ethernet protocol     unix       Unix domain sockets

 ipv4      IP version 4          x25        X.25 protocol

 ipv6      IP version 6

 ========= =================== = ========== ==================

 ========= =================== = ========== ===================



1. /proc/sys/net/core - Network core options

============================================

Documentation/admin-guide/sysctl/vm.rst

+9 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ Currently, these files are in /proc/sys/vm: 
- overcommit_memory

- overcommit_ratio

- page-cluster

- page_lock_unfairness

- panic_on_oom

- percpu_pagelist_fraction

- stat_interval
@@ -757,6 +758,14 @@ extra faults and I/O delays for following faults if they would have been part of 
that consecutive pages readahead would have brought in.





page_lock_unfairness

====================



This value determines the number of times that the page lock can be

stolen from under a waiter. After the lock is stolen the number of times

specified in this file (default is 5), the "fair lock handoff" semantics

will apply, and the waiter will only be awakened if the lock can be taken.



panic_on_oom

============

Documentation/arm64/silicon-errata.rst

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip08 SMMU PMCG | #162001800      | N/A                         |

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

| Hisilicon      | Hip08 SMMU PMCG | #162001900      | N/A                         |

|                | Hip09 SMMU PMCG |                 |                             |

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

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

| Qualcomm Tech. | Kryo/Falkor v1  | E1003           | QCOM_FALKOR_ERRATUM_1003    |

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

Documentation/power/runtime_pm.rst

+6 −0
Original line number Diff line number Diff line
@@ -382,6 +382,12 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: 
      nonzero, increment the counter and return 1; otherwise return 0 without

      changing the counter



  `int pm_runtime_get_if_active(struct device *dev, bool ign_usage_count);`

    - return -EINVAL if 'power.disable_depth' is nonzero; otherwise, if the

      runtime PM status is RPM_ACTIVE, and either ign_usage_count is true

      or the device's usage_count is non-zero, increment the counter and

      return 1; otherwise return 0 without changing the counter



  `void pm_runtime_put_noidle(struct device *dev);`

    - decrement the device's usage counter

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1101,7 +1101,7 @@ APEX EMBEDDED SYSTEMS STX104 IIO DRIVER 
M:	William Breathitt Gray <vilhelm.gray@gmail.com>

L:	linux-iio@vger.kernel.org

S:	Maintained

F:	drivers/iio/adc/stx104.c

F:	drivers/iio/addac/stx104.c















APM DRIVER















M:	Jiri Kosina <jikos@kernel.org>