Re: [tip:core/memblock] memblock: Rename memblock_region tomemblock_type and memblock_property to memblock_region

From: Ingo Molnar
Date: Mon Aug 30 2010 - 02:24:30 EST



* H. Peter Anvin <hpa@xxxxxxxxx> wrote:

> "Benjamin Herrenschmidt" <benh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> >On Sat, 2010-08-28 at 00:37 +0000, tip-bot for Benjamin Herrenschmidt
> >wrote:
> >> Commit-ID: e3239ff92a17976ac5d26fa0fe40ef3a9daf2523
> >> Gitweb: http://git.kernel.org/tip/e3239ff92a17976ac5d26fa0fe40ef3a9daf2523
> >> Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> >> AuthorDate: Wed, 4 Aug 2010 14:06:41 +1000
> >> Committer: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> >> CommitDate: Wed, 4 Aug 2010 14:21:49 +1000
> >>
> >> memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region
> >
> >He, I was just about to rebase them :-)
> >
> >Do you still need me to do that ?
>
> I don't think so, but Ingo might need you to if it doesn't merge cleanly.

No need to, i resolved the conflicts.

Thanks,

Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/