[PATCH 2/2][SRU][Disco] UBUNTU: [Config] CONFIG_SHIFT_FS=m

[Seth Forshee]

BugLink: https://bugs.launchpad.net/bugs/1824354

There is no reason shiftfs needs to be built-in. Change it to be
a module, and add the module to the generic inclusion list so
that shiftfs will be available in linux-virtual.

Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 debian.master/config/config.common.ubuntu      | 2 +-
 debian.master/control.d/generic.inclusion-list | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 826d7a699c67..ce7aaaf01486 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8461,7 +8461,7 @@ CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SGL_ALLOC=y
 CONFIG_SG_POOL=y
 CONFIG_SG_SPLIT=y
-CONFIG_SHIFT_FS=y
+CONFIG_SHIFT_FS=m
 CONFIG_SHIFT_FS_POSIX_ACL=y
 CONFIG_SHMEM=y
 CONFIG_SH_ETH=m
diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
index 02796200ff2c..a94e60b94276 100644
--- a/debian.master/control.d/generic.inclusion-list
+++ b/debian.master/control.d/generic.inclusion-list
@@ -201,6 +201,7 @@ fs/nfsd/*
 fs/nls/nls_cp437.ko
 fs/nls/nls_iso8859-1.ko
 fs/overlayfs/*
+fs/shiftfs.ko
 fs/squashfs/*
 fs/udf/*
 fs/ufs/*
-- 
2.20.1