Subject: Re: linux-next: manual merge of the net tree

From: David Miller <[email-masked]>
Date: Tue, 23 Dec 2008 18:15:59 -0800 (PST)

From: Stephen Rothwell <[email-masked]>
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.