Doug Ledford 2d873449a2 Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next ... Due to bug fixes found by the syzkaller bot and taken into the for-rc branch after development for the 4.17 merge window had already started being taken into the for-next branch, there were fairly non-trivial merge issues that would need to be resolved between the for-rc branch and the for-next branch. This merge resolves those conflicts and provides a unified base upon which ongoing development for 4.17 can be based. Conflicts: drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f95 (IB/mlx5: Fix cleanup order on unload) added to for-rc and commit b5ca15ad7e (IB/mlx5: Add proper representors support) add as part of the devel cycle both needed to modify the init/de-init functions used by mlx5. To support the new representors, the new functions added by the cleanup patch needed to be made non-static, and the init/de-init list added by the representors patch needed to be modified to match the init/de-init list changes made by the cleanup patch. Updates: drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function prototypes added by representors patch to reflect new function names as changed by cleanup patch drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init stage list to match new order from cleanup patch Signed-off-by: Doug Ledford <dledford@redhat.com>		2018-03-14 19:28:58 -04:00
..
core	Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next	2018-03-14 19:28:58 -04:00
hw	Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next	2018-03-14 19:28:58 -04:00
sw	rdma_rxe: make rxe work over 802.1q VLAN devices	2018-03-14 16:33:25 -04:00
ulp	drivers/infiniband/ulp/srpt/ib_srpt.c: fix build with gcc-4.4.4	2018-03-14 18:14:08 -04:00
Kconfig	Second pull request for 4.16 merge window	2018-02-06 11:09:45 -08:00
Makefile