Re: linux-next: manual merge of the arm-soc tree with Linus' tree
From: Arnd Bergmann <arnd@arndb.de>
Date: 2011-11-24 15:57:43
Also in:
linux-next, lkml
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