git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Jason Gunthorpe <jgg@mellanox.com>
	Mon, 28 Oct 2019 19:36:29 +0000 (16:36 -0300)
committer	Jason Gunthorpe <jgg@mellanox.com>
	Mon, 28 Oct 2019 19:36:29 +0000 (16:36 -0300)
commit	553f9386624ee032674911abf2a871afffc47a22
tree	284127b68e10bd919adb420a5f37dc19d06532f6	tree \| snapshot
parent	218399c07dd30e19978e0df58ccacf0630e4091f	commit \| diff
parent	4c2eb1b169379efcdb738968c8c39c0a7cf58fa5	commit \| diff

Merge tag 'v5.4-rc5' into rdma.git for-next

Linux 5.4-rc5

For dependencies in the next patches

Conflict resolved by keeping the delete of the unlock.

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

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/cm.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/cma.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/device.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/nldev.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