Messages in this thread | | | Date | Wed, 15 Dec 2010 11:45:31 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the net-current tree |
| |
Hi all,
Today's linux-next merge of the net tree got a conflict in drivers/net/bnx2x/bnx2x.h between commit 9f5449611c9d6d7bdcae8020a197d8b4d9b6443c ("bnx2x: Advance a version number to 1.60.01-0") from the net-current tree and commit f404c2fea37e02bec7c8b6edddf5edd22ca60505 ("bnx2x: Update version number and a date") from the net tree.
So the net tree one has a later date, but a lower version number ... I just used the version from the net tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |