[SRU][M][PATCH 2/2] UBUNTU: [Config] disable shiftfs

[Andrea Righi]

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

Now that all the filesystems that we officially support have the
idmapped mounts capability we don't need shiftfs anymore and we can
disable it.

Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
---
 debian.master/config/annotations | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index af66f5cd0431..0564f5a30c8b 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11778,8 +11778,7 @@ CONFIG_SGL_ALLOC                                policy<{'amd64': 'y', 'arm64': '
 CONFIG_SG_POOL                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_SG_SPLIT                                 policy<{'arm64': 'y', 'armhf': 'y'}>
 CONFIG_SHADOW_CALL_STACK                        policy<{'arm64': 'y'}>
-CONFIG_SHIFT_FS                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
-CONFIG_SHIFT_FS_POSIX_ACL                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
+CONFIG_SHIFT_FS                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
 CONFIG_SHMEM                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
 CONFIG_SHRINKER_DEBUG                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}>
 CONFIG_SHUFFLE_PAGE_ALLOCATOR                   policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>
-- 
2.40.1