]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e7c278a cc0cba7)
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)
commit6de58fdd38f8f3d2c39a1e1d53e299a6b0c12b1b
tree617f0a128e222539d67e8cccc359f1bc4b984900tree | snapshot
parente7c278a98908a499182d4b022a274533b5fb590fcommit | diff
parentcc0cba780e487bce646cf4a7d2ec17f133393fefcommit | 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>
13 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/main.c diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/qp.c diff1 | diff2 | blob | history
drivers/infiniband/ulp/ipoib/ipoib_cm.c diff1 | diff2 | blob | history
drivers/infiniband/ulp/isert/ib_isert.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eq.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/qp.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/vport.c diff1 | diff2 | blob | history
include/linux/mlx5/driver.h diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.