From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 24 Dec 2008 10:19:34 +1100
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/ppp_generic.c between commit
> 739840d529eb7505d3cbfe9d468bf1440c9a8e27 ("ppp: fix segfaults introduced
> by netdev_priv changes") from the net-current tree and commit
> 7a95d267fb62cd6b80ef73be0592bbbe1dbd5df7 ("net: ppp_generic - use idr
> technique instead of cardmaps") from the net tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks Stephen.
Since Linus just pulled my net-2.6 tree into his today,
I merged net-2.6 into net-next-2.6 which will resolve
this.
--
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
