linux-next: build failure after merge of the infiniband tree

linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 534 bytes --]

Hi all,

After merging the infiniband tree, today's linux-next build (x86_64
allmodconfig) failed like this:

make[2]: *** No rule to make target `firmware/qlogic/sd7220.fw', needed by `__fw_modbuild'.  Stop.

Probably caused by commit bd4d621eacaa6455da1c23260909da89ef4c1a01
("IB/qib: Use request_firmware() to load SD7220 firmware").

I have used the version of the infiniband tree from next-20100708 for
today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the infiniband tree

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 750 bytes --]

On Fri, 2010-07-09 at 11:04 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the infiniband tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> make[2]: *** No rule to make target `firmware/qlogic/sd7220.fw', needed by `__fw_modbuild'.  Stop.
> 
> Probably caused by commit bd4d621eacaa6455da1c23260909da89ef4c1a01
> ("IB/qib: Use request_firmware() to load SD7220 firmware").
> 
> I have used the version of the infiniband tree from next-20100708 for
> today.

The patch that I sent included the addition of
firmware/qlogic/sd7220.fw.ihex but it seems to have been lost somewhere
along the way.

Ben.

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: linux-next: build failure after merge of the infiniband tree

[Roland Dreier]

 > After merging the infiniband tree, today's linux-next build (x86_64
 > allmodconfig) failed like this:
 > 
 > make[2]: *** No rule to make target `firmware/qlogic/sd7220.fw', needed by `__fw_modbuild'.  Stop.

Sorry, I took the version of the patch that Ralph sent me, instead of
Ben's original patch, and that version dropped the most important part,
namely the actual firmware file.

Should be fixed now.
-- 
Roland Dreier <rolandd-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org> || For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/index.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

Hi Roland,

On Thu, 08 Jul 2010 20:46:14 -0700 Roland Dreier <rdreier@cisco.com> wrote:
>
> Sorry, I took the version of the patch that Ralph sent me, instead of
> Ben's original patch, and that version dropped the most important part,
> namely the actual firmware file.
> 
> Should be fixed now.

Thanks, I will pick it up on Monday.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]

Hi all,

After merging the infiniband tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/infiniband/hw/nes/nes_mgt.c: In function 'get_fpdu_info':
drivers/infiniband/hw/nes/nes_mgt.c:328:3: error: 'NES_DBG_PAU' undeclared (first use in this function)
drivers/infiniband/hw/nes/nes_mgt.c:328:3: note: each undeclared identifier is reported only once for each function it appears in
drivers/infiniband/hw/nes/nes_mgt.c: In function 'nes_chg_qh_handler':
drivers/infiniband/hw/nes/nes_mgt.c:664:4: error: 'NES_DBG_PAU' undeclared (first use in this function)
drivers/infiniband/hw/nes/nes_mgt.c: In function 'nes_change_quad_hash':
drivers/infiniband/hw/nes/nes_mgt.c:728:3: error: 'NES_DBG_PAU' undeclared (first use in this function)

Caused by commit cf3fbdf123bf ("RDMA/nes: Support for Packed And
Unaligned fpdus").  Please build tes ...

I have used the version of the infiniband tree from next-20111007 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 913 bytes --]

Hi all,

After merging the infiniband tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/infiniband/hw/cxgb4/device.c: In function 'qp_release':
drivers/infiniband/hw/cxgb4/device.c:124:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
drivers/infiniband/hw/cxgb4/device.c: In function 'qp_open':
drivers/infiniband/hw/cxgb4/device.c:148:2: error: implicit declaration of function 'vmalloc' [-Werror=implicit-function-declaration]
drivers/infiniband/hw/cxgb4/device.c:148:11: warning: assignment makes pointer from integer without a cast [enabled by default]

Caused by commit d716a2a014ad ("RDMA/cxgb4: Use vmalloc() for debugfs QP
dump").  See Rule 1 in Documentation/SubmitChecklist.

I have used the infiniband tree from next-20120518 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the infiniband tree

[Vipul Pandya]

On 21-05-2012 07:35, Stephen Rothwell wrote:

> Hi all,
> 
> After merging the infiniband tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/infiniband/hw/cxgb4/device.c: In function 'qp_release':
> drivers/infiniband/hw/cxgb4/device.c:124:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
> drivers/infiniband/hw/cxgb4/device.c: In function 'qp_open':
> drivers/infiniband/hw/cxgb4/device.c:148:2: error: implicit declaration of function 'vmalloc' [-Werror=implicit-function-declaration]
> drivers/infiniband/hw/cxgb4/device.c:148:11: warning: assignment makes pointer from integer without a cast [enabled by default]
> 
> Caused by commit d716a2a014ad ("RDMA/cxgb4: Use vmalloc() for debugfs QP
> dump").  See Rule 1 in Documentation/SubmitChecklist.
> 
> I have used the infiniband tree from next-20120518 for today.
> 


Hi Stephen,

Below patch should resolve this issue.

>From 433d2002d3ba2119146fdec6e0a97b67834df960 Mon Sep 17 00:00:00 2001
From: Vipul Pandya <vipul@chelsio.com>
Date: Mon, 21 May 2012 17:31:13 +0530
Subject: [PATCH] RDMA/cxgb4: Include vmalloc.h for vmalloc and vfree

Signed-off-by: Vipul Pandya <vipul@chelsio.com>
---
 drivers/infiniband/hw/cxgb4/device.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/infiniband/hw/cxgb4/device.c
b/drivers/infiniband/hw/cxgb4/device.c
index c8fd1d8..cb4ecd7 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/debugfs.h>
+#include <linux/vmalloc.h>

 #include <rdma/ib_verbs.h>

--

Re: linux-next: build failure after merge of the infiniband tree

[Roland Dreier]

> diff --git a/drivers/infiniband/hw/cxgb4/device.c
> b/drivers/infiniband/hw/cxgb4/device.c
> index c8fd1d8..cb4ecd7 100644
> --- a/drivers/infiniband/hw/cxgb4/device.c
> +++ b/drivers/infiniband/hw/cxgb4/device.c
> @@ -32,6 +32,7 @@
>  #include <linux/module.h>
>  #include <linux/moduleparam.h>
>  #include <linux/debugfs.h>
> +#include <linux/vmalloc.h>
>
>  #include <rdma/ib_verbs.h>

Thanks, I folded this into my pull request.

linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

Hi all,

After merging the infiniband tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/infiniband/core/cma.c: In function 'rdma_bind_addr':
drivers/infiniband/core/cma.c:2411:30: error: 'struct net' has no member named 'ipv6'

Caused by commit e7925058b0ed ("RDMA/cma: Bind to a specific address
family"). CONFIG_IPV6 is not enabled for this build.

I have used the version of the infiniband tree from next-20120705 for
today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the infiniband tree

[Roland Dreier]

On Thu, Jul 5, 2012 at 7:35 PM, Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> wrote:
> drivers/infiniband/core/cma.c: In function 'rdma_bind_addr':
> drivers/infiniband/core/cma.c:2411:30: error: 'struct net' has no member named 'ipv6'

Thanks, fixed with a "#if IS_ENABLED(CONFIG_IPV6)" around the code
that touches ipv6... Sean, let me know if more is required.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: linux-next: build failure after merge of the infiniband tree

[Hefty, Sean]

> Thanks, fixed with a "#if IS_ENABLED(CONFIG_IPV6)" around the code
> that touches ipv6... Sean, let me know if more is required.

The fix-up looks to be complete.  Thanks

linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

Hi all,

After merging the infiniband tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/net/ethernet/mellanox/mlx4/mr.c: In function 'mlx4_buddy_init':
drivers/net/ethernet/mellanox/mlx4/mr.c:134:4: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
drivers/net/ethernet/mellanox/mlx4/mr.c:134:19: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/net/ethernet/mellanox/mlx4/mr.c:148:4: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors

Caused by commit 2354c0904331 ("mlx4_core: Allow large mlx4_buddy
bitmaps") which added the vmalloc call (which was changed to vzalloc by
commit 09e22f30018b ("mlx4_core: Clean up buddy bitmap allocation").  The
include of vmalloc.h is missing.  See Rule 1 in
Documentation/SubmitChecklist.

I have used the infiniband tree from next-20120814 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the infiniband tree

[Roland Dreier]

On Wed, Aug 15, 2012 at 6:44 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> After merging the infiniband tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/net/ethernet/mellanox/mlx4/mr.c: In function 'mlx4_buddy_init':
> drivers/net/ethernet/mellanox/mlx4/mr.c:134:4: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
> drivers/net/ethernet/mellanox/mlx4/mr.c:134:19: warning: assignment makes pointer from integer without a cast [enabled by default]
> drivers/net/ethernet/mellanox/mlx4/mr.c:148:4: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
> cc1: some warnings being treated as errors

Thanks, should be fixed in tomorrow's for-next (added include of
<linux/vmalloc.h>).

> See Rule 1 in Documentation/SubmitChecklist.

Heh, but it compiles fine on x86!

 - R.

Re: linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

Hi Roland,

Thanks for the fix.

On Wed, 15 Aug 2012 21:07:37 -0700 Roland Dreier <roland-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
>
> > See Rule 1 in Documentation/SubmitChecklist.
> 
> Heh, but it compiles fine on x86!

Which is why we have Rule 1 :-)

-- 
Cheers,
Stephen Rothwell                    sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]

Hi all,

After merging the infiniband tree, today's linux-next build (x86_64_
allmodconfig) failed like this:

