X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=debian.raspi2%2Fconfig%2Fconfig.common.ubuntu;h=7b77a43d3ed50fb81537bf8bd09a313d9a4ad52e;hb=4c53a8b9a405f9552b48b2514ddb21ba59e6393a;hp=33c2182835aff4c75ef3174b19386eabb4127524;hpb=8ead529ce2bfe9a1edc46ce41fc1a422b368e169;p=mirror_ubuntu-artful-kernel.git

diff --git a/debian.raspi2/config/config.common.ubuntu b/debian.raspi2/config/config.common.ubuntu
index 33c2182835af..7b77a43d3ed5 100644
--- a/debian.raspi2/config/config.common.ubuntu
+++ b/debian.raspi2/config/config.common.ubuntu
@@ -265,6 +265,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_UNIPHIER is not set
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
 # CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_VIRT is not set
 # CONFIG_ARCH_VULCAN is not set
@@ -302,6 +303,7 @@ CONFIG_ARM64_MODULE_CMODEL_LARGE=y
 CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_PAN=y
+# CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_PTDUMP_CORE=y
 # CONFIG_ARM64_PTDUMP_DEBUGFS is not set
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
@@ -593,7 +595,7 @@ CONFIG_BCM2835_DEVGPIOMEM=y
 CONFIG_BCM2835_MBOX=y
 CONFIG_BCM2835_SMI=m
 CONFIG_BCM2835_SMI_DEV=m
-CONFIG_BCM2835_THERMAL=m
+CONFIG_BCM2835_THERMAL=y
 CONFIG_BCM2835_TIMER=y
 CONFIG_BCM2835_VCHIQ=y
 # CONFIG_BCM2835_VCHIQ_SUPPORT_MEMDUMP is not set
@@ -646,7 +648,7 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=256
 CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_NULL_BLK=m
@@ -1168,9 +1170,9 @@ CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ENGINE=m
 CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH_ARM_CE=m
 CONFIG_CRYPTO_HASH=y
@@ -1334,12 +1336,6 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_SECURITY="apparmor"
-CONFIG_DEFAULT_SECURITY_APPARMOR=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
-# CONFIG_DEFAULT_SECURITY_SMACK is not set
-# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
@@ -1424,8 +1420,8 @@ CONFIG_DRM=m
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_ARCPGU=m
 CONFIG_DRM_ARM=y
-CONFIG_DRM_ARMADA=m
-CONFIG_DRM_ATMEL_HLCDC=m
+# CONFIG_DRM_ARMADA is not set
+# CONFIG_DRM_ATMEL_HLCDC is not set
 CONFIG_DRM_BRIDGE=y
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
@@ -1446,7 +1442,7 @@ CONFIG_DRM_EXYNOS_MIXER=y
 # CONFIG_DRM_EXYNOS_VIDI is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
-CONFIG_DRM_FSL_DCU=m
+# CONFIG_DRM_FSL_DCU is not set
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_HDLCD=m
 # CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
@@ -1457,11 +1453,7 @@ CONFIG_DRM_I2C_ADV7533=y
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
 CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_IMX=m
-CONFIG_DRM_IMX_HDMI=m
-CONFIG_DRM_IMX_LDB=m
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
-CONFIG_DRM_IMX_TVE=m
+# CONFIG_DRM_IMX is not set
 CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_KMS_HELPER=m
@@ -1496,7 +1488,7 @@ CONFIG_DRM_RCAR_DW_HDMI=m
 CONFIG_DRM_SII902X=m
 CONFIG_DRM_SIL_SII8620=m
 # CONFIG_DRM_STI is not set
-CONFIG_DRM_STM=m
+# CONFIG_DRM_STM is not set
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
 CONFIG_DRM_TINYDRM=m
@@ -1775,6 +1767,7 @@ CONFIG_FB_METRONOME=m
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_NOTIFY=y
 CONFIG_FB_OPENCORES=m
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 CONFIG_FB_RPISENSE=m
 CONFIG_FB_S1D13XXX=m
 # CONFIG_FB_SIMPLE is not set
@@ -1928,7 +1921,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_IRQ_CHIP=y
-# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+CONFIG_GENERIC_IRQ_DEBUGFS=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
@@ -2052,6 +2045,7 @@ CONFIG_HAMRADIO=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -2072,7 +2066,6 @@ CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-# CONFIG_HAVE_ARCH_VMAP_STACK is not set
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_HAVE_ARM_SMCCC=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
@@ -2853,7 +2846,7 @@ CONFIG_JOYSTICK_INTERACT=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_MAGELLAN=m
 CONFIG_JOYSTICK_PSXPAD_SPI=m
-# CONFIG_JOYSTICK_PSXPAD_SPI_FF is not set
+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
 CONFIG_JOYSTICK_RPISENSE=m
 CONFIG_JOYSTICK_SIDEWINDER=m
 CONFIG_JOYSTICK_SPACEBALL=m
@@ -3398,8 +3391,9 @@ CONFIG_MMC=y
 CONFIG_MMC35240=m
 CONFIG_MMC_ARMMMCI=y
 CONFIG_MMC_BCM2835=y
-# CONFIG_MMC_BCM2835_DMA is not set
-CONFIG_MMC_BCM2835_MMC=m
+CONFIG_MMC_BCM2835_DMA=y
+CONFIG_MMC_BCM2835_MMC=y
+CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
 CONFIG_MMC_BCM2835_SDHOST=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
@@ -4414,6 +4408,7 @@ CONFIG_QCA7000_UART=m
 CONFIG_QCOM_EMAC=m
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
+CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_QCOM_HIDMA=m
 CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_PM8XXX_XOADC=m
