]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v5.3-rc8' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Thu, 12 Sep 2019 15:49:56 +0000 (12:49 -0300)
committerJason Gunthorpe <jgg@mellanox.com>
Fri, 13 Sep 2019 19:59:51 +0000 (16:59 -0300)
commit53e06be86f03dbd4a07e9f797a0dbf6e01dd8b55
treea7a79ca9a05da74fd3fd74b1c8c3e1cb2901c167
parent9107256c8a2f60203c895a1681600429948bdf11
parent220de42a8402f0148d4956a35244fc7ed7a9c5c9
Merge tag 'v5.3-rc8' into rdma.git for-next

To resolve dependencies in following patches

mlx5_ib.h conflict resolved by keeing both hunks

Linux 5.3-rc8

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
15 files changed:
drivers/infiniband/core/cma.c
drivers/infiniband/core/counters.c
drivers/infiniband/core/nldev.c
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/hw/mlx5/mr.c
drivers/infiniband/hw/mlx5/odp.c
drivers/infiniband/hw/mlx5/qp.c
drivers/infiniband/sw/siw/siw_qp_tx.c
drivers/infiniband/sw/siw/siw_verbs.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c
include/linux/mlx5/device.h
include/linux/mlx5/mlx5_ifc.h