[lkml]   [2022]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the dt-krzk tree with the qcom tree
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.


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,

 \ /
  Last update: 2022-07-04 09:17    [W:0.032 / U:2.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site