The following changes since commit fce2b1c77f04c9775657bf280ccaca7241f9559f: Leann Ogasawara (1): UBUNTU: Ubuntu-2.6.24-26.64 are available in the git repository at: git://kernel.ubuntu.com/rtg/ubuntu-hardy lp487010 Tim Gardner (1): UBUNTU: Enable CONFIG_NF_CONNTRACK_IPV6 for i386 virtual debian/config/i386/config | 1 + debian/config/i386/config.386 | 1 - debian/config/i386/config.generic | 1 - debian/config/i386/config.server | 1 - debian/config/i386/config.virtual | 1 - 5 files changed, 1 insertions(+), 4 deletions(-) >From 599239820cb6adc4d41031d3669f9da809e382b3 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Wed, 9 Dec 2009 08:38:53 -0700 Subject: [PATCH] UBUNTU: Enable CONFIG_NF_CONNTRACK_IPV6 for i386 virtual BugLink: http://bugs.launchpad.net/bugs/487010 Signed-off-by: Tim Gardner --- debian/config/i386/config | 1 + debian/config/i386/config.386 | 1 - debian/config/i386/config.generic | 1 - debian/config/i386/config.server | 1 - debian/config/i386/config.virtual | 1 - 5 files changed, 1 insertions(+), 4 deletions(-) diff --git a/debian/config/i386/config b/debian/config/i386/config index 67b29b2..e697e4d 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -823,6 +823,7 @@ CONFIG_NF_CONNTRACK_ENABLED=m CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IRC=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_PPTP=m diff --git a/debian/config/i386/config.386 b/debian/config/i386/config.386 index b6161a4..c3aed6f 100644 --- a/debian/config/i386/config.386 +++ b/debian/config/i386/config.386 @@ -1110,7 +1110,6 @@ CONFIG_NEW_LEDS=y CONFIG_NFTL=m CONFIG_NFTL_RW=y CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CT_PROTO_SCTP=m diff --git a/debian/config/i386/config.generic b/debian/config/i386/config.generic index ccae931..f57c52a 100644 --- a/debian/config/i386/config.generic +++ b/debian/config/i386/config.generic @@ -1107,7 +1107,6 @@ CONFIG_NEW_LEDS=y CONFIG_NFTL=m CONFIG_NFTL_RW=y CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CT_PROTO_SCTP=m diff --git a/debian/config/i386/config.server b/debian/config/i386/config.server index 24f3132..a002dac 100644 --- a/debian/config/i386/config.server +++ b/debian/config/i386/config.server @@ -1108,7 +1108,6 @@ CONFIG_NEW_LEDS=y CONFIG_NFTL=m CONFIG_NFTL_RW=y CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_NETBIOS_NS=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CT_PROTO_SCTP=m diff --git a/debian/config/i386/config.virtual b/debian/config/i386/config.virtual index 17ac914..4f7e2c6 100644 --- a/debian/config/i386/config.virtual +++ b/debian/config/i386/config.virtual @@ -290,7 +290,6 @@ CONFIG_NET_CLS_POLICE=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NEW_LEDS is not set # CONFIG_NF_CONNTRACK_H323 is not set -# CONFIG_NF_CONNTRACK_IPV6 is not set # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set # CONFIG_NF_CONNTRACK_SIP is not set # CONFIG_NF_CT_PROTO_SCTP is not set -- 1.6.2.4