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

Commit e82a82c1 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid',... 

Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid-offload-hid-device-add' and 'for-4.8/upstream' into for-linus
parents 819d64e5 b5d94275 d9f448e3 67f8ecc5 ddfe8483

.mailmap

+6 −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,6 +31,9 @@ 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>
@@ -89,6 +93,7 @@ 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>
@@ -122,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

Documentation/ABI/testing/configfs-usb-gadget-uvc

+29 −29
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/uvc.name

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	UVC function directory



		streaming_maxburst	- 0..15 (ss only)
@@ -9,37 +9,37 @@ Description: UVC function directory 


What:		/config/usb-gadget/gadget/functions/uvc.name/control

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Control descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/class

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/ss

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Super speed control class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/class/fs

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Full speed control class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Terminal descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Output terminal descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/output/default

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Default output terminal descriptors



		All attributes read only:
@@ -53,12 +53,12 @@ Description: Default output terminal descriptors 


What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Camera terminal descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera/default

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Default camera terminal descriptors



		All attributes read only:
@@ -75,12 +75,12 @@ Description: Default camera terminal descriptors 


What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Processing unit descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing/default

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Default processing unit descriptors



		All attributes read only:
@@ -94,49 +94,49 @@ Description: Default processing unit descriptors 


What:		/config/usb-gadget/gadget/functions/uvc.name/control/header

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Control header descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/control/header/name

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific control header descriptors



dwClockFrequency

bcdUVC

What:		/config/usb-gadget/gadget/functions/uvc.name/streaming

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Streaming descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Streaming class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/ss

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Super speed streaming class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/hs

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	High speed streaming class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class/fs

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Full speed streaming class descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Color matching descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/color_matching/default

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Default color matching descriptors



		All attributes read only:
@@ -150,12 +150,12 @@ Description: Default color matching descriptors 


What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	MJPEG format descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific MJPEG format descriptors



		All attributes read only,
@@ -174,7 +174,7 @@ Description: Specific MJPEG format descriptors 


What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific MJPEG frame descriptors



		dwFrameInterval		- indicates how frame interval can be
@@ -196,12 +196,12 @@ Description: Specific MJPEG frame descriptors 


What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Uncompressed format descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific uncompressed format descriptors



		bmaControls		- this format's data for bmaControls in
@@ -221,7 +221,7 @@ Description: Specific uncompressed format descriptors 


What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific uncompressed frame descriptors



		dwFrameInterval		- indicates how frame interval can be
@@ -243,12 +243,12 @@ Description: Specific uncompressed frame descriptors 


What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Streaming header descriptors



What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header/name

Date:		Dec 2014

KernelVersion:	3.20

KernelVersion:	4.0

Description:	Specific streaming header descriptors



		All attributes read only: