From patchwork Mon Sep 24 14:02:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1497931 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C1C50DF280 for ; Mon, 24 Sep 2012 14:02:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755525Ab2IXOCa (ORCPT ); Mon, 24 Sep 2012 10:02:30 -0400 Received: from haggis.pcug.org.au ([203.10.76.10]:59952 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755453Ab2IXOC3 (ORCPT ); Mon, 24 Sep 2012 10:02:29 -0400 Received: from canb.auug.org.au (ash.rothwell.emu.id.au [IPv6:2402:b800:7003:7010:223:14ff:fe30:c8e4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by members.tip.net.au (Postfix) with ESMTPSA id 58D19164112; Tue, 25 Sep 2012 00:02:22 +1000 (EST) Date: Tue, 25 Sep 2012 00:02:17 +1000 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Fengguang Wu , Amir Vadai , Jack Morgenstein , Roland Dreier , Roland Dreier , linux-rdma@vger.kernel.org Subject: linux-next: build failure after merge of the akpm tree Message-Id: <20120925000217.947b8cd8dca6979bfedee2ca@canb.auug.org.au> X-Mailer: Sylpheed 3.2.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Hi Andrew, After merging the akpm tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: drivers/infiniband/hw/mlx4/cm.c: In function 'id_map_alloc': drivers/infiniband/hw/mlx4/cm.c:228:36: error: 'MAX_ID_MASK' undeclared (first use in this function) Caused by commit d7a4e9b679e9 ("IB/mlx4: Add CM paravirtualization") from the infiniband tree interacting with commit "idr: rename MAX_LEVEL to MAX_IDR_LEVEL" from the akpm tree. I have added the following merge fix patch for today: From: Stephen Rothwell Date: Mon, 24 Sep 2012 23:57:53 +1000 Subject: [PATCH] IB/mlx4: fix for MAX_ID_MASK to MAX_IDR_MASK name change Signed-off-by: Stephen Rothwell --- drivers/infiniband/hw/mlx4/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c index e25e4da..80079e5 100644 --- a/drivers/infiniband/hw/mlx4/cm.c +++ b/drivers/infiniband/hw/mlx4/cm.c @@ -225,7 +225,7 @@ id_map_alloc(struct ib_device *ibdev, int slave_id, u32 sl_cm_id) ret = idr_get_new_above(&sriov->pv_id_table, ent, next_id, &id); if (!ret) { - next_id = ((unsigned) id + 1) & MAX_ID_MASK; + next_id = ((unsigned) id + 1) & MAX_IDR_MASK; ent->pv_cm_id = (u32)id; sl_id_map_add(ibdev, ent); }