[lkml]   [2010]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the net tree with Linus' tree
From: Stephen Rothwell <>
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!

 \ /
  Last update: 2010-01-11 07:53    [W:0.042 / U:7.652 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site