Andy - Please pull to enable Kernel Samepage Merging.

John - Please work with the server team to ensure that they have the
correct userspace packages that make use of this functionality.

rtg
--
Tim Gardner tim.gardner@canonical.com
The following changes since commit 29aa6105ed3d98a1114b1eac3eb753c8464bed6a:
Andy Whitcroft (1):
UBUNTU: Ubuntu-2.6.32-7.9

are available in the git repository at:

zinc.canonical.com:/srv/kernel.ubuntu.com/git/rtg/ubuntu-lucid ksm

Tim Gardner (1):
UBUNTU: [Config] Enable CONFIG_KSM

debian.master/config/config.common.ports | 2 +-
debian.master/config/config.common.ubuntu | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
From 6205933315ec0bb41d690bf2c2146e6a2c4bb003 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Mon, 7 Dec 2009 07:41:52 -0700
Subject: [PATCH] UBUNTU: [Config] Enable CONFIG_KSM

Kernel Samepage Merging is now supported in the mainline
kernel.

http://kernelnewbies.org/Linux_2_6_32#head-d3f32e41df508090810388a57efce73f52660ccb

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
debian.master/config/config.common.ports | 2 +-
debian.master/config/config.common.ubuntu | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index c28a6b7..b0b92d1 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -1590,7 +1590,7 @@ CONFIG_KS8851=m
CONFIG_KS8851_MLL=m
CONFIG_KS959_DONGLE=m
CONFIG_KSDAZZLE_DONGLE=m
-# CONFIG_KSM is not set
+CONFIG_KSM=y
CONFIG_LANMEDIA=m
CONFIG_LAPBETHER=m
CONFIG_LBDAF=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b9d4326..3d4d70e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1919,7 +1919,7 @@ CONFIG_KS8851=m
CONFIG_KS8851_MLL=m
CONFIG_KS959_DONGLE=m
CONFIG_KSDAZZLE_DONGLE=m
-# CONFIG_KSM is not set
+CONFIG_KSM=y
CONFIG_KVM=m
CONFIG_KVM_AMD=m
CONFIG_KVM_APIC_ARCHITECTURE=y
--
1.6.2.4

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Tim Gardner wrote:
> Andy - Please pull to enable Kernel Samepage Merging.
>
> John - Please work with the server team to ensure that they have the
> correct userspace packages that make use of this functionality.
>
> rtg
>

Crud, make that:

git://kernel.ubuntu.com/rtg/ubuntu-lucid ksm

--
Tim Gardner tim.gardner@canonical.com

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team

Applied to Lucid.

-apw

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team