Re: linux-next: manual merge of the net tree with the scsi tree
From: Stephen Rothwell
Date: Thu Jun 30 2011 - 00:41:36 EST
Hi Bhanu,
On Wed, 29 Jun 2011 21:20:40 -0700 "Bhanu Prakash Gollapudi" <bprakash@xxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp00000.pgp
Description: PGP signature