Messages in this thread | | | Date | Thu, 30 Jun 2011 12:33:25 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the scsi tree |
| |
Hi all,
Today's linux-next merge of the net tree got conflicts in drivers/scsi/bnx2fc/bnx2fc.h and drivers/scsi/bnx2fc/bnx2fc_fcoe.c between commit 2382d2364a60 ("[SCSI] bnx2fc: Bumped version to 1.0.2") from the scsi tree and commit 619c5cb6885b ("New 7.0 FW: bnx2x, cnic, bnx2i, bnx2fc") from the net tree.
I used the versions from the net tree as those version numbers were newer.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |