aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-20 06:41:01 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-20 06:41:01 -0700
commit434da42d7173bf097e9fab78ff97d51e8b74170d (patch)
treeaa20bdf8bd139be6e858b3a9c5f80ffb88a11709 /MAINTAINERS
parent3a85c10115407588fad696d6c121d54cd5ba5d72 (diff)
parentad79c278e478ca8c1a3bf8e7a0afba8f862a48a1 (diff)
downloadath-434da42d7173bf097e9fab78ff97d51e8b74170d.tar.gz
Merge tag 'thunderbolt-for-v6.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next
Mika writes: thunderbolt: Changes for v6.15 merge window This includes following USB4/Thunderbolt changes for the v6.15 merge window: - Move retimer scanning to happen bit later to work better with Pluggable USB4 devices. - No need to add non-active NVM for retimers if NVM upgrade is not supported. - Cleanup for tb_tunnel_alloc_usb3(). - MAINTAINERS update. All these have been in linux-next with no reported issues. * tag 'thunderbolt-for-v6.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: thunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer thunderbolt: Scan retimers after device router has been enumerated thunderbolt: Make tb_tunnel_alloc_usb3() error paths consistent with the rest MAINTAINERS: Use my kernel.org address for USB4/Thunderbolt work
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ed7aa6867674e..edef944229786 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -23633,7 +23633,7 @@ F: drivers/thunderbolt/dma_test.c
THUNDERBOLT DRIVER
M: Andreas Noever <andreas.noever@gmail.com>
M: Michael Jamet <michael.jamet@intel.com>
-M: Mika Westerberg <mika.westerberg@linux.intel.com>
+M: Mika Westerberg <westeri@kernel.org>
M: Yehezkel Bernat <YehezkelShB@gmail.com>
L: linux-usb@vger.kernel.org
S: Maintained
@@ -23644,7 +23644,7 @@ F: include/linux/thunderbolt.h
THUNDERBOLT NETWORK DRIVER
M: Michael Jamet <michael.jamet@intel.com>
-M: Mika Westerberg <mika.westerberg@linux.intel.com>
+M: Mika Westerberg <westeri@kernel.org>
M: Yehezkel Bernat <YehezkelShB@gmail.com>
L: netdev@vger.kernel.org
S: Maintained