In file included from drivers/scsi/csiostor/csio_wr.h:42:0,
                 from drivers/scsi/csiostor/csio_scsi.h:49,
                 from drivers/scsi/csiostor/csio_init.h:45,
                 from drivers/scsi/csiostor/csio_attr.c:45:
drivers/scsi/csiostor/t4fw_api_stor.h:43:6: error: nested redefinition of 'enum fw_retval'
drivers/scsi/csiostor/t4fw_api_stor.h:43:6: error: redeclaration of 'enum fw_retval'
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:42:6: note: originally defined here
drivers/scsi/csiostor/t4fw_api_stor.h:48:2: error: redeclaration of enumerator 'FW_ENOEXEC'
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:39:2: note: previous definition of 'FW_ENOEXEC' was here
drivers/scsi/csiostor/t4fw_api_stor.h:50:2: error: redeclaration of enumerator 'FW_ENOMEM'
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:43:2: note: previous definition of 'FW_ENOMEM' was here
drivers/scsi/csiostor/t4fw_api_stor.h:58:2: error: redeclaration of enumerator 'FW_EADDRINUSE'
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:44:2: note: previous definition of 'FW_EADDRINUSE' was here

And several others similar.

Caused by commit f65b56b15931 ("RDMA/cxgb4: Fix LE hash collision bug for
active open connection").

I have used the infiniband tree from next-20121219 for today.

-- 
Cheers,
Stephen Rothwell                    sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the infiniband tree

[Roland Dreier]

On Wed, Dec 19, 2012 at 2:44 PM, Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> wrote:
> Hi all,
>
> After merging the infiniband tree, today's linux-next build (x86_64_
> allmodconfig) failed like this:
>
> In file included from drivers/scsi/csiostor/csio_wr.h:42:0,
>                  from drivers/scsi/csiostor/csio_scsi.h:49,
>                  from drivers/scsi/csiostor/csio_init.h:45,
>                  from drivers/scsi/csiostor/csio_attr.c:45:
> drivers/scsi/csiostor/t4fw_api_stor.h:43:6: error: nested redefinition of 'enum fw_retval'
> drivers/scsi/csiostor/t4fw_api_stor.h:43:6: error: redeclaration of 'enum fw_retval'
> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:42:6: note: originally defined here
> drivers/scsi/csiostor/t4fw_api_stor.h:48:2: error: redeclaration of enumerator 'FW_ENOEXEC'
> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:39:2: note: previous definition of 'FW_ENOEXEC' was here
> drivers/scsi/csiostor/t4fw_api_stor.h:50:2: error: redeclaration of enumerator 'FW_ENOMEM'
> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:43:2: note: previous definition of 'FW_ENOMEM' was here
> drivers/scsi/csiostor/t4fw_api_stor.h:58:2: error: redeclaration of enumerator 'FW_EADDRINUSE'
> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:44:2: note: previous definition of 'FW_EADDRINUSE' was here
>
> And several others similar.
>
> Caused by commit f65b56b15931 ("RDMA/cxgb4: Fix LE hash collision bug for
> active open connection").


Vipul, is the right fix to pull the full list of FW return values from
t4fw_api_stor.h into t4fw_api.h as part of this patch (f65b56b15931)?
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: linux-next: build failure after merge of the infiniband tree

[Vipul Pandya]

On 20-12-2012 05:52, Roland Dreier wrote:
> On Wed, Dec 19, 2012 at 2:44 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> After merging the infiniband tree, today's linux-next build (x86_64_
>> allmodconfig) failed like this:
>>
>> In file included from drivers/scsi/csiostor/csio_wr.h:42:0,
>>                  from drivers/scsi/csiostor/csio_scsi.h:49,
>>                  from drivers/scsi/csiostor/csio_init.h:45,
>>                  from drivers/scsi/csiostor/csio_attr.c:45:
>> drivers/scsi/csiostor/t4fw_api_stor.h:43:6: error: nested redefinition of 'enum fw_retval'
>> drivers/scsi/csiostor/t4fw_api_stor.h:43:6: error: redeclaration of 'enum fw_retval'
>> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:42:6: note: originally defined here
>> drivers/scsi/csiostor/t4fw_api_stor.h:48:2: error: redeclaration of enumerator 'FW_ENOEXEC'
>> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:39:2: note: previous definition of 'FW_ENOEXEC' was here
>> drivers/scsi/csiostor/t4fw_api_stor.h:50:2: error: redeclaration of enumerator 'FW_ENOMEM'
>> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:43:2: note: previous definition of 'FW_ENOMEM' was here
>> drivers/scsi/csiostor/t4fw_api_stor.h:58:2: error: redeclaration of enumerator 'FW_EADDRINUSE'
>> drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h:44:2: note: previous definition of 'FW_EADDRINUSE' was here
>>
>> And several others similar.
>>
>> Caused by commit f65b56b15931 ("RDMA/cxgb4: Fix LE hash collision bug for
>> active open connection").
> 
> 
> Vipul, is the right fix to pull the full list of FW return values from
> t4fw_api_stor.h into t4fw_api.h as part of this patch (f65b56b15931)?
> 

Yes, this is a correct way to fix this issue. I see that this change is
already done. Thanks for providing the fix.

linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]

