Hi all, Today's linux-next merge of the net tree got a conflict in drivers/net/bnx2x/bnx2x.h between commit b746f7e52fe33ce66ea0cf6127838eff507839ff ("bnx2x: update driver version to 1.62.00-6") from the net-current tree and commit 6b28ff3be829a851378551245fd6b3f9bf93b0ad ("bnx2x: Update bnx2x version to 1.62.11-0") from the net tree. Obvious, really :-) I used the version from the net tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpHaAPYk0bdG.pgp
Description: PGP signature