]> www.infradead.org Git - linux.git/commitdiff
Merge branch 'arm64-fixes-for-6.10' into arm64-for-6.11
authorBjorn Andersson <andersson@kernel.org>
Thu, 6 Jun 2024 22:38:08 +0000 (17:38 -0500)
committerBjorn Andersson <andersson@kernel.org>
Thu, 6 Jun 2024 22:38:08 +0000 (17:38 -0500)
Merge the arm64-fixes-for-6.10 branch into arm64-for-6.11 to resolve the
merge conflict caused by pmic-glink and reserved-memory introduction at
the same place in the x1e80100 crd and qcp dts files.

1  2 
arch/arm64/boot/dts/qcom/sa8775p.dtsi
arch/arm64/boot/dts/qcom/sc8180x.dtsi
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
arch/arm64/boot/dts/qcom/x1e80100-crd.dts
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
arch/arm64/boot/dts/qcom/x1e80100.dtsi

Simple merge
Simple merge