Config changes: - CONFIG_EXT4_ENCRYPTION y->m (changed to tristate) Signed-off-by: Matwey V. Kornilov --- config/armv7hl/default | 4 ++-- config/armv7hl/lpae | 6 ++---- config/armv7hl/vanilla | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/config/armv7hl/default b/config/armv7hl/default index d0a5fb9..3a1cc9f 100644 --- a/config/armv7hl/default +++ b/config/armv7hl/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.1.0-rc1 Kernel Configuration +# Linux/arm 4.1.0-rc2 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -6494,7 +6494,6 @@ CONFIG_FSL_EDMA=m CONFIG_XILINX_VDMA=m CONFIG_DMA_SUN6I=m CONFIG_NBPFAXI_DMA=m -CONFIG_XGENE_DMA=m CONFIG_DMA_ENGINE=y CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_OF=y @@ -7233,6 +7232,7 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_ENCRYPTION=m CONFIG_EXT4_FS_ENCRYPTION=y # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae index 5dc8849..240278c 100644 --- a/config/armv7hl/lpae +++ b/config/armv7hl/lpae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.1.0-rc1 Kernel Configuration +# Linux/arm 4.1.0-rc2 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -6135,7 +6135,6 @@ CONFIG_DMADEVICES=y # # DMA Devices # -CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y CONFIG_AMBA_PL08X=y CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m @@ -6161,7 +6160,6 @@ CONFIG_TI_CPPI41=m CONFIG_FSL_EDMA=m CONFIG_DMA_SUN6I=m CONFIG_NBPFAXI_DMA=m -CONFIG_XGENE_DMA=m CONFIG_DMA_ENGINE=y CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_OF=y @@ -6171,7 +6169,6 @@ CONFIG_DMA_OF=y # CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set -CONFIG_DMA_ENGINE_RAID=y CONFIG_QCOM_BAM_DMA=m CONFIG_AUXDISPLAY=y CONFIG_KS0108=m @@ -6843,6 +6840,7 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_ENCRYPTION=m CONFIG_EXT4_FS_ENCRYPTION=y # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla index ec7a123..f5ef9cd 100644 --- a/config/armv7hl/vanilla +++ b/config/armv7hl/vanilla @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.1.0-rc1 Kernel Configuration +# Linux/arm 4.1.0-rc2 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -6494,7 +6494,6 @@ CONFIG_FSL_EDMA=m CONFIG_XILINX_VDMA=m CONFIG_DMA_SUN6I=m CONFIG_NBPFAXI_DMA=m -CONFIG_XGENE_DMA=m CONFIG_DMA_ENGINE=y CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_OF=y @@ -7233,6 +7232,7 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT23=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_EXT4_ENCRYPTION=m CONFIG_EXT4_FS_ENCRYPTION=y # CONFIG_EXT4_DEBUG is not set CONFIG_JBD2=y -- 2.1.4 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org