AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
2d873449a2
linux_dsm_epyc7002/include/linux/mlx5
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
..
accel.h net/mlx5: IPSec, Add support for ESN 2018-03-07 15:54:36 -08:00
cmd.h
cq.h net/mlx5: CQ hold/put API 2018-02-15 00:30:01 -08:00
device.h IB/mlx5: Expose more priorities for bypass namespace 2018-03-14 16:05:16 -04:00
doorbell.h IB/mlx5: Use blue flame register allocator in mlx5_ib 2017-01-09 20:25:08 +02:00
driver.h Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next 2018-03-14 19:28:58 -04:00
eswitch.h net/mlx5: E-Switch, Add definition of IB representor 2018-02-23 12:36:38 -08:00
fs_helpers.h {net,IB}/mlx5: Add flow steering helpers 2018-03-06 22:20:14 -08:00
fs.h net/mlx5: Add flow-steering commands for FPGA IPSec implementation 2018-03-07 15:54:35 -08:00
mlx5_ifc_fpga.h net/mlx5: IPSec, Add support for ESN 2018-03-07 15:54:36 -08:00
mlx5_ifc.h {net,IB}/mlx5: Add flow steering helpers 2018-03-06 22:20:14 -08:00
port.h net/mlx5: QPTS and QPDPM register firmware command support 2017-11-04 21:26:21 -07:00
qp.h net/mlx5: Add DCT command interface 2018-01-08 11:38:49 -07:00
srq.h net/mlx5: Add XRQ support 2017-08-29 08:30:20 -04:00
transobj.h net/mlx5: Enable setting hairpin queue size 2018-01-19 22:41:32 +02:00
vport.h {net, IB}/mlx5: Manage port association for multiport RoCE 2018-01-08 11:42:22 -07:00