review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1ba7c8f f74c2bb)

author	Jason Gunthorpe <jgg@mellanox.com>
	Thu, 12 Sep 2019 15:49:56 +0000 (12:49 -0300)
committer	Jason Gunthorpe <jgg@mellanox.com>
	Fri, 13 Sep 2019 19:59:51 +0000 (16:59 -0300)
commit	75c66515e4fea4e9bb488b6125e014220f846c61
tree	a7a79ca9a05da74fd3fd74b1c8c3e1cb2901c167	tree \| snapshot
parent	1ba7c8f800586805c409f5b1ff1803318a41933a	commit \| diff
parent	f74c2bb98776e2de508f4d607cd519873065118e	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/counters.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/nldev.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/mlx5_ib.h	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/odp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/siw/siw_qp_tx.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/siw/siw_verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;