Subject: Re: linux-next: manual merge of the net tree with Linus' tree

From: David Miller <[email-masked]>
Date: Mon, 02 Feb 2009 23:51:50 -0800 (PST)

From: Stephen Rothwell <[email-masked]>
Date: Mon, 2 Feb 2009 14:13:28 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/net/Kconfig between commit
> d4732d3c59b84bb093e11c8f755f32801b4bf86d ("m68knommu: add ColdFire M532x
> to the FEC configuration options") from Linus' tree and commit
> 196719ecec0c526de273dcb902f0be956a193232 ("fec: Add support for Freescale
> MX27") from the net tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix for a while.

I'll take care of this, thanks Stephen.