Commit 5b1ad68f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'linus' into x86/mm 

Make sure to get the latest fixes before applying the ptdump enhancements.
parents 1013fe32 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/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.

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

+0 −5
Original line number Diff line number Diff line
@@ -46,11 +46,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.



To open a cec device applications call :c:func:`open()` with the

desired device name. The function has no side effects; the device

configuration remain unchanged.

Documentation/media/uapi/cec/cec-func-poll.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.



With the :c:func:`poll()` function applications can wait for CEC

events.