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
..
ipoib	Linux 4.15	2018-01-30 09:30:00 -07:00
iser	IB/iser: Combine substrings for three messages	2018-01-28 14:07:16 -07:00
isert	Linux 4.15	2018-01-30 09:30:00 -07:00
opa_vnic	infiniband: fix ulp/opa_vnic/opa_vnic_vema.c kernel-doc notation	2018-01-10 22:00:34 -07:00
srp	IB/srp: Add target_can_queue login parameter	2018-01-23 11:35:05 -05:00
srpt	RDMA/srpt: Fix RCU debug build error	2018-01-25 10:17:01 -05:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00