From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752218Ab1F3Elc (ORCPT ); Thu, 30 Jun 2011 00:41:32 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:59744 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750725Ab1F3El0 (ORCPT ); Thu, 30 Jun 2011 00:41:26 -0400 Date: Thu, 30 Jun 2011 14:41:19 +1000 From: Stephen Rothwell To: "Bhanu Prakash Gollapudi" Cc: "David Miller" , "netdev@vger.kernel.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Vladislav Zolotarov" , "James Bottomley" , mchan@broadcom.com Subject: Re: linux-next: manual merge of the net tree with the scsi tree Message-Id: <20110630144119.1bff2ccb.sfr@canb.auug.org.au> In-Reply-To: <4E0BF998.7030800@broadcom.com> References: <20110630123325.43268067.sfr@canb.auug.org.au> <4E0BF998.7030800@broadcom.com> X-Mailer: Sylpheed 3.1.1 (GTK+ 2.24.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Thu__30_Jun_2011_14_41_19_+1000_spVF7eu+vTdA9kMf" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Thu__30_Jun_2011_14_41_19_+1000_spVF7eu+vTdA9kMf Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Bhanu, On Wed, 29 Jun 2011 21:20:40 -0700 "Bhanu Prakash Gollapudi" wrote: > > Stephen, can you please send the conflicts? Most probably you should=20 > have seen the conflicts w.r.t version number in bnx2fc.h and date in=20 > bnx2fc_fcoe.c. If that is the case, the versions from net tree are good. Yes, they were exactly the only conflicts I got. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Thu__30_Jun_2011_14_41_19_+1000_spVF7eu+vTdA9kMf Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAEBAgAGBQJOC/5vAAoJEDMEi1NhKgbsb5gH/1qiNAZ348iQ0iqH2UXTnfkv 0XhQZAnyFzMpoJHLQjELJLRTCOp6XeRxJtAKbRFhdrgYM/fmTLtzC2VQ/AnvnUja yN501XW23ndQOhNYRoUMQMehNFeNnr7XkKzUlKGjuydQFtGaYB1GN4QAjW64XZhX ob9QrkjUP1UcAY4HLqCEs0EsyX0e2XuqT8Q5NHS8sZPxatJ8i1UytzYRRWgXVPxb em476hKBs5w0/yQXkPjizrI8gEKaqd+AeZd8dDTC4+//8hm363AQ4WHJNJ/2l7u7 2JCdgPY+xaOy5DHru8HjFajfNY5wNagutC6phe9c+sn84fYB4AEJwyO3083WLvE= =ynvR -----END PGP SIGNATURE----- --Signature=_Thu__30_Jun_2011_14_41_19_+1000_spVF7eu+vTdA9kMf--