Merge tags 'vfs-7.3-rc1.efs' and 'vfs-7.3-rc1.freevxfs' of git://git.kernel.org/pub...

Pull efs and freevxfs removal from Christian Brauner:
 "This removes the EFS and freevxfs filesystems:

   - EFS was the read-only on-disk format SGI used on IRIX before XFS

   - freevxfs provided compatibility with various old-school Unix
     systems from the 1990s and was fun 25 years ago. Today it mostly
     serves as fodder for automated bug checkers. There has been only
     one known user and contributor in the last 15 years"

* tag 'vfs-7.3-rc1.efs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  efs: Remove EFS

* tag 'vfs-7.3-rc1.freevxfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  freevxfs: remove the driver

diff --cc MAINTAINERS
index 8014b9f8253edf15231df215d1b14063a54a55ec,e2a0d74db4e363f21c7da491a63e8695b1996eea,268994cc3b25e8528ce3fbc3824e1724223d1448..b7094a616afdc8155b4c35d84ee3048ebfa2d01d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -14190,7 -14186,6 -14186,7 +14179,7 @@@@ F:        virt/kvm/
   KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
   M:   Marc Zyngier <maz@kernel.org>
   M:   Oliver Upton <oupton@kernel.org>
  -R:   Fuad Tabba <tabba@google.com>
 ++R:   Fuad Tabba <fuad.tabba@linux.dev>
   R:   Joey Gouly <joey.gouly@arm.com>
   R:   Steffen Eiden <seiden@linux.ibm.com>
   R:   Suzuki K Poulose <suzuki.poulose@arm.com>

diff --cc fs/Kconfig
Simple merge

diff --cc fs/Makefile
Simple merge