aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap3
-rw-r--r--MAINTAINERS6
2 files changed, 6 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index 66754ca6656d..438d79c27717 100644
--- a/.mailmap
+++ b/.mailmap
@@ -210,6 +210,9 @@ Jens Axboe <[email protected]>
Jens Osterkamp <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 8d5bc223f305..d86c7807aa20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5971,7 +5971,7 @@ F: include/linux/dm-*.h
F: include/uapi/linux/dm-*.h
DEVLINK
-M: Jiri Pirko <[email protected]>
+M: Jiri Pirko <[email protected]>
S: Supported
F: Documentation/networking/devlink
@@ -15079,7 +15079,7 @@ F: Documentation/hwmon/nzxt-smart2.rst
F: drivers/hwmon/nzxt-smart2.c
OBJAGG
-M: Jiri Pirko <[email protected]>
+M: Jiri Pirko <[email protected]>
S: Supported
F: include/linux/objagg.h
@@ -15853,7 +15853,7 @@ F: drivers/video/logo/logo_parisc*
F: include/linux/hp_sdc.h
PARMAN
-M: Jiri Pirko <[email protected]>
+M: Jiri Pirko <[email protected]>
S: Supported
F: include/linux/parman.h