* linux-next: manual merge of the net tree with the scsi tree
@ 2011-06-30 2:33 Stephen Rothwell
2011-06-30 4:20 ` Bhanu Prakash Gollapudi
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-06-30 2:33 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Vlad Zolotarov, Bhanu Prakash Gollapudi,
James Bottomley
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the net tree with the scsi tree
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
0 siblings, 1 reply; 3+ messages in thread
From: Bhanu Prakash Gollapudi @ 2011-06-30 4:20 UTC (permalink / raw)
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
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the net tree with the scsi tree
2011-06-30 4:20 ` Bhanu Prakash Gollapudi
@ 2011-06-30 4:41 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-06-30 4:41 UTC (permalink / raw)
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
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-30 4:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox