Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2...
authorJason Gunthorpe <jgg@mellanox.com>
Mon, 29 Jan 2018 20:26:40 +0000 (13:26 -0700)
committerJason Gunthorpe <jgg@mellanox.com>
Tue, 30 Jan 2018 16:30:00 +0000 (09:30 -0700)
commite7996a9a77fc669387da43ff4823b91cc4872bd0
tree617f0a128e222539d67e8cccc359f1bc4b984900
parentb5fa635aab8f0d39a824c01991266a6d06f007fb
parentd8a5b80568a9cb66810e75b182018e9edb68e8ff
Merge tag v4.15 of git://git./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>
13 files changed:
MAINTAINERS
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/qp.c
drivers/infiniband/ulp/ipoib/ipoib_cm.c
drivers/infiniband/ulp/isert/ib_isert.c
drivers/net/ethernet/mellanox/mlx5/core/eq.c
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/mellanox/mlx5/core/qp.c
drivers/net/ethernet/mellanox/mlx5/core/vport.c
include/linux/mlx5/driver.h
include/linux/mlx5/mlx5_ifc.h