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

Commit d4bbf7e7 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'master' into x86/memblock 



Conflicts & resolutions:

* arch/x86/xen/setup.c

	dc91c728 "xen: allow extra memory to be in multiple regions"
	24aa0788 "memblock, x86: Replace memblock_x86_reserve/free..."

	conflicted on xen_add_extra_mem() updates.  The resolution is
	trivial as the latter just want to replace
	memblock_x86_reserve_range() with memblock_reserve().

* drivers/pci/intel-iommu.c

	166e9278 "x86/ia64: intel-iommu: move to drivers/iommu/"
	5dfe8660 "bootmem: Replace work_with_active_regions() with..."

	conflicted as the former moved the file under drivers/iommu/.
	Resolved by applying the chnages from the latter on the moved
	file.

* mm/Kconfig

	66616720 "memblock: add NO_BOOTMEM config symbol"
	c378ddd5 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option"

	conflicted trivially.  Both added config options.  Just
	letting both add their own options resolves the conflict.

* mm/memblock.c

	d1f0ece6 "mm/memblock.c: small function definition fixes"
	ed7b56a7 "memblock: Remove memblock_memory_can_coalesce()"

	confliected.  The former updates function removed by the
	latter.  Resolution is trivial.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents a150439c 401d0069

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ modules.builtin 
/Module.markers

/Module.symvers



#

# Debian directory (make deb-pkg)

#

/debian/



#

# git files that we don't want to ignore even it they are dot-files

#

.mailmap

+3 −2
Original line number Diff line number Diff line
@@ -68,13 +68,13 @@ Juha Yrjola <juha.yrjola@solidboot.com> 
Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Koushik <raghavendra.koushik@neterion.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <mb@bu3sch.de>

Michael Buesch <mbuesch@freenet.de>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Mitesh shah <mshah@teja.com>

Morten Welinder <terra@gnome.org>
@@ -112,3 +112,4 @@ Uwe Kleine-König <ukl@pengutronix.de> 
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

CREDITS

+16 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ N: Dominik Brodowski 
E: linux@brodo.de

W: http://www.brodo.de/

P: 1024D/725B37C6  190F 3E77 9C89 3B6D BECD  46EE 67C3 0308 725B 37C6

D: parts of CPUFreq code, ACPI bugfixes

D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils

S: Tuebingen, Germany



N: Andries Brouwer
@@ -857,6 +857,10 @@ S: One Dell Way 
S: Round Rock, TX  78682

S: USA



N: Mattia Dongili

E: malattia@gmail.com

D: cpufrequtils (precursor to cpupowerutils)



N: Ben Dooks

E: ben-linux@fluff.org

E: ben@simtec.co.uk
@@ -1883,6 +1887,11 @@ S: Kruislaan 419 
S: 1098 VA Amsterdam 

S: The Netherlands



N: Goran Koruga

E: korugag@siol.net

D: cpufrequtils (precursor to cpupowerutils)

S: Slovenia



N: Jiri Kosina

E: jikos@jikos.cz

E: jkosina@suse.cz
@@ -2916,6 +2925,12 @@ S: Schlossbergring 9 
S: 79098 Freiburg

S: Germany



N: Thomas Renninger

E: trenn@suse.de

D: cpupowerutils

S: SUSE Linux GmbH

S: Germany



N: Joerg Reuter

E: jreuter@yaina.de

W: http://yaina.de/jreuter/

Documentation/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ printk-formats.txt 
	- how to get printk format specifiers right

prio_tree.txt

	- info on radix-priority-search-tree use for indexing vmas.

ramoops.txt

	- documentation of the ramoops oops/panic logging module.

rbtree.txt

	- info on what red-black trees are and what they are for.

robust-futex-ABI.txt

Documentation/ABI/obsolete/proc-pid-oom_adj

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's 


	A much more powerful interface, /proc/<pid>/oom_score_adj, was

	introduced with the oom killer rewrite that allows users to increase or

	decrease the badness() score linearly.  This interface will replace

	decrease the badness score linearly.  This interface will replace

	/proc/<pid>/oom_adj.



	A warning will be emitted to the kernel log if an application uses this