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

Stephen Rothwell
2020-10-29T02:38:55Z

[-- Attachment #1: Type: text/plain, Size: 1778 bytes --]

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 PHY")

from the phy-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 0e8f57817184,f01ce8f451c8..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14552,14 -14547,14 +14552,22 @@@ F: Documentation/devicetree/bindings/ma
F: drivers/mailbox/qcom-ipcc.c
F: include/dt-bindings/mailbox/qcom-ipcc.h

+ QUALCOMM IPQ4019 USB PHY DRIVER
+ M: Robert Marko <robert.marko@sartura.hr>
+ M: Luka Perkov <luka.perkov@sartura.hr>
+ L: linux-arm-msm@vger.kernel.org
+ S: Maintained
+ F: Documentation/devicetree/bindings/phy/qcom-usb-ipq4019-phy.yaml
+ F: drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c
+
+QUALCOMM IPQ4019 VQMMC REGULATOR DRIVER
+M: Robert Marko <robert.marko@sartura.hr>
+M: Luka Perkov <luka.perkov@sartura.hr>
+L: linux-arm-msm@vger.kernel.org
+S: Maintained
+F: Documentation/devicetree/bindings/regulator/vqmmc-ipq4019-regulator.yaml
+F: drivers/regulator/vqmmc-ipq4019-regulator.c
+
QUALCOMM RMNET DRIVER
M: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
M: Sean Tranchetti <stranche@codeaurora.org>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]