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

Commit 3efa70d7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 76e0e70e 926af627

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.

Documentation/media/uapi/cec/cec-intro.rst

+12 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
Introduction

============



.. note::



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

   and is currently only available as a staging kernel module.



HDMI connectors provide a single pin for use by the Consumer Electronics

Control protocol. This protocol allows different devices connected by an

HDMI cable to communicate. The protocol for CEC version 1.4 is defined
@@ -31,3 +26,15 @@ control just the CEC pin. 
Drivers that support CEC will create a CEC device node (/dev/cecX) to

give userspace access to the CEC adapter. The

:ref:`CEC_ADAP_G_CAPS` ioctl will tell userspace what it is allowed to do.



In order to check the support and test it, it is suggested to download

the `v4l-utils <https://git.linuxtv.org/v4l-utils.git/>`_ package. It

provides three tools to handle CEC:



- cec-ctl: the Swiss army knife of CEC. Allows you to configure, transmit

  and monitor CEC messages.



- cec-compliance: does a CEC compliance test of a remote CEC device to

  determine how compliant the CEC implementation is.



- cec-follower: emulates a CEC follower.