| Message ID | 20120925000217.947b8cd8dca6979bfedee2ca@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Mon, Sep 24, 2012 at 7:02 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > 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 <sfr@canb.auug.org.au> > 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 <sfr@canb.auug.org.au> > --- > 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); > } Andrew, any preference on how to handle this merge? Jack/Amir, I wonder if there's some way we can avoid this code entirely? Is an IDR the right structure to use here, or would we be better off with a radix tree maybe (where we can assign our own ID)? - R. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 24 Sep 2012 12:36:43 -0700 Roland Dreier <roland@purestorage.com> wrote: > On Mon, Sep 24, 2012 at 7:02 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > 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 <sfr@canb.auug.org.au> > > 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 <sfr@canb.auug.org.au> > > --- > > 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); > > } > > Andrew, any preference on how to handle this merge? I'm fixing up that patch as things change under its feet. I usually merge things like this late in the merge window after everything else has landed, to cause minimum breakage/disruption. If there was something in linux-next which didn't get into the merge window (bad) then I cheerily break it and the tree maintainer fixes things up. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Roland, I am on vacation until next Tuesday -- I'll look at this then. -Jack On Monday 24 September 2012 21:36, Roland Dreier wrote: > On Mon, Sep 24, 2012 at 7:02 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > 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 <sfr@canb.auug.org.au> > > 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 <sfr@canb.auug.org.au> > > --- > > 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); > > } > > Andrew, any preference on how to handle this merge? > > Jack/Amir, I wonder if there's some way we can avoid this code > entirely? Is an IDR the right structure to use here, or would we > be better off with a radix tree maybe (where we can assign our > own ID)? > > - R. > -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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); }
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 <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au> --- drivers/infiniband/hw/mlx4/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)