Skip to contentSkip to conversation

MAINTAINERS: rectify entry in ARM SMC WATCHDOG DRIVER

PATCH In review Lukas Bulwahn 4 participants 8 messages Jun 2, 2020 – Jun 30, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MAINTAINERS: rectify entry in ARM SMC WATCHDOG DRIVER

Commit 5c24a28b4eb8 ("dt-bindings: watchdog: Add ARM smc wdt for mt8173 watchdog") added the new ARM SMC WATCHDOG DRIVER entry in MAINTAINERS, but slipped in a minor mistake.

Luckily, ./scripts/get_maintainer.pl --self-test=patterns complains:

warning: no file matches F: devicetree/bindings/watchdog/arm-smc-wdt.yaml

Update file entry to intended file location.

---
Julius, Evan, please ack.

Wim, please pick this minor patch into your -next tree.

applies cleanly on next-20200529

 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
index b045b70e54df..dcfb09700b96 100644
@@ -1489,7 +1489,7 @@ ARM SMC WATCHDOG DRIVER
 M:	Julius Werner <[email protected]>
 R:	Evan Benn <[email protected]>
 S:	Maintained
-F:	devicetree/bindings/watchdog/arm-smc-wdt.yaml
+F:	Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
 F:	drivers/watchdog/arm_smc_wdt.c
 
 ARM SMMU DRIVERS
Signature · 1 line
2.17.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Lukas Bulwahn

Commit 5c24a28b4eb8 ("dt-bindings: watchdog: Add ARM smc wdt for mt8173 watchdog") added the new ARM SMC WATCHDOG DRIVER entry in MAINTAINERS, but slipped in a minor mistake.

Luckily, ./scripts/get_maintainer.pl --self-test=patterns complains:

warning: no file matches F: devicetree/bindings/watchdog/arm-smc-wdt.yaml

Update file entry to intended file location.

Quoted 24 lines

---
Julius, Evan, please ack.

Wim, please pick this minor patch into your -next tree.

applies cleanly on next-20200529

 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
index b045b70e54df..dcfb09700b96 100644
@@ -1489,7 +1489,7 @@ ARM SMC WATCHDOG DRIVER
 M:	Julius Werner <[email protected]>
 R:	Evan Benn <[email protected]>
 S:	Maintained
-F:	devicetree/bindings/watchdog/arm-smc-wdt.yaml
+F:	Documentation/devicetree/bindings/watchdog/arm-smc-wdt.yaml
 F:	drivers/watchdog/arm_smc_wdt.c
 
 ARM SMMU DRIVERS
#4 lore raw
#5 lore raw
Quoted 4 lines · Evan Benn

AFAICT this has now been merged upstream, I'm not sure what action to take:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id\24a28b4eb842ad1256496be6ae01bab15f1dcb
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?idra9e7fea5866fc471fda78f05f166595c8c6ba6

This patch is still fully valid and still applies to next-20200630; it can be simply applied as any other bug fix to your driver code.

Evan, can you please ask Wim as linux-watchdog maintainer to pick-up this patch, with the reviews below?

Lukas

Quoted 11 lines · Evan Benn
Quoted 8 lines

Apologies for that slip up.

Quoted 2 lines · Julius Werner
maintainer
#6 lore raw
Quoted 6 lines · Lukas Bulwahn
Quoted 2 lines · Evan Benn

AFAICT this has now been merged upstream, I'm not sure what action to take:

Quoted 9 lines
Quoted 2 lines

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id\24a28b4eb842ad1256496be6ae01bab15f1dcb
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?idra9e7fea5866fc471fda78f05f166595c8c6ba6

This patch is still fully valid and still applies to next-20200630; it can be simply applied as any other bug fix to your driver code.

Evan, can you please ask Wim as linux-watchdog maintainer to pick-up this patch, with the reviews below?

It is in my tree. Maybe it got lost in the back-and-forth. I'll send a pull request to Wim in the next couple of weeks.

Guenter

#7 lore raw
Quoted 14 lines · Guenter Roeck
Quoted 12 lines · Lukas Bulwahn
Quoted 4 lines · Evan Benn

AFAICT this has now been merged upstream, I'm not sure what action to take:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id\24a28b4eb842ad1256496be6ae01bab15f1dcb
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?idra9e7fea5866fc471fda78f05f166595c8c6ba6

This patch is still fully valid and still applies to next-20200630; it can be simply applied as any other bug fix to your driver code.

Quoted 7 lines
Quoted 3 lines

Evan, can you please ask Wim as linux-watchdog maintainer to pick-up this patch, with the reviews below?

It is in my tree. Maybe it got lost in the back-and-forth. I'll send a pull request to Wim in the next couple of weeks.

Great! Thanks, Guenter.