[Stephen Rothwell - Wed, Dec 24, 2008 at 10:19:34AM +1100]
| Hi Dave,
|
| 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.
| --
| Cheers,
| Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
| http://www.canb.auug.org.au/~sfr/
|
Thanks a lot, Stephen!
- Cyrill -
--
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
