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 [email protected]
On Mon, Dec 15, 2014 at 5:47 PM, Stephen Rothwell <[email protected]> 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 <[email protected]>
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
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.
On Mon, Dec 15, 2014 at 5:56 PM, Roland Dreier <[email protected]> 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.
On 12/16/2014 3:56 AM, Roland Dreier wrote:
> On Mon, Dec 15, 2014 at 5:47 PM, Stephen Rothwell <[email protected]> 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 <[email protected]>
> 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 <[email protected]>
> Signed-off-by: David S. Miller <[email protected]>
>
> 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.
>