From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Bhanu Prakash Gollapudi" <bprakash@broadcom.com>
Cc: "David Miller" <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Vladislav Zolotarov" <vladz@broadcom.com>,
"James Bottomley" <James.Bottomley@HansenPartnership.com>,
mchan@broadcom.com
Subject: Re: linux-next: manual merge of the net tree with the scsi tree
Date: Thu, 30 Jun 2011 14:41:19 +1000 [thread overview]
Message-ID: <20110630144119.1bff2ccb.sfr@canb.auug.org.au> (raw)
In-Reply-To: <4E0BF998.7030800@broadcom.com>
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
prev parent reply other threads:[~2011-06-30 4:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 2:33 linux-next: manual merge of the net tree with the scsi tree Stephen Rothwell
2011-06-30 4:20 ` Bhanu Prakash Gollapudi
2011-06-30 4:41 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110630144119.1bff2ccb.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=James.Bottomley@HansenPartnership.com \
--cc=bprakash@broadcom.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchan@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=vladz@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox