| commit | e7996a9a77fc669387da43ff4823b91cc4872bd0 | [log] [tgz] |
|---|---|---|
| author | Jason Gunthorpe <jgg@mellanox.com> | Mon Jan 29 13:26:40 2018 -0700 |
| committer | Jason Gunthorpe <jgg@mellanox.com> | Tue Jan 30 09:30:00 2018 -0700 |
| tree | 617f0a128e222539d67e8cccc359f1bc4b984900 | |
| parent | b5fa635aab8f0d39a824c01991266a6d06f007fb [diff] | |
| parent | d8a5b80568a9cb66810e75b182018e9edb68e8ff [diff] |
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>