From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 02d0735a396e76a3217f64b27ea7611a11ca48b6
Date: Wed, 18 Jul 2012 14:09:36 +0200 [thread overview]
Message-ID: <20120718120937.16C55200BC@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2119 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 02d0735a396e76a3217f64b27ea7611a11ca48b6 (commit)
from 6fba020e47df686e32a65d715753cca2b80fca7b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 02d0735a396e76a3217f64b27ea7611a11ca48b6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jul 18 14:08:30 2012 +0200
kernel: Compile in IPv6 and conntrack support.
These have been modules, but as we need them anyway, we should
compile them in.
-----------------------------------------------------------------------
Summary of changes:
kernel/config-generic | 4 ++--
kernel/kernel.nm | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/kernel/config-generic b/kernel/config-generic
index 201c0b0..044a46c 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -374,7 +374,7 @@ CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
+CONFIG_IPV6=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
CONFIG_IPV6_ROUTE_INFO=y
@@ -413,7 +413,7 @@ CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_ACCT=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_ZONES=y
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index d81d988..c2e98d5 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name = kernel
version = 3.4.4
-release = 2
+release = 3
thisapp = linux-%{version}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2012-07-18 12:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120718120937.16C55200BC@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox