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

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



Conflicts:
	drivers/net/ethernet/mellanox/mlx4/cmd.c
	net/core/fib_rules.c
	net/ipv4/fib_frontend.c

The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.

The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 60302ff6 f22e6e84

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

+3 −1
Original line number Original line 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).

(DSA_MAX_SWITCHES).

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

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

- #address-cells	: Must be 1

- #size-cells		: Must be 0

- #size-cells		: Must be 0

Documentation/input/alps.txt

+8 −0
Original line number Original line 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 4:  0   y6   y5   y4   y3   y2   y1   y0

 byte 5:  0   z6   z5   z4   z3   z2   z1   z0

 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

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 7:    0   y6   y5   y4   y3   y2   y1   y0

 byte 8:    0   z6   z5   z4   z3   z2   z1   z0

 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

ALPS Absolute Mode - Protocol Version 3

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

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

Documentation/input/event-codes.txt

+6 −0
Original line number Original line 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

The kernel does not provide button emulation for such devices but treats

them as any other INPUT_PROP_BUTTONPAD device.

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:

Guidelines:

==========

==========

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

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

Documentation/input/multi-touch-protocol.txt

+6 −3
Original line number Original line 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

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

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

event should be omitted. The protocol currently supports MT_TOOL_FINGER,

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

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

drivers should instead use input_mt_report_slot_state().

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

ABS_MT_BLOB_ID

MAINTAINERS

+2 −3
Original line number Original line Diff line number Diff line
@@ -637,8 +637,7 @@ F: drivers/gpu/drm/radeon/radeon_kfd.h 
F:      include/uapi/linux/kfd_ioctl.h

F:      include/uapi/linux/kfd_ioctl.h





AMD MICROCODE UPDATE SUPPORT

AMD MICROCODE UPDATE SUPPORT

M:	Andreas Herrmann <herrmann.der.user@googlemail.com>

M:	Borislav Petkov <bp@alien8.de>

L:	amd64-microcode@amd64.org

S:	Maintained

S:	Maintained

F:	arch/x86/kernel/cpu/microcode/amd*

F:	arch/x86/kernel/cpu/microcode/amd*
@@ -5095,7 +5094,7 @@ S: Supported 
F:	drivers/platform/x86/intel_menlow.c

F:	drivers/platform/x86/intel_menlow.c





INTEL IA32 MICROCODE UPDATE SUPPORT

INTEL IA32 MICROCODE UPDATE SUPPORT

M:	Tigran Aivazian <tigran@aivazian.fsnet.co.uk>

M:	Borislav Petkov <bp@alien8.de>

S:	Maintained

S:	Maintained

F:	arch/x86/kernel/cpu/microcode/core*

F:	arch/x86/kernel/cpu/microcode/core*

F:	arch/x86/kernel/cpu/microcode/intel*

F:	arch/x86/kernel/cpu/microcode/intel*