Commit 0c724420 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'master' into for-4.20/upstream-fixes 

Pull in a merge commit that brought in 3b692c55 ("HID: asus: only
support backlight when it's not driven by WMI") so that fixup could be
applied on top of it.
parents 399474e4 eb7046e9

.clang-format

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ ForEachMacros: 
  - 'protocol_for_each_card'

  - 'protocol_for_each_dev'

  - 'queue_for_each_hw_ctx'

  - 'radix_tree_for_each_contig'

  - 'radix_tree_for_each_slot'

  - 'radix_tree_for_each_tagged'

  - 'rbtree_postorder_for_each_entry_safe'

.mailmap

+12 −0
Original line number Diff line number Diff line
@@ -119,6 +119,13 @@ Mark Brown <broonie@sirena.org.uk> 
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>

Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>

Matthew Wilcox <willy@infradead.org> <mawilcox@microsoft.com>

Matthew Wilcox <willy@infradead.org> <willy@debian.org>

Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>

Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
@@ -153,6 +160,11 @@ Peter Oruba <peter.oruba@amd.com> 
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>

Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+0 −35
Original line number Diff line number Diff line
@@ -25,38 +25,3 @@ Description: 
		4.2.2.



		The files are read only.
 




What:		/sys/bus/usb/drivers/usbtmc/*/TermChar

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file is the TermChar value to be sent to the USB TMC

		device as described by the document, "Universal Serial Bus Test

		and Measurement Class Specification

		(USBTMC) Revision 1.0" as published by the USB-IF.



		Note that the TermCharEnabled file determines if this value is

		sent to the device or not.





What:		/sys/bus/usb/drivers/usbtmc/*/TermCharEnabled

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file determines if the TermChar is to be sent to the

		device on every transaction or not.  For more details about

		this, please see the document, "Universal Serial Bus Test and

		Measurement Class Specification (USBTMC) Revision 1.0" as

		published by the USB-IF.





What:		/sys/bus/usb/drivers/usbtmc/*/auto_abort

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file determines if the transaction of the USB TMC

		device is to be automatically aborted if there is any error.

		For more details about this, please see the document,

		"Universal Serial Bus Test and Measurement Class Specification

		(USBTMC) Revision 1.0" as published by the USB-IF.

Documentation/ABI/testing/configfs-stp-policy-p_sys-t

0 → 100644
+41 −0
Original line number Diff line number Diff line 
What:		/config/stp-policy/<device>:p_sys-t.<policy>/<node>/uuid

Date:		June 2018

KernelVersion:	4.19

Description:

		UUID source identifier string, RW.

		Default value is randomly generated at the mkdir <node> time.

		Data coming from trace sources that use this <node> will be

		tagged with this UUID in the MIPI SyS-T packet stream, to

		allow the decoder to discern between different sources

		within the same master/channel range, and identify the

		higher level decoders that may be needed for each source.



What:		/config/stp-policy/<device>:p_sys-t.<policy>/<node>/do_len

Date:		June 2018

KernelVersion:	4.19

Description:

		Include payload length in the MIPI SyS-T header, boolean.

		If enabled, the SyS-T protocol encoder will include payload

		length in each packet's metadata. This is normally redundant

		if the underlying transport protocol supports marking message

		boundaries (which STP does), so this is off by default.



What:		/config/stp-policy/<device>:p_sys-t.<policy>/<node>/ts_interval

Date:		June 2018

KernelVersion:	4.19

Description:

		Time interval in milliseconds. Include a timestamp in the

		MIPI SyS-T packet metadata, if this many milliseconds have

		passed since the previous packet from this source. Zero is

		the default and stands for "never send the timestamp".



What:		/config/stp-policy/<device>:p_sys-t.<policy>/<node>/clocksync_interval

Date:		June 2018

KernelVersion:	4.19

Description:

		Time interval in milliseconds. Send a CLOCKSYNC packet if

		this many milliseconds have passed since the previous

		CLOCKSYNC packet from this source. Zero is the default and

		stands for "never send the CLOCKSYNC". It makes sense to

		use this option with sources that generate constant and/or

		periodic data, like stm_heartbeat.

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

+24 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Control descriptors



		All attributes read only:

		bInterfaceNumber	- USB interface number for this

					  streaming interface



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

Date:		Dec 2014

KernelVersion:	4.0
@@ -109,6 +113,10 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Streaming descriptors



		All attributes read only:

		bInterfaceNumber	- USB interface number for this

					  streaming interface



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

Date:		Dec 2014

KernelVersion:	4.0
@@ -160,6 +168,10 @@ Description: Specific MJPEG format descriptors 


		All attributes read only,

		except bmaControls and bDefaultFrameIndex:

		bFormatIndex		- unique id for this format descriptor;

					only defined after parent header is

					linked into the streaming class;

					read-only

		bmaControls		- this format's data for bmaControls in

					the streaming header

		bmInterfaceFlags	- specifies interlace information,
@@ -177,6 +189,10 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Specific MJPEG frame descriptors



		bFrameIndex		- unique id for this framedescriptor;

					only defined after parent format is

					linked into the streaming header;

					read-only

		dwFrameInterval		- indicates how frame interval can be

					programmed; a number of values

					separated by newline can be specified
@@ -204,6 +220,10 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Specific uncompressed format descriptors



		bFormatIndex		- unique id for this format descriptor;

					only defined after parent header is

					linked into the streaming class;

					read-only

		bmaControls		- this format's data for bmaControls in

					the streaming header

		bmInterfaceFlags	- specifies interlace information,
@@ -224,6 +244,10 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Specific uncompressed frame descriptors



		bFrameIndex		- unique id for this framedescriptor;

					only defined after parent format is

					linked into the streaming header;

					read-only

		dwFrameInterval		- indicates how frame interval can be

					programmed; a number of values

					separated by newline can be specified