From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 11 Jan 2010 13:31:09 +1100
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in include/linux/sysctl.h between commit 28f6aeea3f12d37bd258b2c0d5ba891bff4ec479 ("net: restore ip source validation") from Linus' tree and commit 65324144b50bc7022cc9b6ca8f4a536a957019e3 ("net: RFC3069, private VLAN proxy arp support") from the net tree.
That latter commit is specially in the net-next-2.6 tree not the
net-2.6 tree.
> They both use the same number in an enum... I fixed it up (see below) and
> can carry the fix (or some other) for a while.
I'll merge net-2.6 into net-next-2.6 to resolve this, thanks!
--
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
