lkml.org 
[lkml]   [2011]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the net tree with the scsi tree
Hi Bhanu,

On Wed, 29 Jun 2011 21:20:40 -0700 "Bhanu Prakash Gollapudi" <bprakash@broadcom.com> wrote:
>
> Stephen, can you please send the conflicts? Most probably you should
> have seen the conflicts w.r.t version number in bnx2fc.h and date in
> bnx2fc_fcoe.c. If that is the case, the versions from net tree are good.

Yes, they were exactly the only conflicts I got.

--
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 06:43    [W:0.393 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site