From: Bjorn Andersson <bjorn.andersson@linaro.org>
Date: Sun, 3 Jul 2022 03:03:46 +0000 (-0500)
Subject: Merge tag 'qcom-arm64-fixes-for-5.19' into arm64-for-5.20
X-Git-Tag: v6.1-rc5~784^2~14^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=817c2f3519745749e60ea35d9be676819bb2fe6a;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'qcom-arm64-fixes-for-5.19' into arm64-for-5.20

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.
---

817c2f3519745749e60ea35d9be676819bb2fe6a
diff --cc arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
index 5fc687322d5d,88f6a7d4d020..2cf7d5212c61
--- a/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;