diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-02-21 09:26:22 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-02-21 09:29:25 -0800 |
| commit | d1fabc68f8e0541d41657096dc713cb01775652d (patch) | |
| tree | a1c98028683fb61feafedf7c9b2b6fad7c13db5f /MAINTAINERS | |
| parent | 4d4266e3fd321fadb628ce02de641b129522c39c (diff) | |
| parent | f922c7b1c1c45740d329bf248936fdb78c0cff6e (diff) | |
| download | lwn-d1fabc68f8e0541d41657096dc713cb01775652d.tar.gz lwn-d1fabc68f8e0541d41657096dc713cb01775652d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Per-next-PR merge.
net/smc/af_smc.c
b5dd4d698171 ("net/smc: llc_conf_mutex refactor, replace it with rw_semaphore")
e40b801b3603 ("net/smc: fix potential panic dues to unprotected smc_llc_srv_add_link()")
https://lore.kernel.org/all/20230221124008.6303c330@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 20b25511e18d..4df1a6e89fe7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4814,9 +4814,9 @@ F: net/sched/sch_etf.c F: net/sched/sch_taprio.c CC2520 IEEE-802.15.4 RADIO DRIVER -M: Varka Bhadram <varkabhadram@gmail.com> +M: Stefan Schmidt <stefan@datenfreihafen.org> L: linux-wpan@vger.kernel.org -S: Maintained +S: Odd Fixes F: Documentation/devicetree/bindings/net/ieee802154/cc2520.txt F: drivers/net/ieee802154/cc2520.c @@ -10013,6 +10013,7 @@ F: drivers/clk/clk-versaclock5.c IEEE 802.15.4 SUBSYSTEM M: Alexander Aring <alex.aring@gmail.com> M: Stefan Schmidt <stefan@datenfreihafen.org> +M: Miquel Raynal <miquel.raynal@bootlin.com> L: linux-wpan@vger.kernel.org S: Maintained W: https://linux-wpan.org/ @@ -12828,9 +12829,9 @@ F: drivers/iio/potentiometer/mcp4018.c F: drivers/iio/potentiometer/mcp4531.c MCR20A IEEE-802.15.4 RADIO DRIVER -M: Xue Liu <liuxuenetmail@gmail.com> +M: Stefan Schmidt <stefan@datenfreihafen.org> L: linux-wpan@vger.kernel.org -S: Maintained +S: Odd Fixes W: https://github.com/xueliu/mcr20a-linux F: Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt F: drivers/net/ieee802154/mcr20a.c @@ -14193,9 +14194,9 @@ T: git git://linuxtv.org/media_tree.git F: drivers/media/radio/radio-mr800.c MRF24J40 IEEE 802.15.4 RADIO DRIVER -M: Alan Ott <alan@signal11.us> +M: Stefan Schmidt <stefan@datenfreihafen.org> L: linux-wpan@vger.kernel.org -S: Maintained +S: Odd Fixes F: Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt F: drivers/net/ieee802154/mrf24j40.c |