Merge tag 'mlx5-update-2017-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git...

Saeed Mahameed says:

====================
mlx5-update-2017-05-23

First patch from Leon, came to remove the redundant usage of mlx5_vzalloc,
and directly use kvzalloc across all mlx5 drivers.

2nd patch from Noa, adds new device IDs into the supported devices list.

3rd and 4th patches from Ilan are adding the basic infrastructure and
support for Mellanox's mlx5 FPGA.

Last two patches from Tariq came to modify the outdated driver version
reported in ethtool and in mlx5_ib to more reflect the current driver state
and remove the redundant date string reported in the version.
====================

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/Kconfig
index 27251a78075ccba1c4e151b54387aa987dc17210,28cf88483ca4ff972560c3453416734db0bcac6f..cf1ef48bfd8d2330c08cbef9fab63217bb2bc2a5
--- 1/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
--- 2/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Kconfig
@@@ -11,9 -11,19 +11,19 @@@ config MLX5_COR
          Core driver for low level functionality of the ConnectX-4 and
          Connect-IB cards by Mellanox Technologies.
  
+ config MLX5_FPGA
+         bool "Mellanox Technologies Innova support"
+         depends on MLX5_CORE
+         ---help---
+           Build support for the Innova family of network cards by Mellanox
+           Technologies. Innova network cards are comprised of a ConnectX chip
+           and an FPGA chip on one board. If you select this option, the
+           mlx5_core driver will include the Innova FPGA core and allow building
+           sandbox-specific client drivers.
+ 
  config MLX5_CORE_EN
        bool "Mellanox Technologies ConnectX-4 Ethernet support"
 -      depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE
 +      depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE
        depends on IPV6=y || IPV6=n || MLX5_CORE=m
        imply PTP_1588_CLOCK
        default n

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/ipoib.c
Simple merge