From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Bhanu Prakash Gollapudi" Subject: Re: linux-next: manual merge of the net tree with the scsi tree Date: Wed, 29 Jun 2011 21:20:40 -0700 Message-ID: <4E0BF998.7030800@broadcom.com> References: <20110630123325.43268067.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mms2.broadcom.com ([216.31.210.18]:2250 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750712Ab1F3EUx (ORCPT ); Thu, 30 Jun 2011 00:20:53 -0400 In-Reply-To: <20110630123325.43268067.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: David Miller , "netdev@vger.kernel.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Vladislav Zolotarov , James Bottomley , mchan@broadcom.com On 6/29/2011 7:33 PM, Stephen Rothwell wrote: > 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. > 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. Thanks, Bhanu