• Jason Gunthorpe's avatar
    · 5331fa0d
    Jason Gunthorpe authored
    Merge branch 'mlx5-next' into rdma.git for-next
    
    From
    git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
    
    Required for dependencies on the next series
    
    * branch 'mlx5-next':
      net/mlx5: E-Switch, add a new prio to be used by the RDMA side
      net/mlx5: E-Switch, don't use hardcoded values for FDB prios
      net/mlx5: Fix false compilation warning
      net/mlx5: Expose MPEIN (Management PCIE INfo) register layout
      net/mlx5: Add rate limit print macros
      net/mlx5: Add explicit bar address field
      net/mlx5: Replace dev_err/warn/info by mlx5_core_err/warn/info
      net/mlx5: Use dev->priv.name instead of dev_name
      net/mlx5: Make mlx5_core messages independent from mdev->pdev
      net/mlx5: Break load_one into three stages
      net/mlx5: Function setup/teardown procedures
      net/mlx5: Move health and page alloc init to mdev_init
      net/mlx5: Split mdev init and pci init
      net/mlx5: Remove redundant init functions parameter
      net/mlx5: Remove spinlock support from mlx5_write64
      net/mlx5: Remove unused MLX5_*_DOORBELL_LOCK macros
    Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
    5331fa0d
main.c 177 KB