Merge remote-tracking branch 'sm8550-drivers/tracking-qcomlt-sm8550-drivers'...
Merge remote-tracking branch 'sm8550-drivers/tracking-qcomlt-sm8550-drivers' into integration-linux-qcomlt # Conflicts: # Documentation/devicetree/bindings/crypto/qcom-qce.yaml # Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml # Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml # drivers/crypto/qce/core.c # drivers/gpu/drm/msm/Kconfig # drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c # drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h # drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c # drivers/gpu/drm/msm/dsi/dsi_cfg.c # drivers/gpu/drm/msm/dsi/dsi_cfg.h # drivers/gpu/drm/msm/dsi/phy/dsi_phy.c # drivers/gpu/drm/msm/dsi/phy/dsi_phy.h # drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c # drivers/gpu/drm/msm/msm_mdss.c # drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
Loading
Please sign in to comment