On Tue, Apr 21, 2009 at 11:06:12AM +1000, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the net tree got a conflict in net/core/dev.c
> between commit 5db8765a86a4cbaf45adaf8c231cf9a6ca2dcfaf ("net: Fix GRO
> for multiple page fragments") from the net-current tree and commit
> 76620aafd66f0004829764940c5466144969cffc ("gro: New frags interface to
> avoid copying shinfo") from the net tree.
>
> I used the version from the net tree.
I think that's the right one.
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
