]> asedeno.scripts.mit.edu Git - linux.git/commit
Merge branch 'mellanox/mlx5-next' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Tue, 24 Jul 2018 19:10:23 +0000 (13:10 -0600)
committerJason Gunthorpe <jgg@mellanox.com>
Tue, 24 Jul 2018 19:10:23 +0000 (13:10 -0600)
commiteda98779f7d318cf96f030bbc5b23f034b69b80a
tree4cdd7241346aca73482009b62c88a0b3cb014922
parent4fca037783512cedfb23a116c66727ce40c8558a
parent664000b6bb4352295dc774108a1fc87c4a1ad0e3
Merge branch 'mellanox/mlx5-next' into rdma.git for-next

From git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git

This is required to resolve dependencies of the next series of RDMA
patches.

* branch 'mellanox/mlx5-next':
  net/mlx5: Add support for flow table destination number
  net/mlx5: Add forward compatible support for the FTE match data
  net/mlx5: Fix tristate and description for MLX5 module
  net/mlx5: Better return types for CQE API
  net/mlx5: Use ERR_CAST() instead of coding it
  net/mlx5: Add missing SET_DRIVER_VERSION command translation
  net/mlx5: Add XRQ commands definitions
  net/mlx5: Add core support for double vlan push/pop steering action
  net/mlx5: Expose MPEGC (Management PCIe General Configuration) structures
  net/mlx5: FW tracer, add hardware structures
  net/mlx5: fix uaccess beyond "count" in debugfs read/write handlers

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
include/linux/mlx5/mlx5_ifc.h