projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a10b760 5fb7795)
Merge tag 'qcom-arm64-fixes-for-5.19' into arm64-for-5.20
authorBjorn Andersson <bjorn.andersson@linaro.org>
Sun, 3 Jul 2022 03:03:46 +0000 (22:03 -0500)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Sun, 3 Jul 2022 03:17:36 +0000 (22:17 -0500)
This merges the 'qcom-arm64-fixes-for-5.19' tag into arm64-for-5.20 to
handle the merge conflict related to the header file changes in
sc7180-trogdor.

1  2 
arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts patch | diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/msm8994.dtsi patch | diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi patch | diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi patch | diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/sdm845.dtsi patch | diff1 | diff2 | blob | history
arch/arm64/boot/dts/qcom/sm8450.dtsi patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/boot/dts/qcom/msm8994.dtsi
Simple merge
diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 5fc687322d5d6376552dde0b9d4373c92068f62b,88f6a7d4d0203a708fe9a8d0f49eb85139b135cb..2cf7d5212c61c38be457ec056faa118f4d13349f
--- 1/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
--- 2/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
@@@ -5,8 -5,7 +5,8 @@@
   * Copyright 2020 Google LLC.
   */
  
- #include "sc7180-trogdor.dtsi"
+ /* This file must be included after sc7180-trogdor.dtsi */
 +#include <arm/cros-ec-keyboard.dtsi>
  
  &ap_sar_sensor {
        semtech,cs0-ground;
diff --cc arch/arm64/boot/dts/qcom/sdm845.dtsi
Simple merge
diff --cc arch/arm64/boot/dts/qcom/sm8450.dtsi
Simple merge
Domain: System / Kernel;