]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'bart-srpt-for-next' into k.o/wip/dl-for-next
authorDoug Ledford <dledford@redhat.com>
Mon, 8 Jan 2018 21:06:20 +0000 (16:06 -0500)
committerDoug Ledford <dledford@redhat.com>
Mon, 8 Jan 2018 21:06:20 +0000 (16:06 -0500)
commit832ff3693cd3d4ac95df39a0f4fafe180616bf18
treec5d080c599c0f2aa8bd2ce522698242a540e6b88
parentd2c29e2dc7c4cc4c6f7c4e580e1c0cb4aa40430e
parentba7de039d68272795dc6b9926212fae851968f4f
Merge branch 'bart-srpt-for-next' into k.o/wip/dl-for-next

Merging in 12 patch series from Bart that required changes in the
current for-rc branch in order to apply cleanly.

Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/core/core_priv.h
drivers/infiniband/core/device.c
drivers/infiniband/core/nldev.c
drivers/infiniband/ulp/ipoib/ipoib_main.c