From becaca2c809a9c8eeb45287d3ecc5c572cc49733 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 25 Apr 2019 15:06:47 +0100
Subject: [PATCH] ntfs: Disable NTFS_FS due to lack of upstream security
 support

---
 debian/changelog          | 1 +
 debian/config/config      | 4 +---
 debian/config/m68k/config | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee8fd5d8d..e14b373e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -808,6 +808,7 @@ linux (4.19.34-1) UNRELEASED; urgency=medium
   * linux-source: Recommend bison and flex, always needed to build the kernel
   * [armel/marvell,sh4] linux-image: Recommend apparmor, like all other configs
   * udeb: Drop unused ntfs-modules packages
+  * ntfs: Disable NTFS_FS due to lack of upstream security support
 
   [ YunQiang Su ]
   * [mips*r6] Re-enable CONFIG_JUMP_LABEL, which has been fixed in upstream.
diff --git a/debian/config/config b/debian/config/config
index e6c3c573b..1a9f6df51 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -6099,9 +6099,7 @@ CONFIG_INOTIFY_USER=y
 ##
 ## file: fs/ntfs/Kconfig
 ##
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
+# CONFIG_NTFS_FS is not set
 
 ##
 ## file: fs/ocfs2/Kconfig
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 64a96c3b8..b251972cf 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -675,11 +675,6 @@ CONFIG_BINFMT_MISC=m
 ##
 # CONFIG_JFS_FS is not set
 
-##
-## file: fs/ntfs/Kconfig
-##
-# CONFIG_NTFS_FS is not set
-
 ##
 ## file: fs/ocfs2/Kconfig
 ##