Message-ID: <54901021.9020205@mellanox.com>
Date: Tue, 16 Dec 2014 12:57:37 +0200
From: Or Gerlitz <ogerlitz@mellanox.com>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0
MIME-Version: 1.0
To: Roland Dreier <roland@kernel.org>, Stephen Rothwell <sfr@canb.auug.org.au>
CC: "linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
        Haggai Eran <haggaie@mellanox.com>,
        "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Yevgeny Petrilin <yevgenyp@mellanox.com>,
        Amir Vadai <amirv@mellanox.com>
Subject: Re: linux-next: build failure after merge of the infiniband tree
References: <20141216124750.153e3fdd@canb.auug.org.au>
 <CAG4TOxP9WFHALPb0y0eKFup6uhszXfd+hLcwZ98kZUVaR_9j4w@mail.gmail.com>
In-Reply-To: <CAG4TOxP9WFHALPb0y0eKFup6uhszXfd+hLcwZ98kZUVaR_9j4w@mail.gmail.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org

On 12/16/2014 3:56 AM, Roland Dreier wrote:
> On Mon, Dec 15, 2014 at 5:47 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:
>>
>> 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@dev.mellanox.co.il>
> 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@mellanox.com>
>      Signed-off-by: David S. Miller <davem@davemloft.net>
>
> 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-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/