UBUNTU: [Config] CONFIG_CLEANCACHE=y

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9db81baba35c1930e78942fa6bac2d0684139659..649bbd616e0cafcc9d2b346a4a0600954d137f25 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -232,7 +232,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CHROME_PLATFORMS=y
 # CONFIG_CIFS_SMB311 is not set
 # CONFIG_CIFS_STATS is not set
-# CONFIG_CLEANCACHE is not set
 CONFIG_CLS_U32_PERF=y
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index c1ab0d950f326ebc6d1fd2cf1d606e5df2f286ab..e8a45df136b795cc262d84d2261c420121778741 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -238,7 +238,6 @@ CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_CIFS_SMB311 is not set
 # CONFIG_CIFS_STATS is not set
-# CONFIG_CLEANCACHE is not set
 # CONFIG_CLK_QORIQ is not set
 CONFIG_CLS_U32_PERF=y
 # CONFIG_CM32181 is not set

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index a5272f1a2932eb725c32eb1777137ef71dbbef5f..3e2ccf5984fb7bdbaf8fe3d50fb9cefaebf0bdb5 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -229,7 +229,6 @@ CONFIG_CHARGER_ISP1704=m
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_CIFS_SMB311 is not set
 # CONFIG_CIFS_STATS is not set
-# CONFIG_CLEANCACHE is not set
 # CONFIG_CLK_QORIQ is not set
 CONFIG_CLS_U32_PERF=y
 # CONFIG_CM32181 is not set

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index e8daf1bbb5473ee1a641f299af27ebe240df2eaa..96d4803fe03047475b32daf2caf5b193b4199316 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1058,6 +1058,7 @@ CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CISS_SCSI_TAPE=y
+CONFIG_CLEANCACHE=y
 CONFIG_CLKBLD_I8253=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKEVT_I8253=y
@@ -7925,6 +7926,7 @@ CONFIG_XEN_SAVE_RESTORE=y
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_SCSI_BACKEND=m
 CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_XEN_SELFBALLOONING=y
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_TMEM=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 6a3b68deca8563dd42608145de391405ab5a5fc1..179226274a6c2c8558354ecaa090308b02e70041 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -231,7 +231,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CHROME_PLATFORMS=y
 # CONFIG_CIFS_SMB311 is not set
 # CONFIG_CIFS_STATS is not set
-# CONFIG_CLEANCACHE is not set
 CONFIG_CLS_U32_PERF=y
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set

diff --git a/debian.master/config/powerpc/config.flavour.generic b/debian.master/config/powerpc/config.flavour.generic
index b76246435bb6dbc870ec4f61263b9f04c0127e79..ce8cad113433848f1beae8c224a47d5f3169cf8a 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.generic
+++ b/debian.master/config/powerpc/config.flavour.generic
@@ -169,7 +169,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 # CONFIG_CHELSIO_T4_FCOE is not set
 # CONFIG_CIFS_SMB311 is not set
 # CONFIG_CIFS_STATS is not set
-# CONFIG_CLEANCACHE is not set
 CONFIG_CLS_U32_PERF=y
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-e500mc b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
index 4c546487e1234b62415d3f406f57727460042f9b..f500211070e210ec296a126e424cce54b661e152 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-e500mc
+++ b/debian.master/config/powerpc/config.flavour.powerpc-e500mc
@@ -170,7 +170,6 @@ CONFIG_CHARGER_SMB347=m
 CONFIG_CHELSIO_T4_FCOE=y
 CONFIG_CIFS_SMB311=y
 CONFIG_CIFS_STATS=y
-CONFIG_CLEANCACHE=y
 # CONFIG_CLS_U32_PERF is not set
 CONFIG_CM32181=m
 CONFIG_CM3232=m

diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index 8478278fe092f4c913b53d1af61fe89bd3bc979e..c25d0e9578ad8c02fe87bb361194ef36caad47b4 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -169,7 +169,6 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 # CONFIG_CHELSIO_T4_FCOE is not set
 # CONFIG_CIFS_SMB311 is not set
 # CONFIG_CIFS_STATS is not set
-# CONFIG_CLEANCACHE is not set
 CONFIG_CLS_U32_PERF=y
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set

diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-emb b/debian.master/config/powerpc/config.flavour.powerpc64-emb
index e2a4c0142460b6f3c025373a0c8934829e42d68c..06bf0c866f723dc2f3355ea8ef9f081f1633498e 100644 (file)
--- a/debian.master/config/powerpc/config.flavour.powerpc64-emb
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-emb
@@ -169,7 +169,6 @@ CONFIG_CHARGER_SMB347=m
 CONFIG_CHELSIO_T4_FCOE=y
 CONFIG_CIFS_SMB311=y
 CONFIG_CIFS_STATS=y
-CONFIG_CLEANCACHE=y
 # CONFIG_CLS_U32_PERF is not set
 CONFIG_CM32181=m
 CONFIG_CM3232=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 532558af2cdbafb2e9d17689618d5037c8ffce7c..a76c634dbeb7426db6ff2808e55e79eb7b780413 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -225,7 +225,6 @@ CONFIG_CDROM_PKTCDVD=m
 # CONFIG_CHELSIO_T4_FCOE is not set
 # CONFIG_CIFS_SMB311 is not set
 # CONFIG_CIFS_STATS is not set
-# CONFIG_CLEANCACHE is not set
 CONFIG_CLS_U32_PERF=y
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 391d086e4805052c5a5e0f97d093ba7d9136f1b9..04c2bf10b733d7e09ff376ba8584505f8d9588c0 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -174,7 +174,6 @@ CONFIG_BSD_DISKLABEL=y
 # CONFIG_CHELSIO_T4_FCOE is not set
 # CONFIG_CIFS_SMB311 is not set
 # CONFIG_CIFS_STATS is not set
-# CONFIG_CLEANCACHE is not set
 CONFIG_CLS_U32_PERF=y
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set