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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 29 Oct 2020 13:20:52 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Kishon Vijay Abraham I <kishon@...com>,
        Vinod Koul <vkoul@...nel.org>, Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Robert Marko <robert.marko@...tura.hr>
Subject: 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 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@...tura.hr>
+ M:	Luka Perkov <luka.perkov@...tura.hr>
+ L:	linux-arm-msm@...r.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@...tura.hr>
 +M:	Luka Perkov <luka.perkov@...tura.hr>
 +L:	linux-arm-msm@...r.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@...eaurora.org>
  M:	Sean Tranchetti <stranche@...eaurora.org>

Content of type "application/pgp-signature" skipped