The patch titled Subject: idr-rename-max_level-to-max_idr_level-fix-fix-2-fix has been added to the -mm tree. Its filename is idr-rename-max_level-to-max_idr_level-fix-fix-2-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Subject: idr-rename-max_level-to-max_idr_level-fix-fix-2-fix IB/mlx4: fix for MAX_ID_MASK to MAX_IDR_MASK name change Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Roland Dreier <roland@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/infiniband/hw/mlx4/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/infiniband/hw/mlx4/cm.c~idr-rename-max_level-to-max_idr_level-fix-fix-2-fix drivers/infiniband/hw/mlx4/cm.c --- a/drivers/infiniband/hw/mlx4/cm.c~idr-rename-max_level-to-max_idr_level-fix-fix-2-fix +++ a/drivers/infiniband/hw/mlx4/cm.c @@ -225,7 +225,7 @@ id_map_alloc(struct ib_device *ibdev, in 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); } _ Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are linux-next.patch rbtree-empty-nodes-have-no-color-fix.patch atomic-implement-generic-atomic_dec_if_positive.patch atomic-implement-generic-atomic_dec_if_positive-fix.patch idr-rename-max_level-to-max_idr_level-fix-fix-2-fix.patch rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix.patch rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html