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

David Miller
2011-10-06T05:58:41Z

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Oct 2011 16:04:33 +1100

> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/et131x/et1310_tx.c between commit bf3f1a6081aa ("et131x:
> convert to SKB paged frag API") from the net tree and commit 10f00a49b048
> ("staging: et131x: Rename var name 'etdev' to 'adapter' throughout
> module") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Yep, we saw this one coming too. I think you'll need to carry this one
until the merge window flushes out.

Thanks!