public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Bjorn Andersson <andersson@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
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>
Subject: linux-next: Expected merge conflict in iio qcom,spmi-vadc.yaml
Date: Tue, 6 Dec 2022 12:12:09 -0600	[thread overview]
Message-ID: <20221206181209.zj36eezbj2irktmo@builder.lan> (raw)

Hi Stephen,

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?

Thanks,
Bjorn

next             reply	other threads:[~2022-12-06 18:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-06 18:12 Bjorn Andersson [this message]
2022-12-07  0:51 ` linux-next: Expected merge conflict in iio qcom,spmi-vadc.yaml Stephen Rothwell

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=20221206181209.zj36eezbj2irktmo@builder.lan \
    --to=andersson@kernel$(echo .)org \
    --cc=Jonathan.Cameron@huawei$(echo .)com \
    --cc=krzysztof.kozlowski+dt@linaro$(echo .)org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=robh+dt@kernel$(echo .)org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox