linux-next: build failure after merge of the net tree

[Stephen Rothwell]

Hi Dave,

After merging the scsi-post-merge tree, today's linux-next build (powerpc
allyesconfig and i386 defconfig) failed like this:

drivers/net/e1000e/built-in.o: In function `e1000_has_link':
(.opd+0x1d58): multiple definition of `e1000_has_link'
drivers/net/e1000/built-in.o:(.opd+0x588): first defined here

Caused by commit b548192acaebcb05d6a87d1e94f19835b1a18a8b ("e1000: Report
link status in ethtool when interface is down").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature