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

Commit 0f9cb211 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v3.7-rc7' into next/cleanup 



Merging in mainline back to next/cleanup since it has collected a few
conflicts between fixes going upstream and some of the cleanup patches.
Git doesn't auto-resolve some of them, and they're mostly noise so let's
take care of it locally.

Conflicts are in:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	arch/arm/plat-omap/i2c.c
	drivers/video/omap2/dss/dss.c

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 007108a2 9489e9dc

CREDITS

+5 −0
Original line number Original line Diff line number Diff line
@@ -1823,6 +1823,11 @@ S: Kattreinstr 38 
S: D-64295

S: D-64295

S: Germany

S: Germany





N: Avi Kivity

E: avi.kivity@gmail.com

D: Kernel-based Virtual Machine (KVM)

S: Ra'annana, Israel



N: Andi Kleen

N: Andi Kleen

E: andi@firstfloor.org

E: andi@firstfloor.org

U: http://www.halobates.de

U: http://www.halobates.de

Documentation/cgroups/memory.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -466,6 +466,10 @@ Note: 
5.3 swappiness

5.3 swappiness





Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.

Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.

Please note that unlike the global swappiness, memcg knob set to 0

really prevents from any swapping even if there is a swap storage

available. This might lead to memcg OOM killer if there are no file

pages to reclaim.





Following cgroups' swappiness can't be changed.

Following cgroups' swappiness can't be changed.

- root cgroup (uses /proc/sys/vm/swappiness).

- root cgroup (uses /proc/sys/vm/swappiness).

Documentation/devicetree/bindings/net/mdio-gpio.txt

+8 −1
Original line number Original line Diff line number Diff line
@@ -8,9 +8,16 @@ gpios property as described in section VIII.1 in the following order: 




MDC, MDIO.

MDC, MDIO.





Note: Each gpio-mdio bus should have an alias correctly numbered in "aliases"

node.



Example:

Example:





mdio {

aliases {

	mdio-gpio0 = <&mdio0>;

};



mdio0: mdio {

	compatible = "virtual,mdio-gpio";

	compatible = "virtual,mdio-gpio";

	#address-cells = <1>;

	#address-cells = <1>;

	#size-cells = <0>;

	#size-cells = <0>;

Documentation/filesystems/proc.txt

+12 −4
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ Table of Contents 
  2	Modifying System Parameters

  2	Modifying System Parameters





  3	Per-Process Parameters

  3	Per-Process Parameters

  3.1	/proc/<pid>/oom_score_adj - Adjust the oom-killer

  3.1	/proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj - Adjust the oom-killer

								score

								score

  3.2	/proc/<pid>/oom_score - Display current oom-killer score

  3.2	/proc/<pid>/oom_score - Display current oom-killer score

  3.3	/proc/<pid>/io - Display the IO accounting fields

  3.3	/proc/<pid>/io - Display the IO accounting fields
@@ -1320,10 +1320,10 @@ of the kernel. 
CHAPTER 3: PER-PROCESS PARAMETERS

CHAPTER 3: PER-PROCESS PARAMETERS

------------------------------------------------------------------------------

------------------------------------------------------------------------------





3.1 /proc/<pid>/oom_score_adj- Adjust the oom-killer score

3.1 /proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj- Adjust the oom-killer score

--------------------------------------------------------------------------------

--------------------------------------------------------------------------------





This file can be used to adjust the badness heuristic used to select which

These file can be used to adjust the badness heuristic used to select which

process gets killed in out of memory conditions.

process gets killed in out of memory conditions.





The badness heuristic assigns a value to each candidate task ranging from 0

The badness heuristic assigns a value to each candidate task ranging from 0
@@ -1361,6 +1361,12 @@ same system, cpuset, mempolicy, or memory controller resources to use at least 
equivalent to discounting 50% of the task's allowed memory from being considered

equivalent to discounting 50% of the task's allowed memory from being considered

as scoring against the task.

as scoring against the task.





For backwards compatibility with previous kernels, /proc/<pid>/oom_adj may also

be used to tune the badness score.  Its acceptable values range from -16

(OOM_ADJUST_MIN) to +15 (OOM_ADJUST_MAX) and a special value of -17

(OOM_DISABLE) to disable oom killing entirely for that task.  Its value is

scaled linearly with /proc/<pid>/oom_score_adj.



The value of /proc/<pid>/oom_score_adj may be reduced no lower than the last

The value of /proc/<pid>/oom_score_adj may be reduced no lower than the last

value set by a CAP_SYS_RESOURCE process. To reduce the value any lower

value set by a CAP_SYS_RESOURCE process. To reduce the value any lower

requires CAP_SYS_RESOURCE.

requires CAP_SYS_RESOURCE.
@@ -1375,7 +1381,9 @@ minimal amount of work. 
-------------------------------------------------------------

-------------------------------------------------------------





This file can be used to check the current score used by the oom-killer is for

This file can be used to check the current score used by the oom-killer is for

any given <pid>.

any given <pid>. Use it together with /proc/<pid>/oom_score_adj to tune which

process should be killed in an out-of-memory situation.







3.3  /proc/<pid>/io - Display the IO accounting fields

3.3  /proc/<pid>/io - Display the IO accounting fields

-------------------------------------------------------

-------------------------------------------------------

Documentation/networking/netdev-features.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -164,4 +164,4 @@ read the CRC recorded by the NIC on receipt of the packet. 
This requests that the NIC receive all possible frames, including errored

This requests that the NIC receive all possible frames, including errored

frames (such as bad FCS, etc).  This can be helpful when sniffing a link with

frames (such as bad FCS, etc).  This can be helpful when sniffing a link with

bad packets on it.  Some NICs may receive more packets if also put into normal

bad packets on it.  Some NICs may receive more packets if also put into normal

PROMISC mdoe.
 
PROMISC mode.