Merge branch 'buster+ksm' into 'buster'

[buster] cloud: enable CONFIG_KSM for cloud

See merge request kernel-team/linux!229
This commit is contained in:
Ben Hutchings 2020-04-22 13:35:13 +00:00
commit 37343cff01
2 changed files with 4 additions and 1 deletions

4
debian/changelog vendored
View File

@ -1777,6 +1777,10 @@ linux (4.19.117-1) UNRELEASED; urgency=medium
* [arm64] Include the Hisilicon Hibmc drm driver in fb-modules
(Closes: #951274)
[ Noah Meyerhans ]
* [cloud] Enable CONFIG_KSM
(Closes: #955366)
-- Salvatore Bonaccorso <carnil@debian.org> Wed, 29 Jan 2020 06:52:57 +0100
linux (4.19.98-1) buster; urgency=medium

View File

@ -1376,7 +1376,6 @@ CONFIG_HYPERV_STORAGE=m
##
## file: mm/Kconfig
##
# CONFIG_KSM is not set
# CONFIG_ZSWAP is not set
##