Merge branch 'fixes' into next

This brings rockchip,pcie3-phy changes into next which incoming patches
are dependent on

diff --cc drivers/phy/qualcomm/phy-qcom-qmp-combo.c
Simple merge

diff --cc drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
Simple merge

diff --cc drivers/phy/rockchip/phy-rockchip-snps-pcie3.c
Simple merge