Merge tag 'mlx5-updates-2017-04-22' of git://git.kernel.org/pub/scm/linux/kernel...
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Apr 2017 18:11:10 +0000 (14:11 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Apr 2017 18:11:10 +0000 (14:11 -0400)
commitbc95cd8e8b2fc779b96ed4d7a2608c6a0e8dc240
tree2dd8dd342b1cbba92a33930de0c1e261d65d5ee8
parent58c4c6a3f7cb3a142674ba34e7e67e2d585b9787
parent8bf3198a5e394ed6815aeb8fedaf49722986bbd3
Merge tag 'mlx5-updates-2017-04-22' of git://git./linux/kernel/git/saeed/linux

Saeed Mahameed says:

====================
mlx5-updates-2017-04-22

Sparse and compiler warnings fixes from Stephen Hemminger.

From Roi Dayan and Or Gerlitz, Add devlink and mlx5 support for controlling
E-Switch encapsulation mode, this knob will enable HW support for applying
encapsulation/decapsulation to VF traffic as part of SRIOV e-switch offloading.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>