Commit f0b9abfb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/core 



Conflicts:
	tools/perf/Makefile
	tools/perf/builtin-test.c
	tools/perf/perf.h
	tools/perf/tests/parse-events.c
	tools/perf/util/evsel.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents adc1ef1e 1b3c393c

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/arm/atmel-at91.txt

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ PIT Timer required properties: 
  shared across all System Controller members.



TC/TCLIB Timer required properties:

- compatible: Should be "atmel,<chip>-pit".

- compatible: Should be "atmel,<chip>-tcb".

  <chip> can be "at91rm9200" or "at91sam9x5"

- reg: Should contain registers location and length

- interrupts: Should contain all interrupts for the TC block

Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* EETI eGalax Multiple Touch Controller



Required properties:

- compatible: must be "eeti,egalax_ts"

- reg: i2c slave address

- interrupt-parent: the phandle for the interrupt controller

- interrupts: touch controller interrupt

- wakeup-gpios: the gpio pin to be used for waking up the controller

  as well as uased as irq pin



Example:



	egalax_ts@04 {

		compatible = "eeti,egalax_ts";

		reg = <0x04>;

		interrupt-parent = <&gpio1>;

		interrupts = <9 2>;

		wakeup-gpios = <&gpio1 9 0>;

	};