Merge tag 'x86_cache_for_v6.9_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a94abdf6e9a311b05fd3a9bccddb142e50aac20e..747f492ce6ccd8b2223219b2a8fbe58e055cdd92 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11157,6 +11157,16 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wwan/iosm/
 
+INTEL(R) FLEXIBLE RETURN AND EVENT DELIVERY
+M:     Xin Li <xin@zytor.com>
+M:     "H. Peter Anvin" <hpa@zytor.com>
+S:     Supported
+F:     Documentation/arch/x86/x86_64/fred.rst
+F:     arch/x86/entry/entry_64_fred.S
+F:     arch/x86/entry/entry_fred.c
+F:     arch/x86/include/asm/fred.h
+F:     arch/x86/kernel/fred.c
+
 INTEL(R) TRACE HUB
 M:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
 S:     Supported
@@ -15589,16 +15599,6 @@ W:     https://github.com/davejiang/linux/wiki
 T:     git https://github.com/davejiang/linux.git
 F:     drivers/ntb/hw/intel/
 
-NTFS FILESYSTEM
-M:     Anton Altaparmakov <anton@tuxera.com>
-R:     Namjae Jeon <linkinjeon@kernel.org>
-L:     linux-ntfs-dev@lists.sourceforge.net
-S:     Supported
-W:     http://www.tuxera.com/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
-F:     Documentation/filesystems/ntfs.rst
-F:     fs/ntfs/
-
 NTFS3 FILESYSTEM
 M:     Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
 L:     ntfs3@lists.linux.dev
@@ -17513,6 +17513,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 F:     fs/timerfd.c
 F:     include/linux/time_namespace.h
 F:     include/linux/timer*
+F:     include/trace/events/timer*
 F:     kernel/time/*timer*
 F:     kernel/time/namespace.c
 
@@ -20962,6 +20963,12 @@ F:     Documentation/devicetree/bindings/phy/starfive,jh7110-usb-phy.yaml
 F:     drivers/phy/starfive/phy-jh7110-pcie.c
 F:     drivers/phy/starfive/phy-jh7110-usb.c
 
+STARFIVE JH8100 EXTERNAL INTERRUPT CONTROLLER DRIVER
+M:     Changhuang Liang <changhuang.liang@starfivetech.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/interrupt-controller/starfive,jh8100-intc.yaml
+F:     drivers/irqchip/irq-starfive-jh8100-intc.c
+
 STATIC BRANCH/CALL
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Josh Poimboeuf <jpoimboe@kernel.org>