public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Andy Gross <agross@kernel.org>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the dt-krzk tree with the qcom tree
Date: Mon, 4 Jul 2022 09:15:14 +0200	[thread overview]
Message-ID: <1482ae3d-7841-beca-3fa4-7e2519944086@linaro.org> (raw)
In-Reply-To: <20220704121133.33f82aea@canb.auug.org.au>

On 04/07/2022 04:11, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the dt-krzk tree got a conflict in:
> 
>   Documentation/devicetree/bindings/arm/qcom.yaml
> 
> between commit:
> 
>   bbd5a6891908 ("dt-bindings: arm: qcom: document sda660 SoC and ifc6560 board")
> 
> from the qcom tree and commit:
> 
>   4fc3efba3205 ("dt-bindings: arm: qcom: add missing SDM630 board compatibles")
> 
> from the dt-krzk tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This

Thanks, looks good.

Bjorn,

There is more and more of dt-bindings work pending on my board patchset
(part of this pull). I think we talked that you will pull it?


Best regards,
Krzysztof

      reply	other threads:[~2022-07-04  7:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-04  2:11 linux-next: manual merge of the dt-krzk tree with the qcom tree Stephen Rothwell
2022-07-04  7:15 ` Krzysztof Kozlowski [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=1482ae3d-7841-beca-3fa4-7e2519944086@linaro.org \
    --to=krzysztof.kozlowski@linaro.org \
    --cc=agross@kernel.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=krzk@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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