Hi all, Today's linux-next merge of the net tree got a conflict in net/ipv4/Kconfig between commit 68c1f3a96c32a4fe15ebadae45c8145a5e5a66d2 ("ip_gre: Fix dependencies wrt. ipv6") from the net-current tree and commit 00959ade36acadc00e757f87060bf6e4501d545f ("PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)") from the net tree. Just overlapping additions. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc net/ipv4/Kconfig index 72380a3,5462e2d..0000000 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@@ -215,9 -215,15 +215,16 @@@ config NET_IPI be inserted in and removed from the running kernel whenever you want). Most people won't need this and can say N. + config NET_IPGRE_DEMUX + tristate "IP: GRE demultiplexer" + help + This is helper module to demultiplex GRE packets on GRE version field criteria. + Required by ip_gre and pptp modules. + config NET_IPGRE tristate "IP: GRE tunnels over IP" + depends on IPV6 || IPV6=n + depends on NET_IPGRE_DEMUX help Tunneling means encapsulating data of one protocol type within another protocol and sending it over a channel that understands the -- 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