Hi all,

After merging the infiniband tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_query_device':
drivers/infiniband/hw/mlx5/main.c:248:34: error: 'MLX5_DEV_CAP_FLAG_ON_DMND_PG' undeclared (first use in this function)
  if (dev->mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG)
                                  ^
drivers/net/ethernet/mellanox/mlx5/core/fw.c: In function 'mlx5_query_odp_caps':
drivers/net/ethernet/mellanox/mlx5/core/fw.c:79:30: error: 'MLX5_DEV_CAP_FLAG_ON_DMND_PG' undeclared (first use in this function)
  if (!(dev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG))
                              ^
drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function 'mlx5_start_eqs':
drivers/net/ethernet/mellanox/mlx5/core/eq.c:459:28: error: 'MLX5_DEV_CAP_FLAG_ON_DMND_PG' undeclared (first use in this function)
  if (dev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG)
                            ^

Really?  Code added half way though the merge window not even build
tested?

I have used the infiniband tree from next-20141215 for today.
-- 
Cheers,
Stephen Rothwell                    sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the infiniband tree

[Roland Dreier]

On Mon, Dec 15, 2014 at 5:47 PM, Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> wrote:
> Hi all,
>
> After merging the infiniband tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_query_device':
> drivers/infiniband/hw/mlx5/main.c:248:34: error: 'MLX5_DEV_CAP_FLAG_ON_DMND_PG' undeclared (first use in this function)
>   if (dev->mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG)
>                                   ^
> drivers/net/ethernet/mellanox/mlx5/core/fw.c: In function 'mlx5_query_odp_caps':
> drivers/net/ethernet/mellanox/mlx5/core/fw.c:79:30: error: 'MLX5_DEV_CAP_FLAG_ON_DMND_PG' undeclared (first use in this function)
>   if (!(dev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG))
>                               ^
> drivers/net/ethernet/mellanox/mlx5/core/eq.c: In function 'mlx5_start_eqs':
> drivers/net/ethernet/mellanox/mlx5/core/eq.c:459:28: error: 'MLX5_DEV_CAP_FLAG_ON_DMND_PG' undeclared (first use in this function)
>   if (dev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG)
>                             ^
>
> Really?  Code added half way though the merge window not even build
> tested?

It's not quite as bad as it seems.  The infiniband tree itself builds,
the problem is the merged tree.

The Mellanox guys merged the "cleanup"

commit 0c7aac854f52
Author: Eli Cohen <eli-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
Date:   Tue Dec 2 02:26:14 2014

    net/mlx5_core: Remove unused dev cap enum fields

    These enumerations are not used so remove them.

    Signed-off-by: Eli Cohen <eli-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
    Signed-off-by: David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>

through davem's tree, and then went ahead and used at least
MLX5_DEV_CAP_FLAG_ON_DMND_PG (which that patch removes) in patches
they merged through my tree.

I'll add a partial revert of that patch to my tree to get back the
now-used enum values.

 - R.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: linux-next: build failure after merge of the infiniband tree

[Roland Dreier]

On Mon, Dec 15, 2014 at 5:56 PM, Roland Dreier <roland@kernel.org> wrote:
> I'll add a partial revert of that patch to my tree to get back the
> now-used enum values.

I rebased my tree on top of the merge-window merge of davem's tree,
and added the missing flag on top of the "remove this flag" commit.

 - R.

Re: linux-next: build failure after merge of the infiniband tree

[Or Gerlitz]

On 12/16/2014 3:56 AM, Roland Dreier wrote:
> On Mon, Dec 15, 2014 at 5:47 PM, Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> wrote:
>> Hi all,
>>
>> After merging the infiniband tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_query_device':
>> drivers/infiniband/hw/mlx5/main.c:248:34: error: 'MLX5_DEV_CAP_FLAG_ON_DMND_PG' undeclared (first use in this function)
>>    if (dev->mdev->caps.gen.flags & MLX5_DEV_CAP_FLAG_ON_DMND_PG)
>>                                    ^
>> [...]
>> Really?  Code added half way though the merge window not even build
>> tested?
> It's not quite as bad as it seems.  The infiniband tree itself builds,
> the problem is the merged tree.
>
> The Mellanox guys merged the "cleanup"

Hi Roland,

So shit happens... Eli is away this week, but it's clear that this 
portion of the cleanup
was terribly wrongand done by mistake, sorry for that and thanks for 
addressing quickly.

Or.

>
> commit 0c7aac854f52
> Author: Eli Cohen <eli-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
> Date:   Tue Dec 2 02:26:14 2014
>
>      net/mlx5_core: Remove unused dev cap enum fields
>
>      These enumerations are not used so remove them.
>
>      Signed-off-by: Eli Cohen <eli-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
>      Signed-off-by: David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
>
> through davem's tree, and then went ahead and used at least
> MLX5_DEV_CAP_FLAG_ON_DMND_PG (which that patch removes) in patches
> they merged through my tree.
>
> I'll add a partial revert of that patch to my tree to get back the
> now-used enum values.
>
>   - R.
>
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

linux-next: build failure after merge of the infiniband tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 560 bytes --]

Hi all,

After merging the livepatching tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from drivers/infiniband/hw/qib/qib_cq.c:41:0:
drivers/infiniband/hw/qib/qib.h: In function 'qib_flush_wc':
drivers/infiniband/hw/qib/qib.h:1470:1: error: expected ';' before '}' token
 }
 ^

and it went badly down hill from there :-(

Caused by commit f72c1c08efbc ("IB/qib: Fix checkpatch warnings").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the infiniband tree

[Roland Dreier]

On Tue, Feb 17, 2015 at 6:32 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> After merging the livepatching tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from drivers/infiniband/hw/qib/qib_cq.c:41:0:
> drivers/infiniband/hw/qib/qib.h: In function 'qib_flush_wc':
> drivers/infiniband/hw/qib/qib.h:1470:1: error: expected ';' before '}' token
>  }
>  ^
>
> and it went badly down hill from there :-(


Weird, I could have sworn I fixed that before I pushed the tree out.
Anyway I'll try adding the missing ';' again and push it out again :(