1 files changed, 4 insertions, 39 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 03f01f4430fa..d58a8961e775 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -246,7 +246,6 @@ CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIX=y
 CONFIG_ALLOW_DEV_COREDUMP=y
-CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
 CONFIG_ALPINE_MSI=y
 CONFIG_ALTERA_FREEZE_BRIDGE=m
 CONFIG_ALTERA_MBOX=m
@@ -271,10 +270,7 @@ CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_DCB=y
 CONFIG_AMD_XGBE_HAVE_ECC=y
 CONFIG_AMILO_RFKILL=m
-CONFIG_ANDROID_BINDERFS=m
-CONFIG_ANDROID_BINDER_DEVICES=""
-CONFIG_ANDROID_BINDER_IPC=m
-# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
 # CONFIG_ANDROID_VSOC is not set
 CONFIG_ANON_INODES=y
 CONFIG_APB_TIMER=y
@@ -724,7 +720,7 @@ CONFIG_ARM_TI_CPUFREQ=y
 CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_AS3935=m
-CONFIG_ASHMEM=m
+# CONFIG_ASHMEM is not set
 CONFIG_ASIX_PHY=m
 CONFIG_ASN1=y
 CONFIG_ASSOCIATIVE_ARRAY=y
@@ -843,25 +839,6 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
 CONFIG_AUDIT_COMPAT_GENERIC=y
 CONFIG_AUDIT_GENERIC=y
-CONFIG_AUFS_BDEV_LOOP=y
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BR_FUSE is not set
-CONFIG_AUFS_BR_HFSPLUS=y
-# CONFIG_AUFS_BR_RAMFS is not set
-# CONFIG_AUFS_DEBUG is not set
-CONFIG_AUFS_DIRREN=y
-CONFIG_AUFS_EXPORT=y
-# CONFIG_AUFS_FHSM is not set
-CONFIG_AUFS_FS=m
-# CONFIG_AUFS_HNOTIFY is not set
-CONFIG_AUFS_INO_T_64=y
-# CONFIG_AUFS_RDU is not set
-CONFIG_AUFS_SBILIST=y
-# CONFIG_AUFS_SHWH is not set
-CONFIG_AUFS_XATTR=y
 CONFIG_AURORA_NB8800=m
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_AX25=m
@@ -2284,7 +2261,6 @@ CONFIG_DELL_SMBIOS=m
 CONFIG_DELL_SMBIOS_SMM=y
 CONFIG_DELL_SMBIOS_WMI=y
 CONFIG_DELL_SMO8800=m
-CONFIG_DELL_UART_BACKLIGHT=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_DESCRIPTOR=m
@@ -2884,7 +2860,6 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_EFI_PGT_DUMP is not set
 CONFIG_EFI_RUNTIME_MAP=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_SIGNATURE_LIST_PARSER=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_TEST=m
 CONFIG_EFI_VARS=y
@@ -4890,7 +4865,6 @@ CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS is not set
-CONFIG_KMSG_IDS=y
 CONFIG_KMX61=m
 CONFIG_KPROBES=y
 CONFIG_KPROBES_ON_FTRACE=y
@@ -5092,7 +5066,6 @@ CONFIG_LIVEPATCH=y
 # CONFIG_LKDTM is not set
 CONFIG_LLC=m
 CONFIG_LMP91000=m
-CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCKD=m
@@ -5100,8 +5073,6 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
-# CONFIG_LOCK_DOWN_MANDATORY is not set
 CONFIG_LOCK_SPIN_ON_OWNER=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
@@ -6750,6 +6721,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_ALTERA=y
 CONFIG_PCIE_ALTERA_MSI=y
 CONFIG_PCIE_ARMADA_8K=y
+# CONFIG_PCIE_BW is not set
 CONFIG_PCIE_CADENCE=y
 CONFIG_PCIE_CADENCE_EP=y
 CONFIG_PCIE_CADENCE_HOST=y
@@ -7987,7 +7959,7 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTLWIFI_DEBUG is not set
-# CONFIG_RTLWIFI_DEBUG_ST is not set
+CONFIG_RTLWIFI_DEBUG_ST=y
 CONFIG_RTLWIFI_PCI=m
 CONFIG_RTLWIFI_USB=m
 CONFIG_RTL_CARDS=m
@@ -8211,7 +8183,6 @@ CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
-CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 # CONFIG_SECURITY_SAFESETID is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
@@ -8540,8 +8511,6 @@ CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SGL_ALLOC=y
 CONFIG_SG_POOL=y
 CONFIG_SG_SPLIT=y
-CONFIG_SHIFT_FS=m
-CONFIG_SHIFT_FS_POSIX_ACL=y
 CONFIG_SHMEM=y
 CONFIG_SH_ETH=m
 CONFIG_SH_TIMER_CMT=y
@@ -8922,7 +8891,6 @@ CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
-CONFIG_SND_SOC_INTEL_BYTCR_RT5660_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
 CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
 # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
@@ -9992,7 +9960,6 @@ CONFIG_UNIX_DIAG=m
 CONFIG_UNIX_SCM=y
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_UNUSED_SYMBOLS=y
-# CONFIG_UNWINDER_ARM is not set
 CONFIG_UNWINDER_FRAME_POINTER=y
 # CONFIG_UNWINDER_GUESS is not set
 # CONFIG_UNWINDER_ORC is not set
@@ -10479,7 +10446,6 @@ CONFIG_VCNL4000=m
 CONFIG_VCNL4035=m
 CONFIG_VDSO=y
 CONFIG_VEML6070=m
-CONFIG_VERSION_SIGNATURE=""
 CONFIG_VETH=m
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_VEXPRESS_SYSCFG=y
@@ -10834,7 +10800,6 @@ CONFIG_WATCHDOG_RTAS=m
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
-# CONFIG_WCN36XX_SNAPDRAGON_HACKS is not set
 CONFIG_WD80x3=m
 CONFIG_WDAT_WDT=m
 CONFIG_WDT=m