lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Wed, 29 Jun 2011 21:20:40 -0700
From:	"Bhanu Prakash Gollapudi" <>
To:	"Stephen Rothwell" <>
cc:	"David Miller" <>,
	"" <>,
	"" <>,
	"" <>,
	"Vladislav Zolotarov" <>,
	"James Bottomley" <>,
Subject: Re: linux-next: manual merge of the net tree with the scsi tree

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.


To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to
More majordomo info at

Powered by blists - more mailing lists