Re: linux-next: manual merge of the trivial tree with the 4xx tree

[Josh Boyer]

On Wed, Nov 30, 2011 at 9:16 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/powerpc/platforms/40x/Kconfig between commit d5b9ee7b514e
> ("powerpc/40x: Add APM8018X SOC support") from the 4xx tree and commit
> ff5f483f3091 ("powerpc: 4xx: remove commented out Kconfig entries") from
> the trivial tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

That seems correct to me.  If you don't mind carrying it, I'd appreciate it.

josh
--
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/