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.
Signed-off-by: Lukas Bulwahn <[email protected]>
---
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(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index b045b70e54df..dcfb09700b96 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
--
2.17.1
On 6/1/20 10:21 PM, Lukas Bulwahn wrote:
> 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.
>
> Signed-off-by: Lukas Bulwahn <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
> ---
> 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(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index b045b70e54df..dcfb09700b96 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -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
>
Reviewed-by: Julius Werner <[email protected]>
Apologies for that slip up.
Reviewed-by: Evan Benn <[email protected]>
On Wed, Jun 3, 2020 at 6:16 AM Julius Werner <[email protected]> wrote:
>
> Reviewed-by: Julius Werner <[email protected]>
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=5c24a28b4eb842ad1256496be6ae01bab15f1dcb
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=72a9e7fea5866fc471fda78f05f166595c8c6ba6
On Wed, Jun 3, 2020 at 9:22 AM Evan Benn <[email protected]> wrote:
>
> Apologies for that slip up.
>
> Reviewed-by: Evan Benn <[email protected]>
>
> On Wed, Jun 3, 2020 at 6:16 AM Julius Werner <[email protected]> wrote:
> >
> > Reviewed-by: Julius Werner <[email protected]>
On Fri, 5 Jun 2020, Evan Benn wrote:
> 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=5c24a28b4eb842ad1256496be6ae01bab15f1dcb
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=72a9e7fea5866fc471fda78f05f166595c8c6ba6
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
>
> On Wed, Jun 3, 2020 at 9:22 AM Evan Benn <[email protected]> wrote:
> >
> > Apologies for that slip up.
> >
> > Reviewed-by: Evan Benn <[email protected]>
> >
> > On Wed, Jun 3, 2020 at 6:16 AM Julius Werner <[email protected]> wrote:
> > >
> > > Reviewed-by: Julius Werner <[email protected]>
>
On Tue, Jun 30, 2020 at 09:59:51PM +0200, Lukas Bulwahn wrote:
>
>
> On Fri, 5 Jun 2020, Evan Benn wrote:
>
> > 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=5c24a28b4eb842ad1256496be6ae01bab15f1dcb
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=72a9e7fea5866fc471fda78f05f166595c8c6ba6
>
> 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
On Tue, Jun 30, 2020 at 10:32 PM Guenter Roeck <[email protected]> wrote:
>
> On Tue, Jun 30, 2020 at 09:59:51PM +0200, Lukas Bulwahn wrote:
> >
> >
> > On Fri, 5 Jun 2020, Evan Benn wrote:
> >
> > > 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=5c24a28b4eb842ad1256496be6ae01bab15f1dcb
> > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=72a9e7fea5866fc471fda78f05f166595c8c6ba6
> >
> > 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.
>
Great! Thanks, Guenter.