[PATCH wireless v2] wifi: rework MAINTAINERS entries a bit

[PATCH wireless v2] wifi: rework MAINTAINERS entries a bit

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

Since I really don't want to be CC'ed on every patch
add X: entries for all the drivers that are otherwise
covered. In some cases, add a bit more to drivers that
have other entries, mostly for the vendor directories,
but for libertas also add libertas_tf.

While at it, also add all nl80211-related (vendor)
UAPI header files to the nl80211 entry.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 MAINTAINERS | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 7078199fcebf..919dd989160b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -124,6 +124,7 @@ F:	include/net/ieee80211_radiotap.h
 F:	include/net/iw_handler.h
 F:	include/net/wext.h
 F:	include/uapi/linux/nl80211.h
+N:	include/uapi/linux/nl80211-.*
 F:	include/uapi/linux/wireless.h
 F:	net/wireless/
 
@@ -514,7 +515,7 @@ F:	drivers/hwmon/adm1029.c
 ADM8211 WIRELESS DRIVER
 L:	linux-wireless@vger.kernel.org
 S:	Orphan
-F:	drivers/net/wireless/admtek/adm8211.*
+F:	drivers/net/wireless/admtek/
 
 ADP1050 HARDWARE MONITOR DRIVER
 M:	Radu Sabau <radu.sabau@analog.com>
@@ -6195,7 +6196,7 @@ F:	Documentation/process/cve.rst
 
 CW1200 WLAN driver
 S:	Orphan
-F:	drivers/net/wireless/st/cw1200/
+F:	drivers/net/wireless/st/
 F:	include/linux/platform_data/net-cw1200.h
 
 CX18 VIDEO4LINUX DRIVER
@@ -13984,6 +13985,7 @@ MARVELL LIBERTAS WIRELESS DRIVER
 L:	libertas-dev@lists.infradead.org
 S:	Orphan
 F:	drivers/net/wireless/marvell/libertas/
+F:	drivers/net/wireless/marvell/libertas_tf/
 
 MARVELL MACCHIATOBIN SUPPORT
 M:	Russell King <linux@armlinux.org.uk>
@@ -15653,7 +15655,7 @@ M:	Ajay Singh <ajay.kathat@microchip.com>
 M:	Claudiu Beznea <claudiu.beznea@tuxon.dev>
 L:	linux-wireless@vger.kernel.org
 S:	Supported
-F:	drivers/net/wireless/microchip/wilc1000/
+F:	drivers/net/wireless/microchip/
 
 MICROSEMI MIPS SOCS
 M:	Alexandre Belloni <alexandre.belloni@bootlin.com>
@@ -16439,6 +16441,23 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
 F:	Documentation/devicetree/bindings/net/wireless/
 F:	drivers/net/wireless/
+X:	drivers/net/wireless/ath/
+X:	drivers/net/wireless/broadcom/
+X:	drivers/net/wireless/intel/
+X:	drivers/net/wireless/intersil/
+X:	drivers/net/wireless/marvell/
+X:	drivers/net/wireless/mediatek/mt76/
+X:	drivers/net/wireless/mediatek/mt7601u/
+X:	drivers/net/wireless/microchip/
+X:	drivers/net/wireless/purelifi/
+X:	drivers/net/wireless/quantenna/
+X:	drivers/net/wireless/ralink/
+X:	drivers/net/wireless/realtek/
+X:	drivers/net/wireless/rsi/
+X:	drivers/net/wireless/silabs/
+X:	drivers/net/wireless/st/
+X:	drivers/net/wireless/ti/
+X:	drivers/net/wireless/zydas/
 
 NETWORKING [DSA]
 M:	Andrew Lunn <andrew@lunn.ch>
@@ -17823,7 +17842,7 @@ M:	Christian Lamparter <chunkeey@googlemail.com>
 L:	linux-wireless@vger.kernel.org
 S:	Maintained
 W:	https://wireless.wiki.kernel.org/en/users/Drivers/p54
