linux-kernel - linux-next: manual merge of the usb tree with the mips 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>] [day] [month] [year] [list]

Date:	Wed, 3 Jun 2015 16:48:42 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andrew Bresticker <abrestic@...omium.org>,
	Heikki Krogerus <heikki.krogerus@...ux.intel.com>,
	Felipe Balbi <balbi@...com>
Subject: linux-next: manual merge of the usb tree with the mips tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/phy/Makefile between commit d38dee131827 ("PHY: Add driver for
Pistachio USB2.0 PHY") from the mips tree and commit 1c14905ef951
("phy: add driver for TI TUSB1210 ULPI PHY") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/phy/Makefile
index 75a37dc952f5,0a2041803135..000000000000
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -40,4 -40,4 +40,5 @@@ obj-$(CONFIG_PHY_STIH41X_USB)		+= phy-s
  obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs.o
  obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-20nm.o
  obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-14nm.o
 +obj-$(CONFIG_PHY_PISTACHIO_USB)		+= phy-pistachio-usb.o
+ obj-$(CONFIG_PHY_TUSB1210)		+= phy-tusb1210.o

Content of type "application/pgp-signature" skipped