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

Commit 1a1494de authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux into drm-next 

Alex writes:
Pretty minor -next pull request.  We some additional new bits waiting
internally for release.  Hopefully Monday we can get at least some of
them out.  The others will probably take a few more weeks.

Highlights of the current request:
- ELD registers for passing audio information to the sound hardware
- Handle GPUVM page faults more gracefully
- Misc fixes

Merge radeon test
* 'drm-next-3.8' of git://people.freedesktop.org/~agd5f/linux: (483 commits)
  drm/radeon: bump driver version for new info ioctl requests
  drm/radeon: fix eDP clk and lane setup for scaled modes
  drm/radeon: add new INFO ioctl requests
  drm/radeon/dce32+: use fractional fb dividers for high clocks
  drm/radeon: use cached memory when evicting for vram on non agp
  drm/radeon: add a CS flag END_OF_FRAME
  drm/radeon: stop page faults from hanging the system (v2)
  drm/radeon/dce4/5: add registers for ELD handling
  drm/radeon/dce3.2: add registers for ELD handling
  radeon: fix pll/ctrc mapping on dce2 and dce3 hardware
  Linux 3.7-rc7
  powerpc/eeh: Do not invalidate PE properly
  Revert "drm/i915: enable rc6 on ilk again"
  ALSA: hda - Fix build without CONFIG_PM
  of/address: sparc: Declare of_iomap as an extern function for sparc again
  PM / QoS: fix wrong error-checking condition
  bnx2x: remove redundant warning log
  vxlan: fix command usage in its doc
  8139cp: revert "set ring address before enabling receiver"
  MPI: Fix compilation on MIPS with GCC 4.4 and newer
  ...

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_encoder.c
	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
	drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
parents 8de9e417 71bfe916

CREDITS

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

S: Germany



N: Avi Kivity

E: avi.kivity@gmail.com

D: Kernel-based Virtual Machine (KVM)

S: Ra'annana, Israel



N: Andi Kleen

E: andi@firstfloor.org

U: http://www.halobates.de

Documentation/arm64/memory.txt

+6 −6
Original line number Diff line number Diff line
@@ -27,17 +27,17 @@ Start End Size Use 
-----------------------------------------------------------------------

0000000000000000	0000007fffffffff	 512GB		user



ffffff8000000000	ffffffbbfffcffff	~240GB		vmalloc

ffffff8000000000	ffffffbbfffeffff	~240GB		vmalloc



ffffffbbfffd0000	ffffffbcfffdffff	  64KB		[guard page]

ffffffbbffff0000	ffffffbbffffffff	  64KB		[guard page]



ffffffbbfffe0000	ffffffbcfffeffff	  64KB		PCI I/O space

ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap



ffffffbbffff0000	ffffffbcffffffff	  64KB		[guard page]

ffffffbe00000000	ffffffbffbbfffff	  ~8GB		[guard, future vmmemap]



ffffffbc00000000	ffffffbdffffffff	   8GB		vmemmap

ffffffbffbe00000	ffffffbffbe0ffff	  64KB		PCI I/O space



ffffffbe00000000	ffffffbffbffffff	  ~8GB		[guard, future vmmemap]

ffffffbbffff0000	ffffffbcffffffff	  ~2MB		[guard]



ffffffbffc000000	ffffffbfffffffff	  64MB		modules

Documentation/cgroups/memory.txt

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



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.

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

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

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


MDC, MDIO.



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

node.



Example:



mdio {

aliases {

	mdio-gpio0 = <&mdio0>;

};



mdio0: mdio {

	compatible = "virtual,mdio-gpio";

	#address-cells = <1>;

	#size-cells = <0>;

Documentation/filesystems/proc.txt

+12 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Table of Contents 
  2	Modifying System 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

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

  3.3	/proc/<pid>/io - Display the IO accounting fields
@@ -1320,10 +1320,10 @@ of the kernel. 
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.



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

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

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

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

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

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