diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 89cec7ee6ff4..32fd2c977624 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -333,6 +333,7 @@ CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
@@ -476,7 +477,7 @@ CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_SYNQUACER=y
-CONFIG_ARCH_TANGO=y
+# CONFIG_ARCH_TANGO is not set
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
@@ -653,7 +654,6 @@ CONFIG_ARM_SDE_INTERFACE=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_SPE_PMU=m
-CONFIG_ARM_TANGO_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA_DEVFREQ=m
@@ -1379,7 +1379,6 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_CLKSRC_IMX_GPT=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLKSRC_QCOM=y
-CONFIG_CLKSRC_TANGO_XTAL=y
 CONFIG_CLKSRC_TI_32K=y
 CONFIG_CLKSRC_VERSATILE=y
 CONFIG_CLK_BCM_NS2=y
@@ -3670,6 +3669,7 @@ CONFIG_HOTPLUG_PCI_POWERNV=m
 CONFIG_HOTPLUG_PCI_RPA=m
 CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
 CONFIG_HOTPLUG_PCI_S390=y
+CONFIG_HOTPLUG_SMT=y
 CONFIG_HP03=m
 CONFIG_HP100=m
 CONFIG_HP206C=m
@@ -3855,7 +3855,6 @@ CONFIG_I2C_VIPERBOARD=m
 CONFIG_I2C_XGENE_SLIMPRO=m
 CONFIG_I2C_XILINX=m
 CONFIG_I2C_XLP9XX=m
-# CONFIG_I2C_XLR is not set
 CONFIG_I40E=m
 CONFIG_I40EVF=m
 CONFIG_I40E_DCB=y
@@ -4463,7 +4462,6 @@ CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_SPI=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_SUNXI=m
-CONFIG_IR_TANGO=m
 CONFIG_IR_TTUSBIR=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_XMP_DECODER=m
@@ -5573,7 +5571,6 @@ CONFIG_MTD_NAND_PXA3xx=m
 CONFIG_MTD_NAND_QCOM=m
 CONFIG_MTD_NAND_RICOH=m
 # CONFIG_MTD_NAND_SUNXI is not set
-CONFIG_MTD_NAND_TANGO=m
 CONFIG_MTD_NAND_TMIO=m
 # CONFIG_MTD_NAND_VF610_NFC is not set
 CONFIG_MTD_NETtel=m
@@ -8970,9 +8967,6 @@ CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_PEGASUS=m
 CONFIG_TAHVO_USB=m
 CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
-# CONFIG_TANGOX_WATCHDOG is not set
-CONFIG_TANGO_IRQ=y
-# CONFIG_TANGO_THERMAL is not set
 CONFIG_TAP=m
 CONFIG_TARGET_CORE=m
 CONFIG_TASKSTATS=y