-F:	drivers/net/wireless/intersil/p54/
+F:	drivers/net/wireless/intersil/
 
 PACKET SOCKETS
 M:	Willem de Bruijn <willemdebruijn.kernel@gmail.com>
@@ -19100,7 +19119,7 @@ PURELIFI PLFXLC DRIVER
 M:	Srinivasan Raju <srini.raju@purelifi.com>
 L:	linux-wireless@vger.kernel.org
 S:	Supported
-F:	drivers/net/wireless/purelifi/plfxlc/
+F:	drivers/net/wireless/purelifi/
 
 PVRUSB2 VIDEO4LINUX DRIVER
 M:	Mike Isely <isely@pobox.com>
@@ -19651,7 +19670,7 @@ M:	Igor Mitsyanko <imitsyanko@quantenna.com>
 R:	Sergey Matyukevich <geomatsi@gmail.com>
 L:	linux-wireless@vger.kernel.org
 S:	Maintained
-F:	drivers/net/wireless/quantenna
+F:	drivers/net/wireless/quantenna/
 
 RADEON and AMDGPU DRM DRIVERS
 M:	Alex Deucher <alexander.deucher@amd.com>
@@ -19732,7 +19751,7 @@ RALINK RT2X00 WIRELESS LAN DRIVER
 M:	Stanislaw Gruszka <stf_xl@wp.pl>
 L:	linux-wireless@vger.kernel.org
 S:	Maintained
-F:	drivers/net/wireless/ralink/rt2x00/
+F:	drivers/net/wireless/ralink/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
 M:	Jens Axboe <axboe@kernel.dk>
@@ -21699,7 +21718,7 @@ SILICON LABS WIRELESS DRIVERS (for WFxxx series)
 M:	Jérôme Pouiller <jerome.pouiller@silabs.com>
 S:	Supported
 F:	Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
-F:	drivers/net/wireless/silabs/wfx/
+F:	drivers/net/wireless/silabs/
 
 SILICON MOTION SM712 FRAME BUFFER DRIVER
 M:	Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@ -26199,7 +26218,7 @@ F:	mm/zbud.c
 ZD1211RW WIRELESS DRIVER
 L:	linux-wireless@vger.kernel.org
 S:	Orphan
-F:	drivers/net/wireless/zydas/zd1211rw/
+F:	drivers/net/wireless/zydas/
 
 ZD1301 MEDIA DRIVER
 L:	linux-media@vger.kernel.org
-- 
2.48.1

Re: [PATCH wireless v2] wifi: rework MAINTAINERS entries a bit

[Jeff Johnson]

On 3/6/2025 12:28 AM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> Since I really don't want to be CC'ed on every patch
> add X: entries for all the drivers that are otherwise
> covered. In some cases, add a bit more to drivers that
> have other entries, mostly for the vendor directories,
> but for libertas also add libertas_tf.
> 
> While at it, also add all nl80211-related (vendor)
> UAPI header files to the nl80211 entry.
> 
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Johannes,

This patch has the unfortunate side-effect that get_maintainer.pl (and b4) no
longer add linux-wireless to ath* patches, and hence they no longer show up in
https://patchwork.kernel.org/project/linux-wireless/list/.

Thoughts on how to handle this?

/jeff

Re: [PATCH wireless v2] wifi: rework MAINTAINERS entries a bit

[Johannes Berg]

On Wed, 2025-03-26 at 08:49 -0700, Jeff Johnson wrote:
> 
> This patch has the unfortunate side-effect that get_maintainer.pl (and b4) no
> longer add linux-wireless to ath* patches, and hence they no longer show up in
> https://patchwork.kernel.org/project/linux-wireless/list/.
> 

Oops. I _wanted_ that entry to no longer match so I don't get CC'ed on
everything ... I guess we need to add L: entries to all the things I
X:'ed. I sort of thought that might be there anyway, but I see that's
not the case for everything ... below change perhaps?

johannes

diff --git a/MAINTAINERS b/MAINTAINERS
index d19627afa652..09bd9827f318 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3655,11 +3655,11 @@ T:	git git://github.com/AlbanBedel/linux
 F:	Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
 F:	drivers/phy/qualcomm/phy-ath79-usb.c
 
