Re: linux-next: net merge conflicts

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 28 Mar 2008 13:55:11 +1100

> Hi Dave, all,
> 
> Today's linux-next tree merging of the net tree caused a few conflicts.
> The only hard one is in net/ipv6/ndisc.c.
> 
> In Linus' tree, commit fa86d322d89995fef1bfb5cc768b89d8c22ea0d9
> ("[NEIGH]: Fix race between pneigh deletion and ipv6's ndisc_recv_ns
> (v3).") does:

I've resolved this merge issue just an hour ago, can you rebuild the
linux-next tree with what I just pushed into my net-2.6.26 tree?

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html