@@ -4430,6 +4425,7 @@ CONFIG_QNX6FS_FS=m
 CONFIG_QORIQ_CPUFREQ=m
 CONFIG_QORIQ_THERMAL=m
 CONFIG_QSEMI_PHY=m
+CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUOTA=y
 CONFIG_QUOTACTL=y
 # CONFIG_QUOTA_DEBUG is not set
@@ -4852,13 +4848,14 @@ CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_HISI_SAS=m
 CONFIG_SCSI_IMM=m
-CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=y
 # CONFIG_SCSI_IZIP_EPP16 is not set
 # CONFIG_SCSI_IZIP_SLOW_CTR is not set
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_MOD=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_NETLINK=y
 # CONFIG_SCSI_OSD_DEBUG is not set
 CONFIG_SCSI_OSD_DPRINT_SENSE=1
@@ -4896,10 +4893,19 @@ 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_FIRST is not set
+CONFIG_SECURITY_DEFAULT_DISPLAY_NAME="apparmor"
+# CONFIG_SECURITY_DEFAULT_DISPLAY_SELINUX is not set
+# CONFIG_SECURITY_DEFAULT_DISPLAY_SMACK is not set
+# CONFIG_SECURITY_DEFAULT_DISPLAY_TOMOYO is not set
 # 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_NO_EXCLUSIVE_LSM=y
 CONFIG_SECURITY_PATH=y
 # CONFIG_SECURITY_PERF_EVENTS_RESTRICT is not set
 CONFIG_SECURITY_SELINUX=y
@@ -4909,14 +4915,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
@@ -5486,7 +5496,7 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPI=y
 CONFIG_SPI_ALTERA=m
 CONFIG_SPI_AXI_SPI_ENGINE=m
-CONFIG_SPI_BCM2835=m
+CONFIG_SPI_BCM2835=y
 CONFIG_SPI_BCM2835AUX=m
 CONFIG_SPI_BCM_QSPI=m
 CONFIG_SPI_BITBANG=m
@@ -5508,7 +5518,9 @@ CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_SC18IS602=m
-# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPI_SLAVE_TIME=m
 CONFIG_SPI_SPIDEV=y
 CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_XCOMM=m
@@ -5798,7 +5810,7 @@ CONFIG_TOUCHSCREEN_RPI_FT5406=m
 CONFIG_TOUCHSCREEN_SILEAD=m
 CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
-# CONFIG_TOUCHSCREEN_STMFTS is not set
+CONFIG_TOUCHSCREEN_STMFTS=m
 CONFIG_TOUCHSCREEN_STMPE=m
 CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
@@ -5881,8 +5893,11 @@ CONFIG_TWL4030_POWER=y
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_TWL6030_GPADC=m
 CONFIG_TWL6040_CORE=y
-# CONFIG_TYPEC_TCPM is not set
-# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC=m
+# CONFIG_TYPEC_FUSB302 is not set
+# CONFIG_TYPEC_TCPCI is not set
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_UCSI=m
 CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 CONFIG_UBIFS_FS=m
@@ -5913,6 +5928,7 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX_DIAG=m
+CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_UNUSED_SYMBOLS=y
 CONFIG_UPROBES=y
 CONFIG_UPROBE_EVENTS=y
@@ -6097,7 +6113,7 @@ CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
 CONFIG_USB_R8A66597_HCD=m
-# CONFIG_USB_RAINSHADOW_CEC is not set
+CONFIG_USB_RAINSHADOW_CEC=m
 CONFIG_USB_RAREMONO=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_RTL8150=m
@@ -6299,7 +6315,7 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9V011=m
-# CONFIG_VIDEO_MUX is not set
+CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_PVRUSB2=m
@@ -6327,7 +6343,7 @@ CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2_TPG=m
 CONFIG_VIDEO_VIM2M=m
-# CONFIG_VIDEO_VIMC is not set
+CONFIG_VIDEO_VIMC=m
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
@@ -6349,17 +6365,18 @@ CONFIG_VIRTUALIZATION=y
 # CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VITESSE_PHY=m
-# CONFIG_VL6180 is not set
+CONFIG_VL6180=m
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_VMAP_STACK=y
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_VMSPLIT_2G=y
 # CONFIG_VMSPLIT_3G is not set
 # CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VSOCKETS=m
-# CONFIG_VSOCKMON is not set
+CONFIG_VSOCKMON=m
 CONFIG_VT=y
 CONFIG_VT6656=m
 CONFIG_VT_CONSOLE=y
@@ -6384,7 +6401,7 @@ CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
-# CONFIG_W1_SLAVE_DS2438 is not set
+CONFIG_W1_SLAVE_DS2438=m
 CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
@@ -6467,13 +6484,13 @@ CONFIG_X25_ASY=m
 CONFIG_X509_CERTIFICATE_PARSER=y
 # CONFIG_XEN is not set
 CONFIG_XFRM=y
-CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_ALGO=y
 CONFIG_XFRM_IPCOMP=m
 # CONFIG_XFRM_MIGRATE is not set
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_STATISTICS=y
 # CONFIG_XFRM_SUB_POLICY is not set
-CONFIG_XFRM_USER=m
+CONFIG_XFRM_USER=y
 # CONFIG_XFS_DEBUG is not set
 CONFIG_XFS_FS=m
 CONFIG_XFS_POSIX_ACL=y
@@ -6482,7 +6499,7 @@ CONFIG_XFS_RT=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_PR_DECOUPLER is not set
+CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_WATCHDOG=m
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 CONFIG_XILLYBUS=m
@@ -6519,4 +6536,4 @@ CONFIG_ZRAM=m
 CONFIG_ZSMALLOC=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_ZSWAP=y
-# CONFIG_ZX_TDM is not set
+CONFIG_ZX_TDM=m