From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kishon Vijay Abraham I <kishon@ti.com>,
Vinod Koul <vkoul@kernel.org>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Robert Marko <robert.marko@sartura.hr>
Subject: linux-next: manual merge of the phy-next tree with the regulator-fixes tree
Date: Thu, 29 Oct 2020 13:20:52 +1100 [thread overview]
Message-ID: <20201029132052.1ac29c18@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2020-10-29 2:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 2:20 Stephen Rothwell [this message]
2020-10-29 3:08 ` linux-next: manual merge of the phy-next tree with the regulator-fixes tree Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201029132052.1ac29c18@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@kernel.org \
--cc=kishon@ti.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robert.marko@sartura.hr \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).