From: Vinod Koul <vkoul@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kishon Vijay Abraham I <kishon@ti.com>,
Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
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: Re: linux-next: manual merge of the phy-next tree with the regulator-fixes tree
Date: Thu, 29 Oct 2020 08:38:24 +0530 [thread overview]
Message-ID: <20201029030824.GY3550@vkoul-mobl> (raw)
In-Reply-To: <20201029132052.1ac29c18@canb.auug.org.au>
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:
>
> 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.
lgtm, thanks Stephen
>
> --
> 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>
--
~Vinod
prev parent reply other threads:[~2020-10-29 7:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 2:20 linux-next: manual merge of the phy-next tree with the regulator-fixes tree Stephen Rothwell
2020-10-29 3:08 ` Vinod Koul [this message]
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=20201029030824.GY3550@vkoul-mobl \
--to=vkoul@kernel.org \
--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=sfr@canb.auug.org.au \
/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).