[PATCH] MAINTAINERS: adjust file entry for max77693 dt after merge conflict mess-up

[PATCH] MAINTAINERS: adjust file entry for max77693 dt after merge conflict mess-up

[Lukas Bulwahn]

Commit b38213c6118b ("dt-bindings: mfd: maxim,max77693: Convert to
dtschema") converts max77693.txt to maxim,max77693.yaml and adjusts the
file entry in MAINTAINERS accordingly.

Unfortunately, the merge commit afb67df31a8c ("Merge branches [...] into
ibs-for-mfd-merged") resolves some conflict in MAINTAINERS in such a way
that the file entry for the converted text file max77693.txt, removed in
the commit above, is added back into MAINTAINERS.

Remove the file entry to this converted text file in MAXIM PMIC AND MUIC
DRIVERS FOR EXYNOS BASED BOARDS.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
Lee, please pick this minor non-urgent clean-up patch. Thanks.

 MAINTAINERS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 8ccdd7727840..01e276fa6476 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12117,7 +12117,6 @@ F:	Documentation/devicetree/bindings/*/maxim,max77686.yaml
 F:	Documentation/devicetree/bindings/*/maxim,max77693.yaml
 F:	Documentation/devicetree/bindings/*/maxim,max77843.yaml
 F:	Documentation/devicetree/bindings/clock/maxim,max77686.txt
-F:	Documentation/devicetree/bindings/mfd/max77693.txt
 F:	drivers/*/*max77843.c
 F:	drivers/*/max14577*.c
 F:	drivers/*/max77686*.c
-- 
2.17.1

Re: [PATCH] MAINTAINERS: adjust file entry for max77693 dt after merge conflict mess-up

[Lee Jones]

On Wed, 01 Jun 2022, Lukas Bulwahn wrote:

> Commit b38213c6118b ("dt-bindings: mfd: maxim,max77693: Convert to
> dtschema") converts max77693.txt to maxim,max77693.yaml and adjusts the
> file entry in MAINTAINERS accordingly.
> 
> Unfortunately, the merge commit afb67df31a8c ("Merge branches [...] into
> ibs-for-mfd-merged") resolves some conflict in MAINTAINERS in such a way
> that the file entry for the converted text file max77693.txt, removed in
> the commit above, is added back into MAINTAINERS.
> 
> Remove the file entry to this converted text file in MAXIM PMIC AND MUIC
> DRIVERS FOR EXYNOS BASED BOARDS.
> 
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> Lee, please pick this minor non-urgent clean-up patch. Thanks.
> 
>  MAINTAINERS | 1 -
>  1 file changed, 1 deletion(-)

Applied, thanks.

-- 
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog