git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

author	Jason Gunthorpe <jgg@nvidia.com>
	Tue, 24 May 2022 15:40:28 +0000 (12:40 -0300)
committer	Jason Gunthorpe <jgg@nvidia.com>
	Tue, 24 May 2022 15:40:28 +0000 (12:40 -0300)
commit	a6f844da39af8046798ba5cadf92a0c54da80b26
tree	7ace73f27ac1fe17413415c3a5a79cbb7c1e4855	tree \| snapshot
parent	b599b31033aa6928309d1cf8180c3daf260574e1	commit \| diff
parent	4b0986a3613c92f4ec1bdc7f60ec66fea135991f	commit \| diff

Merge tag 'v5.18' into rdma.git for-next

Following patches have dependencies.

Resolve the merge conflict in
drivers/net/ethernet/mellanox/mlx5/core/main.c by keeping the new names
for the fs functions following linux-next:

https://lore.kernel.org/r/20220519113529.226bc3e2@canb.auug.org.au/

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

MicroBlaze GIT Repository

RSS Atom

drivers/infiniband/hw/irdma/utils.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/irdma/verbs.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/hw/mlx5/mr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rdmavt/qp.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/sw/rxe/rxe_resp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history