diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-09-20 22:11:46 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-09-20 22:11:46 +0000 |
| commit | 201553aa9851ca84a2d2075603838a2165b6567f (patch) | |
| tree | 46b15918d5b1a2c46ca17ffee4dd0923cdfa60ec | |
| parent | 00415810102a5beb97f6f41f46cfc04705852817 (diff) | |
| parent | c5f251403b3b08d8eab25f6f71985036eea3e24f (diff) | |
Merge remote-tracking branch 'sa8155p-adp-defconfig/tracking-qcomlt-sa8155p-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20210920-230817-v5.15-rc2-173-g201553aa9851ca
# Conflicts:
# arch/arm64/configs/defconfig
| -rw-r--r-- | arch/arm64/configs/defconfig | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index c47a2aca98d6..ce8f99a0fbd8 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -132,6 +132,7 @@ CONFIG_CRYPTO_AES_ARM64_BS=m CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y +CONFIG_BLK_INLINE_ENCRYPTION=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_KSM=y CONFIG_MEMORY_FAILURE=y @@ -304,7 +305,9 @@ CONFIG_SCSI_UFSHCD=y CONFIG_SCSI_UFSHCD_PLATFORM=y CONFIG_SCSI_UFS_QCOM=y CONFIG_SCSI_UFS_HISI=y +CONFIG_SCSI_UFS_BSG=y CONFIG_SCSI_UFS_EXYNOS=y +CONFIG_SCSI_UFS_CRYPTO=y CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_AHCI_PLATFORM=y @@ -1150,14 +1153,15 @@ CONFIG_PHY_HISTB_COMBPHY=y CONFIG_PHY_HISI_INNO_USB2=y CONFIG_PHY_MVEBU_CP110_COMPHY=y CONFIG_PHY_MTK_TPHY=y -CONFIG_PHY_QCOM_QMP=m +CONFIG_PHY_QCOM_QMP=y CONFIG_PHY_QCOM_QMP_TYPEC=y -CONFIG_PHY_QCOM_QUSB2=m +CONFIG_PHY_QCOM_QUSB2=y CONFIG_PHY_QCOM_UFS=y CONFIG_PHY_QCOM_USB_HS=y -CONFIG_PHY_QCOM_USB_HS_SNPS_28NM=y -CONFIG_PHY_QCOM_USB_SS=y CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y +CONFIG_PHY_QCOM_USB_HSIC=y +CONFIG_PHY_QCOM_USB_HS_28NM=y +CONFIG_PHY_QCOM_USB_SS=y CONFIG_PHY_RCAR_GEN3_PCIE=y CONFIG_PHY_RCAR_GEN3_USB2=y CONFIG_PHY_RCAR_GEN3_USB3=m @@ -1206,7 +1210,7 @@ CONFIG_INTERCONNECT_QCOM_MSM8974=m CONFIG_INTERCONNECT_QCOM_OSM_L3=m CONFIG_INTERCONNECT_QCOM_QCS404=m CONFIG_INTERCONNECT_QCOM_SC7180=m -CONFIG_INTERCONNECT_QCOM_SDM845=m +CONFIG_INTERCONNECT_QCOM_SDM845=y CONFIG_INTERCONNECT_QCOM_SM8150=m CONFIG_INTERCONNECT_QCOM_SM8250=m CONFIG_INTERCONNECT_QCOM_SM8350=m @@ -1215,6 +1219,8 @@ CONFIG_EXT3_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_FS_ENCRYPTION=y +CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y CONFIG_FANOTIFY=y CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_QUOTA=y |