From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bjorn Andersson <andersson@kernel•org>
Cc: linux-next@vger•kernel.org,
Jonathan Cameron <Jonathan.Cameron@huawei•com>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro•org>,
Rob Herring <robh+dt@kernel•org>, Greg KH <greg@kroah•com>,
Arnd Bergmann <arnd@arndb•de>
Subject: Re: linux-next: Expected merge conflict in iio qcom,spmi-vadc.yaml
Date: Wed, 7 Dec 2022 11:51:49 +1100 [thread overview]
Message-ID: <20221207115149.1bba8fd3@canb.auug.org.au> (raw)
In-Reply-To: <20221206181209.zj36eezbj2irktmo@builder.lan>
[-- Attachment #1: Type: text/plain, Size: 824 bytes --]
Hi Bjorn,
On Tue, 6 Dec 2022 12:12:09 -0600 Bjorn Andersson <andersson@kernel•org> wrote:
>
> I messed up and picked an IIO DT binding change a while ago without
> synchronizing with Jonathan and we've now ended up with a failing
> dt_binding_check because of this.
>
> The solution for this is:
> https://lore.kernel.org/lkml/20221117121307.264550-1-krzysztof.kozlowski@linaro.org/
>
> After considering the various solutions I've picked this up as:
> 51f7be212ae6 ("dt-bindings: iio: adc: qcom,spmi-vadc: fix PM8350 define")
>
> This does however cause a merge conflict between the qcom- and
> iio-trees. Could you please solve this in line with Krzysztof's patch?
No worries, done. I got the conflict when merging the char-misc tree
(Greg and Arnd added to cc).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-12-07 0:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-06 18:12 linux-next: Expected merge conflict in iio qcom,spmi-vadc.yaml Bjorn Andersson
2022-12-07 0:51 ` Stephen Rothwell [this message]
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=20221207115149.1bba8fd3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=andersson@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=krzysztof.kozlowski+dt@linaro$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh+dt@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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