Subject: Re: [PATCH 0/5] Move some OF functionality from pseries to generic OF code

From: Michael Ellerman <[email-masked]>
Date: Tue, 09 Oct 2012 10:54:29 +1100

On Tue, 2012-10-02 at 13:11 -0500, Nathan Fontenot wrote:
> This set of patches moves some OF code that has been living
> in the pseries tree over to the generic OF code base. The
> functionality being migrated over is something that, I believe,
> should live in the generic code base. The specific functionality
> being migrated to generic OF code is;

Your changes collide with commit 475d0094293:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=475d0094293b51353e342d1198377967dbc48169

At a quick glance they don't look like they conflict in concept, just
textually.

cheers