linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Doug Ledford <dledford@redhat.com>,
	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Maor Gottlieb <maorg@mellanox.com>,
	Achiad Shochat <achiad@mellanox.com>
Subject: linux-next: build failure after merge of the rdma tree
Date: Wed, 13 Jan 2016 12:35:49 +1100	[thread overview]
Message-ID: <20160113123549.7293b76a@canb.auug.org.au> (raw)

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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

             reply	other threads:[~2016-01-13  1:36 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-13  1:35 Stephen Rothwell [this message]
2016-03-16  1:15 linux-next: build failure after merge of the rdma tree Stephen Rothwell
2016-03-16  6:49 ` Herbert Xu
2016-03-16 19:02   ` Doug Ledford
2016-03-16 20:41     ` Stephen Rothwell
2016-03-16 22:14     ` Ismail, Mustafa
2016-09-27  1:23 Stephen Rothwell
2016-09-27  5:04 ` Christoph Hellwig
2016-09-27  5:48   ` Stephen Rothwell
2016-09-27 13:39     ` Christoph Hellwig
2016-09-27 17:15       ` Doug Ledford
2016-09-28  1:43 ` Stephen Rothwell
2016-09-28 15:00   ` Doug Ledford
2016-09-28 15:23     ` Greg KH
2016-09-28 15:26       ` Doug Ledford
2016-09-28 21:45     ` Stephen Rothwell
2017-02-15  0:30 Stephen Rothwell
2017-02-15  1:05 ` Doug Ledford
2017-02-15  5:09   ` Selvin Xavier
2017-04-21  1:42 Stephen Rothwell
2017-04-21  1:58 ` Joe Perches
2017-04-21  2:21   ` Doug Ledford
2017-04-21  2:23     ` Stephen Rothwell
2017-04-21  2:21   ` Stephen Rothwell
2017-07-31  2:07 Stephen Rothwell
2018-01-25  7:22 Stephen Rothwell
2018-01-25  8:50 ` Leon Romanovsky
2018-01-25 16:08   ` Doug Ledford
2018-12-04  0:47 Stephen Rothwell
2018-12-04  1:52 ` Jason Gunthorpe
2018-12-04  9:42   ` Leon Romanovsky
2018-12-07  2:41     ` Stephen Rothwell
2018-12-05 12:25   ` Guy Levi(SW)
2018-12-05 22:58     ` Stephen Rothwell
2018-12-10  0:43       ` Changbin Du
2018-12-10 15:52       ` Masahiro Yamada
2019-07-01  4:14 Stephen Rothwell
2019-07-01  7:54 ` wangxi
2019-07-01 22:49   ` Jason Gunthorpe
2019-07-04  2:02 ` Stephen Rothwell
2019-07-04  2:04   ` Jason Gunthorpe
2019-07-04  2:10     ` oulijun
2019-07-04  4:07     ` wangxi
2019-07-04  4:10       ` wangxi
2019-07-04  6:31     ` oulijun
2019-07-05 13:15   ` Jason Gunthorpe
2019-07-05 14:59     ` Stephen Rothwell
2019-07-08  2:57 Stephen Rothwell
2019-07-08 16:08 ` Jason Gunthorpe
2019-07-09  3:11   ` Stephen Rothwell
2019-07-25 18:32   ` Dennis Dalessandro
2019-07-08  3:03 Stephen Rothwell
2019-07-08 14:09 ` Jason Gunthorpe
2019-07-09  3:30 Stephen Rothwell
2019-07-09  7:04 ` Mark Zhang
2019-07-09  7:18   ` Leon Romanovsky
2019-07-09 12:43     ` Stephen Rothwell
2019-07-09 13:11       ` Leon Romanovsky
2019-07-09 12:46     ` Jason Gunthorpe
2019-07-10  1:04       ` Stephen Rothwell
2019-07-10  4:30         ` Stephen Rothwell
2019-07-16 23:28           ` Stephen Rothwell
2019-07-17  6:33             ` Masahiro Yamada
2019-07-17  7:45               ` Stephen Rothwell
2020-02-26  2:51 Stephen Rothwell
2020-02-26  3:04 ` Devesh Sharma
2020-02-26 17:25 ` Jason Gunthorpe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160113123549.7293b76a@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=achiad@mellanox.com \
    --cc=davem@davemloft.net \
    --cc=dledford@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=maorg@mellanox.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).