UBUNTU: [Config] update configs and annotations after rebase to 6.0-rc5

In particular drop CONFIG_ARM64_BTI_KERNEL that is not supported anymore
if the kernel is built with gcc, see:

 c0a454b9044f ("arm64/bti: Disable in kernel BTI when cross section thunks are broken")

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 32dd8339f3e4e9b39a0ea96824f0ea9547243567..f95a37105f8a22bef65dc27508faefdd66b61828 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -13479,7 +13479,6 @@ CONFIG_ARM64_TLB_RANGE                          policy<{'arm64': 'y'}>
 
 # Menu: Processor type and features >> ARMv8.5 architectural features >> Architecture: arm64
 CONFIG_ARM64_BTI                                policy<{'arm64': 'y'}>
-CONFIG_ARM64_BTI_KERNEL                         policy<{'arm64': 'y'}>
 CONFIG_ARM64_E0PD                               policy<{'arm64': 'y'}>
 CONFIG_ARM64_MTE                                policy<{'arm64': 'y'}>
 

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4fec0747be967b2fa3b261708b700365083f204e..d58ef185b08f63b116c8c1417a2a65c7777d69d1 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -673,7 +673,6 @@ CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_ARM64_AMU_EXTN=y
 CONFIG_ARM64_AS_HAS_MTE=y
 CONFIG_ARM64_BTI=y
-CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_ARM64_CNP=y
 CONFIG_ARM64_CRYPTO=y
 # CONFIG_ARM64_DEBUG_PRIORITY_MASKING is not set
@@ -11168,6 +11167,7 @@ CONFIG_SOC_TEGRA_POWERGATE_BPMP=y
 CONFIG_SOC_TI81XX=y
 CONFIG_SOC_VF610=y
 CONFIG_SOC_VIRT=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y