Message ID | 1271143837-28568-2-git-send-email-john.johansen@canonical.com |
---|---|
State | Accepted |
Delegated to: | Andy Whitcroft |
Headers | show |
Looks ok. john.johansen@canonical.com wrote: > From: John Johansen <john.johansen@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/532553 > > The XT_MATCH_RECENT config was not enable on EC2 kernels due to a config > error. > > Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > debian.ec2/config/config.common.ubuntu | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/debian.ec2/config/config.common.ubuntu b/debian.ec2/config/config.common.ubuntu > index 0b46ad2..e643ab9 100644 > --- a/debian.ec2/config/config.common.ubuntu > +++ b/debian.ec2/config/config.common.ubuntu > @@ -1709,7 +1709,8 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m > CONFIG_NETFILTER_XT_MATCH_QUOTA=m > CONFIG_NETFILTER_XT_MATCH_RATEEST=m > CONFIG_NETFILTER_XT_MATCH_REALM=m > -# CONFIG_NETFILTER_XT_MATCH_RECENT is not set > +CONFIG_NETFILTER_XT_MATCH_RECENT=m > +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set > CONFIG_NETFILTER_XT_MATCH_SCTP=m > CONFIG_NETFILTER_XT_MATCH_STATE=m > CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
On Tue, Apr 13, 2010 at 12:30:37AM -0700, john.johansen@canonical.com wrote: > From: John Johansen <john.johansen@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/532553 > > The XT_MATCH_RECENT config was not enable on EC2 kernels due to a config > error. > > Signed-off-by: John Johansen <john.johansen@canonical.com> > --- > debian.ec2/config/config.common.ubuntu | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/debian.ec2/config/config.common.ubuntu b/debian.ec2/config/config.common.ubuntu > index 0b46ad2..e643ab9 100644 > --- a/debian.ec2/config/config.common.ubuntu > +++ b/debian.ec2/config/config.common.ubuntu > @@ -1709,7 +1709,8 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m > CONFIG_NETFILTER_XT_MATCH_QUOTA=m > CONFIG_NETFILTER_XT_MATCH_RATEEST=m > CONFIG_NETFILTER_XT_MATCH_REALM=m > -# CONFIG_NETFILTER_XT_MATCH_RECENT is not set > +CONFIG_NETFILTER_XT_MATCH_RECENT=m > +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set > CONFIG_NETFILTER_XT_MATCH_SCTP=m > CONFIG_NETFILTER_XT_MATCH_STATE=m > CONFIG_NETFILTER_XT_MATCH_STATISTIC=m No brainer sync with mainline. Acked-by: Andy Whitcroft <apw@canonical.com> -apw
diff --git a/debian.ec2/config/config.common.ubuntu b/debian.ec2/config/config.common.ubuntu index 0b46ad2..e643ab9 100644 --- a/debian.ec2/config/config.common.ubuntu +++ b/debian.ec2/config/config.common.ubuntu @@ -1709,7 +1709,8 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_QUOTA=m CONFIG_NETFILTER_XT_MATCH_RATEEST=m CONFIG_NETFILTER_XT_MATCH_REALM=m -# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +CONFIG_NETFILTER_XT_MATCH_RECENT=m +# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_STATE=m CONFIG_NETFILTER_XT_MATCH_STATISTIC=m