From e2e1eece25f28361fcf8c5c4f9e0655e9bd92a63 Mon Sep 17 00:00:00 2001
From: Andrea Righi <andrea.righi@canonical.com>
Date: Mon, 15 Feb 2021 10:42:16 +0100
Subject: [PATCH] UBUNTU: [Config] update configs/annotations after rebase to
 5.11

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/annotations                   | 2 +-
 debian.master/config/arm64/config.common.arm64     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/ppc64el/config.common.ppc64el | 1 -
 debian.master/config/s390x/config.common.s390x     | 1 -
 6 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index b7ebc3df0a69..97316e16cc88 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -603,7 +603,6 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m
 CONFIG_TCG_TIS_ST33ZP24_I2C=m
 CONFIG_THERMAL=y
 CONFIG_TIFM_CORE=m
-CONFIG_TMPFS_INODE64=y
 CONFIG_TOUCHSCREEN_ELAN=y
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 827c727e7aab..02f6b5342f43 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -10621,7 +10621,7 @@ CONFIG_PROC_PAGE_MONITOR                        policy<{'amd64': 'y', 'arm64': '
 CONFIG_TMPFS                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_TMPFS_POSIX_ACL                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_TMPFS_XATTR                              policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_TMPFS_INODE64                            policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'n'}>
+CONFIG_TMPFS_INODE64                            policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y'}>
 #
 CONFIG_TMPFS_POSIX_ACL                          mark<ENFORCED> note<some /dev nodes require POSIX ACLs, like /dev/dsp>
 
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 7816ab1e0520..bc295c4ade33 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -641,7 +641,6 @@ CONFIG_TCG_TIS_ST33ZP24_I2C=m
 CONFIG_THERMAL=y
 CONFIG_TIFM_CORE=m
 # CONFIG_TI_SOC_THERMAL is not set
-CONFIG_TMPFS_INODE64=y
 CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7bb563b48899..47c4ccf1bf37 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10783,6 +10783,7 @@ CONFIG_TMD_HERMES=m
 CONFIG_TMP006=m
 CONFIG_TMP007=m
 CONFIG_TMPFS=y
+CONFIG_TMPFS_INODE64=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_TN3215=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index c4c2af0c7402..8d63ff100679 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -611,7 +611,6 @@ CONFIG_TCG_TIS_ST33ZP24_I2C=m
 CONFIG_THERMAL=y
 CONFIG_TIFM_CORE=m
 # CONFIG_TI_SOC_THERMAL is not set
-CONFIG_TMPFS_INODE64=y
 CONFIG_TOUCHSCREEN_ELAN=m
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index fda00244ba15..81503acb759b 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -546,7 +546,6 @@ CONFIG_STANDALONE=y
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_THERMAL is not set
 # CONFIG_TIFM_CORE is not set
-# CONFIG_TMPFS_INODE64 is not set
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
-- 
2.39.2