[kbuild-all] [sashal-linux-stable:queue-4.14 23/23] drivers/infiniband/hw/mlx4/main.c:569:1: error: version control conflict marker in file