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

Commit 94000cc3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'v4.10-rc8' into drm-next 

Linux 4.10-rc8

Backmerge Linus rc8 to fix some conflicts, but also
to avoid pulling it in via a fixes pull from someone.
parents a5eb76d9 7089db84

Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ Properties: 
  Second cell specifies the irq distribution mode to cores

     0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3



  The second cell in interrupts property is deprecated and may be ignored by

  the kernel.



  intc accessed via the special ARC AUX register interface, hence "reg" property

  is not specified.

Documentation/devicetree/bindings/net/mediatek-net.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ have dual GMAC each represented by a child node.. 
* Ethernet controller node



Required properties:

- compatible: Should be "mediatek,mt7623-eth"

- compatible: Should be "mediatek,mt2701-eth"

- reg: Address and length of the register set for the device

- interrupts: Should contain the three frame engines interrupts in numeric

	order. These are fe_int0, fe_int1 and fe_int2.

Documentation/devicetree/bindings/net/phy.txt

+3 −2
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ Optional Properties: 
  specifications. If neither of these are specified, the default is to

  assume clause 22.



  If the phy's identifier is known then the list may contain an entry

  of the form: "ethernet-phy-idAAAA.BBBB" where

  If the PHY reports an incorrect ID (or none at all) then the

  "compatible" list may contain an entry with the correct PHY ID in the

  form: "ethernet-phy-idAAAA.BBBB" where

     AAAA - The value of the 16 bit Phy Identifier 1 register as

            4 hex digits. This is the chip vendor OUI bits 3:18

     BBBB - The value of the 16 bit Phy Identifier 2 register as

Documentation/media/uapi/cec/cec-func-close.rst

+0 −5
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ Arguments 
Description

===========



.. note::



   This documents the proposed CEC API. This API is not yet finalized

   and is currently only available as a staging kernel module.



Closes the cec device. Resources associated with the file descriptor are

freed. The device configuration remain unchanged.

Documentation/media/uapi/cec/cec-func-ioctl.rst

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ Arguments 
Description

===========



.. note::



   This documents the proposed CEC API. This API is not yet finalized

   and is currently only available as a staging kernel module.



The :c:func:`ioctl()` function manipulates cec device parameters. The

argument ``fd`` must be an open file descriptor.