From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch,
 xen-legacy-kernel, updated. b6c72b947753d41a9d691462b7afc34852a8b4b2
Date: Sat, 03 May 2014 21:20:14 +0200
Message-ID: <20140503192014.BD60020F97@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4853101834842354858=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============4853101834842354858==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 2.x development tree".

The branch, xen-legacy-kernel has been updated
       via  b6c72b947753d41a9d691462b7afc34852a8b4b2 (commit)
      from  d8263ea0fe5ae7a7a930bda6c2ce13b4749ba81b (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 b6c72b947753d41a9d691462b7afc34852a8b4b2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat May 3 15:55:25 2014 +0200

    xen-kernel: compile nf_conntrack into kernel.

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.i586-ipfire-xen | 2 +-
 lfs/linux2                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kern=
el.config.i586-ipfire-xen
index 55bf36f..09b8b0f 100644
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -502,7 +502,7 @@ CONFIG_BRIDGE_NETFILTER=3Dy
 CONFIG_NETFILTER_NETLINK=3Dm
 CONFIG_NETFILTER_NETLINK_QUEUE=3Dm
 CONFIG_NETFILTER_NETLINK_LOG=3Dm
-CONFIG_NF_CONNTRACK=3Dm
+CONFIG_NF_CONNTRACK=3Dy
 CONFIG_NF_CT_ACCT=3Dy
 CONFIG_NF_CONNTRACK_MARK=3Dy
 CONFIG_NF_CONNTRACK_EVENTS=3Dy
diff --git a/lfs/linux2 b/lfs/linux2
index 63ca9cf..76e31a9 100644
--- a/lfs/linux2
+++ b/lfs/linux2
@@ -34,7 +34,7 @@ DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 CFLAGS     =3D
 CXXFLAGS   =3D
=20
-PAK_VER    =3D 28
+PAK_VER    =3D 29
 DEPS	   =3D ""
=20
 # Normal build or XEN build.


hooks/post-receive
--
IPFire 2.x development tree

--===============4853101834842354858==--