linux-kernel - Re: linux-next: manual merge of the net tree with the scsi tree

lists.openwall.net		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 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 30 Jun 2011 14:41:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Bhanu Prakash Gollapudi" <bprakash@...adcom.com>
Cc:	"David Miller" <davem@...emloft.net>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"Vladislav Zolotarov" <vladz@...adcom.com>,
	"James Bottomley" <James.Bottomley@...senPartnership.com>,
	mchan@...adcom.com
Subject: Re: linux-next: manual merge of the net tree with the scsi tree

Hi Bhanu,

On Wed, 29 Jun 2011 21:20:40 -0700 "Bhanu Prakash Gollapudi" <bprakash@...adcom.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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped