Merge tag 'trace-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace...

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bf0f54c24f81714b64a6b5a4169c12fc62bd63a1..67ce91c8778a9f0b78f5d3ac5c7b9b3100d07d28 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1662,7 +1662,7 @@ F:        arch/arm*/include/asm/perf_event.h
 F:     arch/arm*/kernel/hw_breakpoint.c
 F:     arch/arm*/kernel/perf_*
 F:     drivers/perf/
-F:     include/linux/perf/arm_pmu.h
+F:     include/linux/perf/arm_pmu*.h
 
 ARM PORT
 M:     Russell King <[email protected]>
@@ -3344,7 +3344,7 @@ AX.25 NETWORK LAYER
 M:     Ralf Baechle <[email protected]>
 L:     [email protected]
 S:     Maintained
-W:     http://www.linux-ax25.org/
+W:     https://linux-ax25.in-berlin.de
 F:     include/net/ax25.h
 F:     include/uapi/linux/ax25.h
 F:     net/ax25/
@@ -6645,9 +6645,9 @@ F:        Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml
 F:     drivers/gpu/drm/panel/panel-novatek-nt36672a.c
 
 DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
-M:     Ben Skeggs <[email protected]>
 M:     Karol Herbst <[email protected]>
 M:     Lyude Paul <[email protected]>
+M:     Danilo Krummrich <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Supported
@@ -8874,7 +8874,7 @@ F:        drivers/gpio/gpio-mockup.c
 F:     tools/testing/selftests/gpio/
 
 GPIO REGMAP
-R:     Michael Walle <[email protected]>
+M:     Michael Walle <[email protected]>
 S:     Maintained
 F:     drivers/gpio/gpio-regmap.c
 F:     include/linux/gpio/regmap.h
@@ -13616,6 +13616,7 @@ F:      drivers/net/ethernet/mellanox/mlxfw/
 
 MELLANOX HARDWARE PLATFORM SUPPORT
 M:     Hans de Goede <[email protected]>
+M:     Ilpo Järvinen <[email protected]>
 M:     Mark Gross <[email protected]>
 M:     Vadim Pasternak <[email protected]>
 L:     [email protected]
@@ -14210,6 +14211,7 @@ F:      drivers/platform/surface/surface_gpe.c
 
 MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
 M:     Hans de Goede <[email protected]>
+M:     Ilpo Järvinen <[email protected]>
 M:     Mark Gross <[email protected]>
 M:     Maximilian Luz <[email protected]>
 L:     [email protected]
@@ -14756,7 +14758,7 @@ NETROM NETWORK LAYER
 M:     Ralf Baechle <[email protected]>
 L:     [email protected]
 S:     Maintained
-W:     http://www.linux-ax25.org/
+W:     https://linux-ax25.in-berlin.de
 F:     include/net/netrom.h
 F:     include/uapi/linux/netrom.h
 F:     net/netrom/
@@ -18607,7 +18609,7 @@ ROSE NETWORK LAYER
 M:     Ralf Baechle <[email protected]>
 L:     [email protected]
 S:     Maintained
-W:     http://www.linux-ax25.org/
+W:     https://linux-ax25.in-berlin.de
 F:     include/net/rose.h
 F:     include/uapi/linux/rose.h
 F:     net/rose/
@@ -23423,9 +23425,11 @@ F:     drivers/platform/x86/x86-android-tablets/
 
 X86 PLATFORM DRIVERS
 M:     Hans de Goede <[email protected]>
+M:     Ilpo Järvinen <[email protected]>
 M:     Mark Gross <[email protected]>
 L:     [email protected]
 S:     Maintained
+Q:     https://patchwork.kernel.org/project/platform-driver-x86/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
 F:     drivers/platform/olpc/
 F:     drivers/platform/x86/