Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: linux-next: manual merge of the arm-soc tree with Linus' tree | Date | Thu, 24 Nov 2011 15:55:03 +0000 |
| |
On Thursday 24 November 2011, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/net/ethernet/cadence/Kconfig between commit eccab1ec87d0 > ("net/cadence: enable by default NET_ATMEL") from Linus' tree and commit > f75ba50bdc2b ("macb: initial support for Cadence GEM") from the arm-soc > tree. > > I fixed it up (see below) and can carry the fix as necessary.
Yes, looks good.
Thanks,
Arnd
| |