Merge tag 'v5.14-rc3' into arm64-for-5.15
authorBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 16 Aug 2021 23:02:26 +0000 (18:02 -0500)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 16 Aug 2021 23:02:26 +0000 (18:02 -0500)
commit198b8c8ede36d2135df73fee19506276059a0f8e
treebf6c582edf18fa1a14833e30eded74c722cd1179
parent97ec669dfcfa22f8a595356ceb6ce46e7b4a82e9
parentff1176468d368232b684f75e82563369208bc371
Merge tag 'v5.14-rc3' into arm64-for-5.15

The USB maintainer felt the strong need to push '1f958f3dff42
("Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name"")'
through the usb tree, so merge v5.14-rc3 to resolve the resulting merge
conflicts.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
arch/arm64/boot/dts/qcom/ipq8074.dtsi
arch/arm64/boot/dts/qcom/msm8996.dtsi
arch/arm64/boot/dts/qcom/msm8998.dtsi
arch/arm64/boot/dts/qcom/sc7180.dtsi
arch/arm64/boot/dts/qcom/sdm845.dtsi
arch/arm64/boot/dts/qcom/sm8150.dtsi