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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: a52dc3a d6d5df1)

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	036313316d3a38bfde9ba49b3d00f73b7d8019d2
tree	284127b68e10bd919adb420a5f37dc19d06532f6	tree \| snapshot
parent	a52dc3a100958f4bf5e921067ba626c2caf8e55f	commit \| diff
parent	d6d5df1db6e9d7f8f76d2911707f7d5877251b02	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>

Domain: System / Kernel;