mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
To: Lee Jones <lee.jones@linaro.org>
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
	Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: [PATCH] MAINTAINERS: adjust file entry for max77693 dt after merge conflict mess-up
Date: Wed,  1 Jun 2022 09:35:11 +0200	[thread overview]
Message-ID: <20220601073511.15721-1-lukas.bulwahn@gmail.com> (raw)

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


             reply	other threads:[~2022-06-01  7:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-01  7:35 Lukas Bulwahn [this message]
2022-06-15 21:43 ` Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220601073511.15721-1-lukas.bulwahn@gmail.com \
    --to=lukas.bulwahn@gmail.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®