Merge remote-tracking branch 'ntfs3/master'

diff --cc Documentation/filesystems/index.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc fs/Makefile
index 354e2ba3ee67df7c6c2e7393308277dd5a10281a,25daacebb5bc6208543c95417afbd42f8f634e80..2f21300851aeb29a29f153274cda13515aa22d1f
--- 1/fs/Makefile
--- 2/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/