diff --git a/debian/changelog b/debian/changelog index 3b1ff64f5..3d0170208 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 f36a4ab66..063e30279 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