[linux] 01/03: mm: Change ZBUD back to built-in

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit a94e67cc3fe355dc29e88042ea41fa2002739b74
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Sep 24 02:46:27 2015 +0100

    mm: Change ZBUD back to built-in
    
    It's not really useful as a module.  Currently we get the following
    error messages on boot:
    
    zpool: no driver for type zbud
    zswap: zbud zpool not available
    zswap: zpool creation failed
---
 debian/changelog     | 1 +
 debian/config/config | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3b1ff64..3d01702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ linux (4.2.1-1) UNRELEASED; urgency=medium
   * mmc: Drop "eMMC: Don't initialize partitions on RPMB flagged areas", as
     upstream commit 4e93b9a6abc0 ("mmc: card: Don't access RPMB partitions for
     normal read/write") looks like a cleaner solution
+  * mm: Change ZBUD back to built-in, as it's not really useful as a module
 
   [ Aurelien Jarno ]
   * [mips*el] Fix BPF assembly code for pre-R2 CPUs. (fixes FTBFS)
diff --git a/debian/config/config b/debian/config/config
index f36a4ab..063e302 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5489,7 +5489,7 @@ CONFIG_FRONTSWAP=y
 # CONFIG_CMA is not set
 CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_ZSWAP=y
-CONFIG_ZBUD=m
+CONFIG_ZBUD=y
 CONFIG_ZSMALLOC=m
 # CONFIG_PGTABLE_MAPPING is not set
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git