netdev - linux-next: manual merge of the net tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 11 Jan 2010 13:31:09 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jesper Dangaard Brouer <hawk@...x.dk>,
	Jamal Hadi Salim <hadi@...erus.ca>
Subject: linux-next: manual merge of the net tree with Linus' tree

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.

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.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/sysctl.h
index bd27fbc,24ff7e3..0000000
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@@ -482,7 -482,7 +482,8 @@@ enu
  	NET_IPV4_CONF_ARP_ACCEPT=21,
  	NET_IPV4_CONF_ARP_NOTIFY=22,
  	NET_IPV4_CONF_ACCEPT_LOCAL=23,
 -	NET_IPV4_CONF_PROXY_ARP_PVLAN=24,
 +	NET_IPV4_CONF_SRC_VMARK=24,
++	NET_IPV4_CONF_PROXY_ARP_PVLAN=25,
  	__NET_IPV4_CONF_MAX
  };

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