[lkml]   [2012]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the net-next tree with the net tree

On Thu, 16 Feb 2012 13:24:10 +0200 "Yuval Mintz" <> 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.

Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2012-02-17 00:33    [W:0.051 / U:0.620 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site