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 a3fe65752cfc3aa9f51e63a818b5207746ecbae2 (commit) from fb2f3a92448d0f1e939544380a46db2cbe7d6d52 (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 a3fe65752cfc3aa9f51e63a818b5207746ecbae2 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 21 20:54:29 2011 +0100

kernel: Enable cgroup support.

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

Summary of changes: pkgs/kernel/config | 35 +++++++++++++++++++++++++++-------- pkgs/kernel/kernel.nm | 2 +- 2 files changed, 28 insertions(+), 9 deletions(-)

Difference in files: diff --git a/pkgs/kernel/config b/pkgs/kernel/config index d4b5a68..45d860d 100644 --- a/pkgs/kernel/config +++ b/pkgs/kernel/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.37 Kernel Configuration -# Mon Jan 17 11:24:54 2011 +# Linux/i386 2.6.37.2 Kernel Configuration +# Tue Mar 22 11:50:10 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -116,13 +116,30 @@ CONFIG_IKCONFIG=y # CONFIG_IKCONFIG_PROC is not set CONFIG_LOG_BUF_SHIFT=18 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_CGROUPS is not set +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_NS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_RESOURCE_COUNTERS=y +CONFIG_CGROUP_MEM_RES_CTLR=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=m +# CONFIG_DEBUG_BLK_CGROUP is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y +CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y @@ -212,11 +229,11 @@ CONFIG_BLK_DEV_BSG=y # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y +CONFIG_IOSCHED_CFQ=m +# CONFIG_CFQ_GROUP_IOSCHED is not set +CONFIG_DEFAULT_DEADLINE=y # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="deadline" CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y # CONFIG_INLINE_SPIN_TRYLOCK is not set @@ -248,7 +265,7 @@ CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set CONFIG_MUTEX_SPIN_ON_OWNER=y -# CONFIG_FREEZER is not set +CONFIG_FREEZER=y

# # Processor type and features @@ -902,6 +919,7 @@ CONFIG_CLS_U32_MARK=y CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m +# CONFIG_NET_CLS_CGROUP is not set CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_STACK=32 CONFIG_NET_EMATCH_CMP=m @@ -4002,6 +4020,7 @@ CONFIG_PAX_PAGEEXEC=y CONFIG_PAX_SEGMEXEC=y CONFIG_PAX_EMUTRAMP=y CONFIG_PAX_MPROTECT=y +# CONFIG_PAX_MPROTECT_COMPAT is not set CONFIG_PAX_ELFRELOCS=y CONFIG_PAX_KERNEXEC=y CONFIG_PAX_KERNEXEC_MODULE_TEXT=4 diff --git a/pkgs/kernel/kernel.nm b/pkgs/kernel/kernel.nm index 91a24db..3144ecb 100644 --- a/pkgs/kernel/kernel.nm +++ b/pkgs/kernel/kernel.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = linux PKG_VER = 2.6.37.2 -PKG_REL = 2 +PKG_REL = 3

PKG_MAINTAINER = Michael Tremer michael.tremer@ipfire.org PKG_GROUPS = System/Kernels

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