UBUNTU: [Config] update configs after rebase to 4.15.0-17.18

Update lsm stacking options to match master, disable new drivers
not relevant to raspi2.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index f00411e6a923849440516cdffda9d33c600aa2da..883f1c17db3f3cc9198305183499b1bd459b4090 100644 (file)
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -107,6 +107,7 @@ CONFIG_ADJD_S311=m
 CONFIG_ADT7316=m
 CONFIG_ADT7316_I2C=m
 CONFIG_ADT7316_SPI=m
+# CONFIG_ADV7511_SNAPDRAGON_HACKS is not set
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_ADXRS450=m
 CONFIG_AD_SIGMA_DELTA=m
@@ -3074,6 +3075,7 @@ CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_PCA963X=m
 CONFIG_LEDS_PM8058=m
 CONFIG_LEDS_PWM=m
+# CONFIG_LEDS_QCOM_LPG is not set
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_TCA6507=m
@@ -3379,7 +3381,6 @@ CONFIG_MFD_RK808=m
 CONFIG_MFD_RN5T618=m
 CONFIG_MFD_RPISENSE_CORE=m
 CONFIG_MFD_RT5033=m
-CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_SI476X_CORE=m
 CONFIG_MFD_SKY81452=m
@@ -3433,6 +3434,8 @@ CONFIG_MII=y
 CONFIG_MINIX_FS=m
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MISC_FILESYSTEMS=y
+CONFIG_MISC_RTSX=m
+CONFIG_MISC_RTSX_USB=m
 CONFIG_MISDN=m
 CONFIG_MISDN_DSP=m
 CONFIG_MISDN_HFCUSB=m
@@ -4196,6 +4199,7 @@ CONFIG_NR_CPUS=4
 CONFIG_NTFS_FS=m
 CONFIG_NTFS_RW=y
 # CONFIG_NUMA is not set
+# CONFIG_NVM is not set
 CONFIG_NVMEM=y
 CONFIG_NVME_CORE=m
 CONFIG_NVME_FABRICS=m
@@ -4486,6 +4490,7 @@ CONFIG_PWRSEQ_SIMPLE=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
 CONFIG_QCA7000_UART=m
+# CONFIG_QCOM_CPR is not set
 CONFIG_QCOM_EMAC=m
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
@@ -4983,8 +4988,12 @@ CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 # CONFIG_SECURITY_APPARMOR_DEBUG is not set
 CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+CONFIG_SECURITY_APPARMOR_STACKED=y
+CONFIG_SECURITY_DEFAULT_DISPLAY_APPARMOR=y
+CONFIG_SECURITY_DEFAULT_DISPLAY_NAME="apparmor"
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 # CONFIG_SECURITY_LOADPIN is not set
+# CONFIG_SECURITY_LSM_DEBUG is not set
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
@@ -4996,14 +5005,18 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
+# CONFIG_SECURITY_SELINUX_STACKED is not set
 CONFIG_SECURITY_SMACK=y
 CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
 CONFIG_SECURITY_SMACK_BRINGUP=y
 CONFIG_SECURITY_SMACK_NETFILTER=y
+# CONFIG_SECURITY_SMACK_STACKED is not set
+CONFIG_SECURITY_STACKING=y
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER=y
+# CONFIG_SECURITY_TOMOYO_STACKED is not set
 CONFIG_SECURITY_WRITABLE_HOOKS=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_SELECT_MEMORY_MODEL=y