Merge branch 'linus' into locking/core, to pick up fixes (0b429e18) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@ Required properties:
	- touchscreen-size-y : See touchscreen.txt		- touchscreen-size-y : See touchscreen.txt

	Optional properties:		Optional properties:
			- firmware-name : File basename (string) for board specific firmware
	- touchscreen-inverted-x : See touchscreen.txt		- touchscreen-inverted-x : See touchscreen.txt
	- touchscreen-inverted-y : See touchscreen.txt		- touchscreen-inverted-y : See touchscreen.txt
	- touchscreen-swapped-x-y : See touchscreen.txt		- touchscreen-swapped-x-y : See touchscreen.txt

+20 −1

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,7 @@ logical address types are already defined will return with error ``EBUSY``.

	- ``flags``		- ``flags``

	- Flags. No flags are defined yet, so set this to 0.		- Flags. See :ref:`cec-log-addrs-flags` for a list of available flags.

	- .. row 7		- .. row 7

	@@ -201,6 +201,25 @@ logical address types are already defined will return with error ``EBUSY``.
	give the CEC framework more information about the device type, even		give the CEC framework more information about the device type, even
	though the framework won't use it directly in the CEC message.		though the framework won't use it directly in the CEC message.

			.. _cec-log-addrs-flags:

			.. flat-table:: Flags for struct cec_log_addrs
			:header-rows: 0
			:stub-columns: 0
			:widths: 3 1 4


			- .. _`CEC-LOG-ADDRS-FL-ALLOW-UNREG-FALLBACK`:

			- ``CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK``

			- 1

			- By default if no logical address of the requested type can be claimed, then
			it will go back to the unconfigured state. If this flag is set, then it will
			fallback to the Unregistered logical address. Note that if the Unregistered
			logical address was explicitly requested, then this flag has no effect.

	.. _cec-versions:		.. _cec-versions:

	.. flat-table:: CEC Versions		.. flat-table:: CEC Versions

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,8 @@ it is guaranteed that the state did change in between the two events.

	- ``phys_addr``		- ``phys_addr``

	- The current physical address.		- The current physical address. This is ``CEC_PHYS_ADDR_INVALID`` if no
			valid physical address is set.

	- .. row 2		- .. row 2

	@@ -72,7 +73,10 @@ it is guaranteed that the state did change in between the two events.

	- ``log_addr_mask``		- ``log_addr_mask``

	- The current set of claimed logical addresses.		- The current set of claimed logical addresses. This is 0 if no logical
			addresses are claimed or if ``phys_addr`` is ``CEC_PHYS_ADDR_INVALID``.
			If bit 15 is set (``1 << CEC_LOG_ADDR_UNREGISTERED``) then this device
			has the unregistered logical address. In that case all other bits are 0.

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2501,7 +2501,7 @@ S: Supported
	F: kernel/bpf/		F: kernel/bpf/

	BROADCOM B44 10/100 ETHERNET DRIVER		BROADCOM B44 10/100 ETHERNET DRIVER
	M: Gary Zambrano <zambrano@broadcom.com>		M: Michael Chan <michael.chan@broadcom.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Supported		S: Supported
	F: drivers/net/ethernet/broadcom/b44.*		F: drivers/net/ethernet/broadcom/b44.*
	@@ -8161,6 +8161,15 @@ S: Maintained
	W: https://fedorahosted.org/dropwatch/		W: https://fedorahosted.org/dropwatch/
	F: net/core/drop_monitor.c		F: net/core/drop_monitor.c

			NETWORKING [DSA]
			M: Andrew Lunn <andrew@lunn.ch>
			M: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
			M: Florian Fainelli <f.fainelli@gmail.com>
			S: Maintained
			F: net/dsa/
			F: include/net/dsa.h
			F: drivers/net/dsa/

	NETWORKING [GENERAL]		NETWORKING [GENERAL]
	M: "David S. Miller" <davem@davemloft.net>		M: "David S. Miller" <davem@davemloft.net>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	@@ -8736,7 +8745,7 @@ F: drivers/oprofile/
	F: include/linux/oprofile.h		F: include/linux/oprofile.h

	ORACLE CLUSTER FILESYSTEM 2 (OCFS2)		ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
	M: Mark Fasheh <mfasheh@suse.com>		M: Mark Fasheh <mfasheh@versity.com>
	M: Joel Becker <jlbec@evilplan.org>		M: Joel Becker <jlbec@evilplan.org>
	L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers)		L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
	W: http://ocfs2.wiki.kernel.org		W: http://ocfs2.wiki.kernel.org

+1 −1