summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2026-07-10 14:45:18 +0200
committerArnd Bergmann <arnd@arndb.de>2026-07-10 14:45:20 +0200
commitf470efb87bd64e1e3577ab3c21aeefd265a54db2 (patch)
tree0592e204257aa8ebc13c2f793f0a943776a5aa6f
parentf9eff167fefa6f222af87ca605ddd6b6494e390f (diff)
parent314c243b201b678fa89226b1eaea51a71340454e (diff)
Merge tag 'tee-update-for-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into arm/fixes
Update update Jens Wiklander's email address * tag 'tee-update-for-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee: MAINTAINERS: .mailmap: update Jens Wiklander's email address Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS6
2 files changed, 4 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index e7e639aeb23c..a13f0962c1cc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -399,6 +399,7 @@ Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
Jens Axboe <axboe@kernel.dk> <axboe@fb.com>
Jens Axboe <axboe@kernel.dk> <axboe@meta.com>
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
+Jens Wiklander <jenswi@kernel.org> <jens.wiklander@linaro.org>
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
Jesper Dangaard Brouer <hawk@kernel.org> <brouer@redhat.com>
Jesper Dangaard Brouer <hawk@kernel.org> <hawk@comx.dk>
diff --git a/MAINTAINERS b/MAINTAINERS
index 1c7242fd18fe..3fd6b8e4cff6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20194,7 +20194,7 @@ W: http://www.onsemi.com
F: drivers/net/phy/ncn*
OP-TEE DRIVER
-M: Jens Wiklander <jens.wiklander@linaro.org>
+M: Jens Wiklander <jenswi@kernel.org>
L: op-tee@lists.trustedfirmware.org (moderated for non-subscribers)
S: Maintained
F: Documentation/ABI/testing/sysfs-bus-optee-devices
@@ -23571,7 +23571,7 @@ F: Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
F: drivers/media/platform/sunxi/sun8i-rotate/
RPMB SUBSYSTEM
-M: Jens Wiklander <jens.wiklander@linaro.org>
+M: Jens Wiklander <jenswi@kernel.org>
L: linux-kernel@vger.kernel.org
S: Supported
F: drivers/misc/rpmb-core.c
@@ -26525,7 +26525,7 @@ F: drivers/media/i2c/tw9910.c
F: include/media/i2c/tw9910.h
TEE SUBSYSTEM
-M: Jens Wiklander <jens.wiklander@linaro.org>
+M: Jens Wiklander <jenswi@kernel.org>
R: Sumit Garg <sumit.garg@kernel.org>
L: op-tee@lists.trustedfirmware.org (moderated for non-subscribers)
S: Maintained