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

Commit d7e25c66 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'x86/urgent' into x86/asm 

Get the cr4 fixes so we can apply the final cleanup
parents 907241dc e4aad645

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

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



Optional properties:

- firmware-name		  : File basename (string) for board specific firmware

- touchscreen-inverted-x  : See touchscreen.txt

- touchscreen-inverted-y  : See touchscreen.txt

- touchscreen-swapped-x-y : See touchscreen.txt

Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst

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


       -  ``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
@@ -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

          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:



.. flat-table:: CEC Versions

Documentation/media/uapi/cec/cec-ioc-dqevent.rst

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


       -  ``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
@@ -72,7 +73,10 @@ it is guaranteed that the state did change in between the two events. 


       -  ``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.

MAINTAINERS

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



BROADCOM B44 10/100 ETHERNET DRIVER

M:	Gary Zambrano <zambrano@broadcom.com>

M:	Michael Chan <michael.chan@broadcom.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/broadcom/b44.*
@@ -8161,6 +8161,15 @@ S: Maintained 
W:	https://fedorahosted.org/dropwatch/

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]

M:	"David S. Miller" <davem@davemloft.net>

L:	netdev@vger.kernel.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 8

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Psychotic Stoned Sheep



# *DOCUMENTATION*