projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bc90f56
8e99e77
)
Merge branch 'arm64-fixes-for-6.10' into arm64-for-6.11
author
Bjorn Andersson
<andersson@kernel.org>
Thu, 6 Jun 2024 22:38:08 +0000
(17:38 -0500)
committer
Bjorn 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
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm64/boot/dts/qcom/sc8180x.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm64/boot/dts/qcom/x1e80100-crd.dts
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm64/boot/dts/qcom/x1e80100.dtsi
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm64/boot/dts/qcom/sa8775p.dtsi
Simple merge
diff --cc
arch/arm64/boot/dts/qcom/sc8180x.dtsi
Simple merge
diff --cc
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
Simple merge
diff --cc
arch/arm64/boot/dts/qcom/x1e80100-crd.dts
Simple merge
diff --cc
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
Simple merge
diff --cc
arch/arm64/boot/dts/qcom/x1e80100.dtsi
Simple merge