]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorSaeed Mahameed <saeedm@mellanox.com>
Mon, 22 Apr 2019 22:25:39 +0000 (15:25 -0700)
committerSaeed Mahameed <saeedm@mellanox.com>
Mon, 22 Apr 2019 22:25:39 +0000 (15:25 -0700)
commitbbdfb7d374288b195d97f7b2fe543187d5a211ef
treefa4424dac80b792f105dfcf94cce97d9878b8148
parent6ded87f221c64b5ee5671ddbb6d9b9e8d268a50a
parent805099b2fb57eba3d69bc38aeb447dfe76b0ebb9
Merge tag 'v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mlx5-next

Linux 5.1-rc1

We forgot to reset the branch last merge window thus mlx5-next is outdated
and still based on 5.0-rc2. This merge commit is needed to sync mlx5-next
branch with 5.1-rc1.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
13 files changed:
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mr.c
drivers/infiniband/hw/mlx5/qp.c
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
drivers/net/ethernet/mellanox/mlx5/core/health.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
drivers/net/ethernet/mellanox/mlx5/core/uar.c
include/linux/mlx5/driver.h
include/linux/mlx5/mlx5_ifc.h