-ATHEROS ATH GENERIC UTILITIES
+ATHEROS ATH WIRELESS UTILITIES AND DRIVERS
 M:	Jeff Johnson <jjohnson@kernel.org>
 L:	linux-wireless@vger.kernel.org
 S:	Supported
-F:	drivers/net/wireless/ath/*
+F:	drivers/net/wireless/ath/
 
 ATHEROS ATH5K WIRELESS DRIVER
 M:	Jiri Slaby <jirislaby@kernel.org>
@@ -6208,6 +6208,7 @@ F:	Documentation/process/cve.rst
 
 CW1200 WLAN driver
 S:	Orphan
+L:	linux-wireless@vger.kernel.org
 F:	drivers/net/wireless/st/
 F:	include/linux/platform_data/net-cw1200.h
 
@@ -13995,6 +13996,7 @@ S:	Odd fixes
 F:	drivers/net/ethernet/marvell/sk*
 
 MARVELL LIBERTAS WIRELESS DRIVER
+L:	linux-wireless@vger.kernel.org
 L:	libertas-dev@lists.infradead.org
 S:	Orphan
 F:	drivers/net/wireless/marvell/libertas/
@@ -21727,6 +21729,7 @@ F:	drivers/platform/x86/touchscreen_dmi.c
 
 SILICON LABS WIRELESS DRIVERS (for WFxxx series)
 M:	Jérôme Pouiller <jerome.pouiller@silabs.com>
+L:	linux-wireless@vger.kernel.org
 S:	Supported
 F:	Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
 F:	drivers/net/wireless/silabs/

Re: [PATCH wireless v2] wifi: rework MAINTAINERS entries a bit

[Jeff Johnson]

On 3/26/2025 8:55 AM, Johannes Berg wrote:
> On Wed, 2025-03-26 at 08:49 -0700, Jeff Johnson wrote:
>>
>> This patch has the unfortunate side-effect that get_maintainer.pl (and b4) no
>> longer add linux-wireless to ath* patches, and hence they no longer show up in
>> https://patchwork.kernel.org/project/linux-wireless/list/.
>>
> 
> Oops. I _wanted_ that entry to no longer match so I don't get CC'ed on
> everything ... I guess we need to add L: entries to all the things I
> X:'ed. I sort of thought that might be there anyway, but I see that's
> not the case for everything ... below change perhaps?
> 
> johannes
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index d19627afa652..09bd9827f318 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3655,11 +3655,11 @@ T:	git git://github.com/AlbanBedel/linux
>  F:	Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
>  F:	drivers/phy/qualcomm/phy-ath79-usb.c
>  
> -ATHEROS ATH GENERIC UTILITIES
> +ATHEROS ATH WIRELESS UTILITIES AND DRIVERS
>  M:	Jeff Johnson <jjohnson@kernel.org>
>  L:	linux-wireless@vger.kernel.org
>  S:	Supported
> -F:	drivers/net/wireless/ath/*
> +F:	drivers/net/wireless/ath/

unfortunately the ath* specific entries will override so I think we need:

diff --git a/MAINTAINERS b/MAINTAINERS
index 6191b699352e..927d92518fbb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19387,6 +19387,7 @@ F:	drivers/media/tuners/qt1010*
 QUALCOMM ATH12K WIRELESS DRIVER
 M:	Jeff Johnson <jjohnson@kernel.org>
 L:	ath12k@lists.infradead.org
+L:	linux-wireless@vger.kernel.org
 S:	Supported
 W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git
@@ -19396,6 +19397,7 @@ N:	ath12k
 QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 M:	Jeff Johnson <jjohnson@kernel.org>
 L:	ath10k@lists.infradead.org
+L:	linux-wireless@vger.kernel.org
 S:	Supported
 W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git
@@ -19405,6 +19407,7 @@ N:	ath10k
 QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
 M:	Jeff Johnson <jjohnson@kernel.org>
 L:	ath11k@lists.infradead.org
+L:	linux-wireless@vger.kernel.org
 S:	Supported
 W:	https://wireless.wiki.kernel.org/en/users/Drivers/ath11k
 B:	https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport

Re: [PATCH wireless v2] wifi: rework MAINTAINERS entries a bit

[Johannes Berg]

On Wed, 2025-03-26 at 09:45 -0700, Jeff Johnson wrote:
> On 3/26/2025 8:55 AM, Johannes Berg wrote:
> > On Wed, 2025-03-26 at 08:49 -0700, Jeff Johnson wrote:
> > > 
> > > This patch has the unfortunate side-effect that get_maintainer.pl (and b4) no
> > > longer add linux-wireless to ath* patches, and hence they no longer show up in
> > > https://patchwork.kernel.org/project/linux-wireless/list/.
> > > 
> > 
> > Oops. I _wanted_ that entry to no longer match so I don't get CC'ed on
> > everything ... I guess we need to add L: entries to all the things I
> > X:'ed. I sort of thought that might be there anyway, but I see that's
> > not the case for everything ... below change perhaps?
> > 
> > johannes
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index d19627afa652..09bd9827f318 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -3655,11 +3655,11 @@ T:	git git://github.com/AlbanBedel/linux
> >  F:	Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
> >  F:	drivers/phy/qualcomm/phy-ath79-usb.c
> >  
> > -ATHEROS ATH GENERIC UTILITIES
> > +ATHEROS ATH WIRELESS UTILITIES AND DRIVERS
> >  M:	Jeff Johnson <jjohnson@kernel.org>
> >  L:	linux-wireless@vger.kernel.org
> >  S:	Supported
> > -F:	drivers/net/wireless/ath/*
> > +F:	drivers/net/wireless/ath/
> 
> unfortunately the ath* specific entries will override so I think we need:

Hmm, really? Seems that if that were the case I wouldn't have been CC'ed
on every ath*k patch?

johannes

Re: [PATCH wireless v2] wifi: rework MAINTAINERS entries a bit

[Jeff Johnson]

On 3/26/2025 9:46 AM, Johannes Berg wrote:
> On Wed, 2025-03-26 at 09:45 -0700, Jeff Johnson wrote:
>> On 3/26/2025 8:55 AM, Johannes Berg wrote:
>>> On Wed, 2025-03-26 at 08:49 -0700, Jeff Johnson wrote:
>>>>
>>>> This patch has the unfortunate side-effect that get_maintainer.pl (and b4) no
>>>> longer add linux-wireless to ath* patches, and hence they no longer show up in
>>>> https://patchwork.kernel.org/project/linux-wireless/list/.
>>>>
>>>
>>> Oops. I _wanted_ that entry to no longer match so I don't get CC'ed on
>>> everything ... I guess we need to add L: entries to all the things I
>>> X:'ed. I sort of thought that might be there anyway, but I see that's
>>> not the case for everything ... below change perhaps?
>>>
>>> johannes
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index d19627afa652..09bd9827f318 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -3655,11 +3655,11 @@ T:	git git://github.com/AlbanBedel/linux
>>>  F:	Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
>>>  F:	drivers/phy/qualcomm/phy-ath79-usb.c
>>>  
>>> -ATHEROS ATH GENERIC UTILITIES
>>> +ATHEROS ATH WIRELESS UTILITIES AND DRIVERS
>>>  M:	Jeff Johnson <jjohnson@kernel.org>
>>>  L:	linux-wireless@vger.kernel.org
>>>  S:	Supported
>>> -F:	drivers/net/wireless/ath/*
>>> +F:	drivers/net/wireless/ath/
>>
>> unfortunately the ath* specific entries will override so I think we need:
> 
> Hmm, really? Seems that if that were the case I wouldn't have been CC'ed
> on every ath*k patch?

ok, that was operator error. I thought I was applying your fixup but I was
actually applying the original (merged) patch.

but this now indicates I maintain all of the drivers under ath instead of just
maintaining the utilities that are in the top-level ath folder itself.

so from that perspective I think the ath entry should not be modified and
instead the additions should be made to the ath{10,11,12}k entries

/jeff