diff --git a/configs/config-4.19.y-aarch64 b/configs/config-4.19.y-aarch64
index df326869a08ac26adf6f7291df465b4e4ed9c2de..d2f3d5b41950030d676a071e1e3fd4c561670e7e 100644
--- a/configs/config-4.19.y-aarch64
+++ b/configs/config-4.19.y-aarch64
@@ -4710,8 +4710,7 @@ CONFIG_EXT4_FS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
+# CONFIG_EXT4_ENCRYPTION is not set
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
@@ -4742,7 +4741,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=m
+# CONFIG_FS_ENCRYPTION is not set
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
diff --git a/configs/config-4.19.y-aarch64-debug b/configs/config-4.19.y-aarch64-debug
index 68f05982e9a7cc0f831aaafdc1b88125169f874f..8996df327ba25454b8bdd6139b2408f7d1044bac 100644
--- a/configs/config-4.19.y-aarch64-debug
+++ b/configs/config-4.19.y-aarch64-debug
@@ -4692,8 +4692,7 @@ CONFIG_EXT4_FS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
+# CONFIG_EXT4_ENCRYPTION is not set
 CONFIG_EXT4_DEBUG=y
 CONFIG_JBD2=m
 # CONFIG_JBD2_DEBUG is not set
@@ -4724,7 +4723,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=m
+# CONFIG_FS_ENCRYPTION is not set
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
diff --git a/configs/config-4.19.y-x86_64 b/configs/config-4.19.y-x86_64
index 3adb96768025027514fe29dd76470a8f8f2f54b8..550dbc2e1963940e5e96bebce6e47a73f7750d15 100644
--- a/configs/config-4.19.y-x86_64
+++ b/configs/config-4.19.y-x86_64
@@ -3468,8 +3468,7 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
+# CONFIG_EXT4_ENCRYPTION is not set
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@@ -3501,7 +3500,7 @@ CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
+# CONFIG_FS_ENCRYPTION is not set
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
diff --git a/configs/config-4.19.y-x86_64-debug b/configs/config-4.19.y-x86_64-debug
index 9a8dc20bf5223ac13d0e436e4dfa87f9c23b8408..bd66cd2e8282a8b1dfa35af2278e5640976e3d9f 100644
--- a/configs/config-4.19.y-x86_64-debug
+++ b/configs/config-4.19.y-x86_64-debug
@@ -3471,8 +3471,7 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXT4_ENCRYPTION=y
-CONFIG_EXT4_FS_ENCRYPTION=y
+# CONFIG_EXT4_ENCRYPTION is not set
 CONFIG_EXT4_DEBUG=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@@ -3504,7 +3503,7 @@ CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
 CONFIG_FILE_LOCKING=y
 # CONFIG_MANDATORY_FILE_LOCKING is not set
-CONFIG_FS_ENCRYPTION=y
+# CONFIG_FS_ENCRYPTION is not set
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y