MAINTAINERS: adjust file entry for max77693 dt after merge conflict mess-up
PATCH 1/1 MAINTAINERS: adjust file entry for max77693 dt after merge conflict mess-up
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.
---
Lee, please pick this minor non-urgent clean-up patch. Thanks.
MAINTAINERS | 1 - 1 file changed, 1 deletion(-)
MAINTAINERS +0 -1
@@ -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
Signature · 1 line
2.17.1
Lee Jones
AppliedQuoted 12 lines · Lukas Bulwahn
Commit
b38213c6118b("dt-bindings: mfd: maxim,max77693: Convert to dtschema") converts max77693.txt to maxim,max77693.yaml and adjusts the file entry inMAINTAINERSaccordingly.Unfortunately, the merge commit
afb67df31a8c("Merge branches [...] into ibs-for-mfd-merged") resolves some conflict inMAINTAINERSin such a way that the file entry for the converted text file max77693.txt, removed in the commit above, is added back intoMAINTAINERS.Remove the file entry to this converted text file in MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS.
Quoted 6 lines
Signed-off-by Lukas Bulwahn <[email protected]>---
Lee, please pick this minor non-urgent clean-up patch. Thanks.MAINTAINERS | 1 - 1 file changed, 1 deletion(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Principal Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog