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

Commit 946e0f6f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v4.7-rc6' into x86/mm, to merge fixes before applying new changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 67d7a982 a99cde43

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Module.symvers 
/tar-install/



#

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

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

#

!.gitignore

!.mailmap

.mailmap

+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com> 
Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Antoine Tenart <antoine.tenart@free-electrons.com>

Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>

Archit Taneja <archit@ti.com>

Arnaud Patard <arnaud.patard@rtp-net.org>
@@ -30,9 +31,13 @@ Axel Lin <axel.lin@gmail.com> 
Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Boris Brezillon <boris.brezillon@free-electrons.com>

Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>

Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>

Christophe Ricard <christophe.ricard@gmail.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>
@@ -47,6 +52,9 @@ Felix Kuhling <fxkuehl@gmx.de> 
Felix Moeller <felix@derklecks.de>

Filipe Lautert <filipe@icewall.org>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

Frank Zago <fzago@systemfabricworks.com>

Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>
@@ -65,6 +73,7 @@ Jean Tourrilhes <jt@hpl.hp.com> 
Jeff Garzik <jgarzik@pretzel.yyz.us>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>

<josh@joshtriplett.org> <josh@kernel.org>
@@ -78,11 +87,13 @@ Kay Sievers <kay.sievers@vrfy.org> 
Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.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>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>
@@ -116,6 +127,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org> 
Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

CREDITS

+2 −0
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig 


N: Mauro Carvalho Chehab

E: m.chehab@samsung.org

E: mchehab@osg.samsung.com

E: mchehab@infradead.org

D: Media subsystem (V4L/DVB) drivers and core

D: EDAC drivers and EDAC 3.0 core rework
@@ -768,6 +769,7 @@ D: Z85230 driver 
D: Former security contact point (please use vendor-sec@lst.de)

D: ex 2.2 maintainer

D: 2.1.x modular sound

D: Assigned major/minor numbers maintainer at lanana.org

S: c/o Red Hat UK Ltd

S: Alexandra House

S: Alexandra Terrace

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-savu

+6 −5
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@ Date: Mai 2012 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split into general settings and

		button settings. buttons holds informations about button layout.

		When written, this file lets one write the respective profile

		buttons to the mouse. The data has to be 47 bytes long.

		button settings. The buttons variable holds information about

		button layout. When written, this file lets one write the

		respective profile buttons to the mouse. The data has to be

		47 bytes long.

		The mouse will reject invalid data.

		Which profile to write is determined by the profile number

		contained in the data.
@@ -26,8 +27,8 @@ Date: Mai 2012 
Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split into general settings and

		button settings. profile holds informations like resolution, sensitivity

		and light effects.

		button settings. A profile holds information like resolution,

		sensitivity and light effects.

		When written, this file lets one write the respective profile

		settings back to the mouse. The data has to be 43 bytes long.

		The mouse will reject invalid data.

Documentation/ABI/stable/sysfs-class-ubi

+9 −0
Original line number Diff line number Diff line
@@ -107,6 +107,15 @@ Contact: Artem Bityutskiy <dedekind@infradead.org> 
Description:

		Number of physical eraseblocks reserved for bad block handling.



What:		/sys/class/ubi/ubiX/ro_mode

Date:		April 2016

KernelVersion:	4.7

Contact:	linux-mtd@lists.infradead.org

Description:

		Contains ASCII "1\n" if the read-only flag is set on this

		device, and "0\n" if it is cleared. UBI devices mark themselves

		as read-only when they detect an unrecoverable error.



What:		/sys/class/ubi/ubiX/total_eraseblocks

Date:		July 2006

KernelVersion:	2.6.22