From: Krzysztof Kozlowski <krzk@kernel.org>
To: Andi Shyti <andi.shyti@kernel.org>, Alexey Charkov <alchark@gmail.com>
Cc: Rob Herring <robh@kernel.org>, Conor Dooley <conor+dt@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Subject: Re: [PATCH v3] dt-bindings: i2c: i2c-wmt: Convert to YAML
Date: Thu, 8 May 2025 12:33:21 +0200 [thread overview]
Message-ID: <dcd6fe48-9f2e-4bab-a791-a939a32cc184@kernel.org> (raw)
In-Reply-To: <wt7du4fu44sxut5i4ymhmb4akhm46btm7yszz6xbya2sxq7gdp@al24jhhqdz5c>
On 08/05/2025 12:31, Andi Shyti wrote:
> Hi Alexey,
>
>> index 16037aaa770fc35efb45fc26555afaa5102e2640..4d18afdaf12bf6a5956793814f8db39b34074a12 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -3464,7 +3464,7 @@ M: Krzysztof Kozlowski <krzk@kernel.org>
>> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
>> S: Odd Fixes
>> F: Documentation/devicetree/bindings/hwinfo/via,vt8500-scc-id.yaml
>> -F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt
>> +F: Documentation/devicetree/bindings/i2c/wm,wm8505-i2c.yaml
>
> this has caused some conflict. You are based on -next but i2c
> hasn't received some of these changes, yet.
>
> Anyway, I fixed the conflict and merged to i2c/i2c-host. Let's
> see how it goes, but I believe we will receive some complaints in
> the next days.
Yes, few trees will have similar conflicts here. Expect them also when
you send your pull to Linus. Conflicts should be trivial, though.
Best regards,
Krzysztof
next prev parent reply other threads:[~2025-05-08 10:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-06 10:38 [PATCH v3] dt-bindings: i2c: i2c-wmt: Convert to YAML Alexey Charkov
2025-05-08 10:31 ` Andi Shyti
2025-05-08 10:33 ` Krzysztof Kozlowski [this message]
2025-05-08 12:42 ` Andi Shyti
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=dcd6fe48-9f2e-4bab-a791-a939a32cc184@kernel.org \
--to=krzk@kernel.org \
--cc=alchark@gmail.com \
--cc=andi.shyti@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@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