Re: linux-next: manual merge of the phy-next tree with the regulator-fixes tree

On 29-10-20, 13:20, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the phy-next tree got a conflict in: > > MAINTAINERS > > between commit: > > 43c3e148830a ("MAINTAINERS: Add entry for Qualcomm IPQ4019 VQMMC regulator") > > from the regulator-fixes tree and commit: >

linux-next: manual merge of the phy-next tree with the regulator-fixes tree

Hi all, Today's linux-next merge of the phy-next tree got a conflict in: MAINTAINERS between commit: 43c3e148830a ("MAINTAINERS: Add entry for Qualcomm IPQ4019 VQMMC regulator") from the regulator-fixes tree and commit: c36f74566cef ("MAINTAINERS: Add entry for Qualcomm IPQ4019 USB