From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 1 Sep 2021 23:39:52 +0000 (+1000)
Subject: Merge remote-tracking branch 'ntfs3/master'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7424aabf83d898059c3d1ebb220ee4382e598f5;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'ntfs3/master'
---

f7424aabf83d898059c3d1ebb220ee4382e598f5
diff --cc fs/Makefile
index 354e2ba3ee67d,25daacebb5bc6..2f21300851aeb
--- a/fs/Makefile
+++ b/fs/Makefile
@@@ -96,11 -96,10 +96,12 @@@ obj-$(CONFIG_LOCKD)		+= lockd
  obj-$(CONFIG_NLS)		+= nls/
  obj-$(CONFIG_UNICODE)		+= unicode/
  obj-$(CONFIG_SYSV_FS)		+= sysv/
 +obj-$(CONFIG_CIFS_COMMON)	+= cifs_common/
  obj-$(CONFIG_CIFS)		+= cifs/
 +obj-$(CONFIG_SMB_SERVER)	+= ksmbd/
  obj-$(CONFIG_HPFS_FS)		+= hpfs/
  obj-$(CONFIG_NTFS_FS)		+= ntfs/
+ obj-$(CONFIG_NTFS3_FS)		+= ntfs3/
  obj-$(CONFIG_UFS_FS)		+= ufs/
  obj-$(CONFIG_EFS_FS)		+= efs/
  obj-$(CONFIG_JFFS2_FS)		+= jffs2/