Jason Gunthorpe e7996a9a77 Linux 4.15 ... -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJabj6pAAoJEHm+PkMAQRiGs8cIAJQFkCWnbz86e3vG4DuWhyA8 CMGHCQdUOxxFGa/ixhIiuetbC0x+JVHAjV2FwVYbAQfaZB3pfw2iR1ncQxpAP1AI oLU9vBEqTmwKMPc9CM5rRfnLFWpGcGwUNzgPdxD5yYqGDtcM8K840mF6NdkYe5AN xU8rv1wlcFPF4A5pvHCH0pvVmK4VxlVFk/2H67TFdxBs4PyJOnSBnf+bcGWgsKO6 hC8XIVtcKCH2GfFxt5d0Vgc5QXJEpX1zn2mtCa1MwYRjN2plgYfD84ha0xE7J0B0 oqV/wnjKXDsmrgVpncr3txd4+zKJFNkdNRE4eLAIupHo2XHTG4HvDJ5dBY2NhGU= =sOml -----END PGP SIGNATURE----- Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git To resolve conflicts in: drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/mlx5/qp.c From patches merged into the -rc cycle. The conflict resolution matches what linux-next has been carrying. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>		2018-01-30 09:30:00 -07:00
..
cmd.h
cq.h	Updates for 4.15 kernel merge window	2017-11-15 14:54:53 -08:00
device.h	net/mlx5: Set software owner ID during init HCA	2018-01-08 11:42:20 -07:00
doorbell.h	IB/mlx5: Use blue flame register allocator in mlx5_ib	2017-01-09 20:25:08 +02:00
driver.h	Linux 4.15	2018-01-30 09:30:00 -07:00
fs.h	net/mlx5: Use underlay QPN from the root name space	2017-05-14 13:33:45 +03:00
mlx5_ifc_fpga.h	net/mlx5: Accel, Add IPSec acceleration interface	2017-06-27 16:36:47 +03:00
mlx5_ifc.h	Linux 4.15	2018-01-30 09:30:00 -07: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	IB/mlx5: Support setting Ethernet priority for Raw Packet QPs	2016-01-21 12:01:09 -05:00
vport.h	{net, IB}/mlx5: Manage port association for multiport RoCE	2018-01-08 11:42:22 -07:00