linux-kernel - Re: linux-next: manual merge of the net-next tree with the net 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20120217103011.b2223e28a89839d09a4a4053@canb.auug.org.au>
Date:	Fri, 17 Feb 2012 10:30:11 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Yuval Mintz" <yuvalmin@...adcom.com>
Cc:	davem@...emloft.net, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	eilong@...adcom.com, eric.dumazet@...il.com
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

Hi,

On Thu, 16 Feb 2012 13:24:10 +0200 "Yuval Mintz" <yuvalmin@...adcom.com> wrote:
>
> I don't fully understand your merge - it seems to create a mash between
> the "bnx2x: fix bnx2x_storm_stats_update() on big endian" patch in net,
> and the "bnx2x: consistent statistics after internal driver reload"
> patch in net-next.

That is exactly what the merge conflict resolution did.  i.e. the patch
you supplied below is not needed in linux-next because that is
effectively what I did.  It is the same as Dave will do when he merges
the net tree into the net-next tree as well, I assume.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped