From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753407AbcAMBgu (ORCPT ); Tue, 12 Jan 2016 20:36:50 -0500 Received: from [103.22.144.67] ([103.22.144.67]:59558 "EHLO ozlabs.org" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751058AbcAMBgs (ORCPT ); Tue, 12 Jan 2016 20:36:48 -0500 Date: Wed, 13 Jan 2016 12:35:49 +1100 From: Stephen Rothwell To: Doug Ledford , David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Maor Gottlieb , Achiad Shochat Subject: linux-next: build failure after merge of the rdma tree Message-ID: <20160113123549.7293b76a@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Doug, After merging the rdma tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_add': drivers/infiniband/hw/mlx5/main.c:2255:6: error: too few arguments to function 'mlx5_ib_port_link_layer' if (mlx5_ib_port_link_layer(&dev->ib_dev) == ^ drivers/infiniband/hw/mlx5/main.c:89:1: note: declared here mlx5_ib_port_link_layer(struct ib_device *device, u8 port_num) ^ Caused by commit ebd61f68e1c7 ("IB/mlx5: Support IB device's callback for getting the link layer") interacting with commit 038d2ef87572 ("IB/mlx5: Add flow steering support") from the net-next tree. I have added the following merge fix patch: From: Stephen Rothwell Date: Wed, 13 Jan 2016 12:30:50 +1100 Subject: [PATCH] IB/mlx5: merge fix for mlx5_ib_port_link_layer API change Signed-off-by: Stephen Rothwell --- drivers/infiniband/hw/mlx5/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 307a8c040a11..a2613d828578 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2252,7 +2252,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) (1ull << IB_USER_VERBS_CMD_CLOSE_XRCD); } - if (mlx5_ib_port_link_layer(&dev->ib_dev) == + if (mlx5_ib_port_link_layer(&dev->ib_dev, 1) == IB_LINK_LAYER_ETHERNET) { dev->ib_dev.create_flow = mlx5_ib_create_flow; dev->ib_dev.destroy_flow = mlx5_ib_destroy_flow; -- 2.6.4 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the rdma tree Date: Wed, 13 Jan 2016 12:35:49 +1100 Message-ID: <20160113123549.7293b76a@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from [103.22.144.67] ([103.22.144.67]:59558 "EHLO ozlabs.org" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751058AbcAMBgs (ORCPT ); Tue, 12 Jan 2016 20:36:48 -0500 Sender: linux-next-owner@vger.kernel.org List-ID: To: Doug Ledford , David Miller , netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Maor Gottlieb , Achiad Shochat Hi Doug, After merging the rdma tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_add': drivers/infiniband/hw/mlx5/main.c:2255:6: error: too few arguments to function 'mlx5_ib_port_link_layer' if (mlx5_ib_port_link_layer(&dev->ib_dev) == ^ drivers/infiniband/hw/mlx5/main.c:89:1: note: declared here mlx5_ib_port_link_layer(struct ib_device *device, u8 port_num) ^ Caused by commit ebd61f68e1c7 ("IB/mlx5: Support IB device's callback for getting the link layer") interacting with commit 038d2ef87572 ("IB/mlx5: Add flow steering support") from the net-next tree. I have added the following merge fix patch: From: Stephen Rothwell Date: Wed, 13 Jan 2016 12:30:50 +1100 Subject: [PATCH] IB/mlx5: merge fix for mlx5_ib_port_link_layer API change Signed-off-by: Stephen Rothwell --- drivers/infiniband/hw/mlx5/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 307a8c040a11..a2613d828578 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -2252,7 +2252,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) (1ull << IB_USER_VERBS_CMD_CLOSE_XRCD); } - if (mlx5_ib_port_link_layer(&dev->ib_dev) == + if (mlx5_ib_port_link_layer(&dev->ib_dev, 1) == IB_LINK_LAYER_ETHERNET) { dev->ib_dev.create_flow = mlx5_ib_create_flow; dev->ib_dev.destroy_flow = mlx5_ib_destroy_flow; -- 2.6.4 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au