Hi David,
Today's linux-next merge of the firmware tree got a conflict in
drivers/net/tg3.c between commit d5fe488a7b59e41b98b91137805159466b7b49c2
("tg3: Embrace pci_ioremap_bar()") from the net tree and commit
aadd3ed38a6745e21dc8d2f388bbba42ead0a085 ("firmware: convert tg3 driver
to request_firmware()") from the firmware tree.
The former removed some code that the latter modified. I have fixed it
up (by removing the hunk of code) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpKFmNYD9UFY.pgp
Description: PGP signature
