lkml.org 
[lkml]   [2022]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] MAINTAINERS: adjust file entry for max77693 dt after merge conflict mess-up
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

\
 
 \ /
  Last update: 2022-06-15 23:44    [W:0.141 / U:0.168 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site