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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 12/16/2014 3:56 AM, Roland Dreier wrote:
On Mon, Dec 15, 2014 at 5:47 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxx>
     Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

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-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux