AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-21 10:06:00 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
4289861d88
linux_dsm_epyc7002/drivers/infiniband/hw/bnxt_re
History
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
..
bnxt_re.h infiniband: bnxt_re: use BIT_ULL() for 64-bit bit masks 2018-03-14 18:24:13 -04:00
hw_counters.c RDMA/bnxt_re: expose detailed stats retrieved from HW 2018-01-18 14:49:18 -05:00
hw_counters.h RDMA/bnxt_re: expose detailed stats retrieved from HW 2018-01-18 14:49:18 -05:00
ib_verbs.c Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next 2018-03-14 19:28:58 -04:00
ib_verbs.h RDMA/bnxt_re: Avoid Hard lockup during error CQE processing 2018-03-06 20:08:39 -07:00
Kconfig bnxt_re: add MAY_USE_DEVLINK dependency 2017-07-29 14:17:48 -07:00
main.c RDMA/bnxt_re: Avoid Hard lockup during error CQE processing 2018-03-06 20:08:39 -07:00
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
qplib_fp.c infiniband: qplib_fp: fix pointer cast 2018-03-14 18:24:12 -04:00
qplib_fp.h RDMA/bnxt_re: Avoid Hard lockup during error CQE processing 2018-03-06 20:08:39 -07:00
qplib_rcfw.c RDMA/bnxt_re: Avoid Hard lockup during error CQE processing 2018-03-06 20:08:39 -07:00
qplib_rcfw.h RDMA/bnxt_re: Fix incorrect DB offset calculation 2018-02-28 12:10:32 -07:00
qplib_res.c RDMA/bnxt_re: Use common error handling code in bnxt_qplib_alloc_dpi_tbl() 2018-02-01 15:24:31 -07:00
qplib_res.h bnxt_re: Make room for mapping beyond 32 entries 2017-10-18 10:24:13 -04:00
qplib_sp.c Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next 2018-03-14 19:28:58 -04:00
qplib_sp.h RDMA/bnxt_re: expose detailed stats retrieved from HW 2018-01-18 14:49:18 -05:00
roce_hsi.h RDMA/bnxt_re: Fix incorrect DB offset calculation 2018-02-28 12:10:32 -07:00