lkml.org 
[lkml]   [2011]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2011-06-30 04:37    [W:1.373 / U:0.484 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site