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

Commit aadd51aa authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

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



Resolve conflicts between 5888b93b ("Merge branch 'nf-hook-compress'") and
Florian Westphal br_netfilter works.

Conflicts:
        net/bridge/br_netfilter.c

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents 68e942e8 ee90b812

Documentation/devicetree/bindings/net/dsa/dsa.txt

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ the parent DSA node. The maximum number of allowed child nodes is 4 
(DSA_MAX_SWITCHES).

Each of these switch child nodes should have the following required properties:



- reg			: Describes the switch address on the MII bus

- reg			: Contains two fields. The first one describes the

			  address on the MII bus. The second is the switch

			  number that must be unique in cascaded configurations

- #address-cells	: Must be 1

- #size-cells		: Must be 0

Documentation/input/alps.txt

+8 −0
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ ALPS Absolute Mode - Protocol Version 2 
 byte 4:  0   y6   y5   y4   y3   y2   y1   y0

 byte 5:  0   z6   z5   z4   z3   z2   z1   z0



Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for

the DualPoint Stick.



Dualpoint device -- interleaved packet format

---------------------------------------------
@@ -127,6 +130,11 @@ Dualpoint device -- interleaved packet format 
 byte 7:    0   y6   y5   y4   y3   y2   y1   y0

 byte 8:    0   z6   z5   z4   z3   z2   z1   z0



Devices which use the interleaving format normally send standard PS/2 mouse

packets for the DualPoint Stick + ALPS Absolute Mode packets for the

touchpad, switching to the interleaved packet format when both the stick and

the touchpad are used at the same time.



ALPS Absolute Mode - Protocol Version 3

---------------------------------------

Documentation/input/event-codes.txt

+6 −0
Original line number Diff line number Diff line
@@ -294,6 +294,12 @@ accordingly. This property does not affect kernel behavior. 
The kernel does not provide button emulation for such devices but treats

them as any other INPUT_PROP_BUTTONPAD device.



INPUT_PROP_ACCELEROMETER

-------------------------

Directional axes on this device (absolute and/or relative x, y, z) represent

accelerometer data. All other axes retain their meaning. A device must not mix

regular directional axes and accelerometer axes on the same event node.



Guidelines:

==========

The guidelines below ensure proper single-touch and multi-finger functionality.

Documentation/input/multi-touch-protocol.txt

+6 −3
Original line number Diff line number Diff line
@@ -312,9 +312,12 @@ ABS_MT_TOOL_TYPE 


The type of approaching tool. A lot of kernel drivers cannot distinguish

between different tool types, such as a finger or a pen. In such cases, the

event should be omitted. The protocol currently supports MT_TOOL_FINGER and

MT_TOOL_PEN [2]. For type B devices, this event is handled by input core;

drivers should instead use input_mt_report_slot_state().

event should be omitted. The protocol currently supports MT_TOOL_FINGER,

MT_TOOL_PEN, and MT_TOOL_PALM [2]. For type B devices, this event is handled

by input core; drivers should instead use input_mt_report_slot_state().

A contact's ABS_MT_TOOL_TYPE may change over time while still touching the

device, because the firmware may not be able to determine which tool is being

used when it first appears.



ABS_MT_BLOB_ID

Documentation/networking/can.txt

+18 −2
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ This file contains 
      4.1.3 RAW socket option CAN_RAW_LOOPBACK

      4.1.4 RAW socket option CAN_RAW_RECV_OWN_MSGS

      4.1.5 RAW socket option CAN_RAW_FD_FRAMES

      4.1.6 RAW socket returned message flags

      4.1.6 RAW socket option CAN_RAW_JOIN_FILTERS

      4.1.7 RAW socket returned message flags

    4.2 Broadcast Manager protocol sockets (SOCK_DGRAM)

      4.2.1 Broadcast Manager operations

      4.2.2 Broadcast Manager message flags
@@ -601,7 +602,22 @@ solution for a couple of reasons: 
  CAN FD frames by checking if the device maximum transfer unit is CANFD_MTU.

  The CAN device MTU can be retrieved e.g. with a SIOCGIFMTU ioctl() syscall.



  4.1.6 RAW socket returned message flags

  4.1.6 RAW socket option CAN_RAW_JOIN_FILTERS



  The CAN_RAW socket can set multiple CAN identifier specific filters that

  lead to multiple filters in the af_can.c filter processing. These filters

  are indenpendent from each other which leads to logical OR'ed filters when

  applied (see 4.1.1).



  This socket option joines the given CAN filters in the way that only CAN

  frames are passed to user space that matched *all* given CAN filters. The

  semantic for the applied filters is therefore changed to a logical AND.



  This is useful especially when the filterset is a combination of filters

  where the CAN_INV_FILTER flag is set in order to notch single CAN IDs or

  CAN ID ranges from the incoming traffic.



  4.1.7 RAW socket returned message flags



  When using recvmsg() call, the msg->msg_flags may contain following flags: