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.h	IB/ipoib: Change number of TX wqe to 64	2017-10-25 13:36:50 -04:00
ipoib_cm.c	Linux 4.15	2018-01-30 09:30:00 -07:00
ipoib_ethtool.c	RDMA/core: Rename kernel modify_cq to better describe its usage	2017-11-13 16:59:22 -05:00
ipoib_fs.c	IB/SA: Add OPA path record type	2017-05-01 14:39:02 -04:00
ipoib_ib.c	IB/ipoib: Fix for notify send CQ failure messages	2018-01-03 10:38:07 -07:00
ipoib_main.c	Merge branch 'bart-srpt-for-next' into k.o/wip/dl-for-next	2018-01-08 16:06:20 -05:00
ipoib_multicast.c	IB/ipoib: Fix race condition in neigh creation	2018-01-02 11:09:05 -07:00
ipoib_netlink.c	net: add netlink_ext_ack argument to rtnl_link_ops.changelink	2017-06-26 23:13:22 -04:00
ipoib_verbs.c	IB/ipoib: Replace printk with pr_warn	2017-12-11 16:19:43 -07:00
ipoib_vlan.c	IB/ipoib: Fix inconsistency with free_netdev and free_rdma_netdev	2017-09-25 11:47:24 -04:00
Kconfig
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00