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, fifteen,
 updated. 4accbf93699f6fd76079eb3d75ca82039e01012c
Date: Sun, 15 Sep 2013 18:39:22 +0200
Message-ID: <20130915163924.293E420F89@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5930066987068610557=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============5930066987068610557==
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, fifteen has been updated
       via  4accbf93699f6fd76079eb3d75ca82039e01012c (commit)
      from  93d772a59e671d2d4fa8bd58a9de0fa5bb9b43f1 (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 4accbf93699f6fd76079eb3d75ca82039e01012c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Sep 15 15:59:34 2013 +0200

    kernel: disable magic sysrq.

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

Summary of changes:
 config/kernel/kernel.config.i586-ipfire     | 4 ++--
 config/kernel/kernel.config.i586-ipfire-pae | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.c=
onfig.i586-ipfire
index c9b564a..09a11d1 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -390,7 +390,7 @@ CONFIG_CPU_SUP_UMC_32=3Dy
 CONFIG_HPET_TIMER=3Dy
 CONFIG_HPET_EMULATE_RTC=3Dy
 CONFIG_DMI=3Dy
-CONFIG_NR_CPUS=3D32
+CONFIG_NR_CPUS=3D4
 CONFIG_SCHED_SMT=3Dy
 CONFIG_SCHED_MC=3Dy
 CONFIG_PREEMPT_NONE=3Dy
@@ -5206,7 +5206,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=3D4
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_ENABLE_MUST_CHECK=3Dy
 CONFIG_FRAME_WARN=3D2048
-CONFIG_MAGIC_SYSRQ=3Dy
+# CONFIG_MAGIC_SYSRQ is not set
 CONFIG_STRIP_ASM_SYMS=3Dy
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern=
el.config.i586-ipfire-pae
index e007a07..4d4ea12 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -5247,7 +5247,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=3D4
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_ENABLE_MUST_CHECK=3Dy
 CONFIG_FRAME_WARN=3D2048
-CONFIG_MAGIC_SYSRQ=3Dy
+# CONFIG_MAGIC_SYSRQ is not set
 CONFIG_STRIP_ASM_SYMS=3Dy
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set


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

--===============5930066987068610557==--