Messages in this thread | | | Date | Thu, 30 Jun 2011 14:41:19 +1000 | From | Stephen Rothwell <> | Subject | Re: 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] | |