Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1157120
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the usb tree with the mips tree |
| Date | Wed, 03 Jun 2015 08:50:01 +0200 |
| Message-ID | <pxaEV-186-9@gated-at.bofh.it> (permalink) |
| X-Original-To | Greg KH <greg@kroah.com>, Ralf Baechle <ralf@linux-mips.org> |
| X-Mailer | Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) |
| MIME-Version | 1.0 |
| Content-Type | multipart/signed; micalg=pgp-sha256; boundary="Sig_/oOsKleqY22rQxi+V/Q/R/ij"; protocol="application/pgp-signature" |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 57 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Bresticker <abrestic@chromium.org>, Heikki Krogerus <heikki.krogerus@linux.intel.com>, Felipe Balbi <balbi@ti.com> |
| X-Original-Date | Wed, 3 Jun 2015 16:48:42 +1000 |
| X-Original-Message-ID | <20150603164842.1615c414@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | aioe.org linux.kernel:1157120 |
Show key headers only | View raw
[Multipart message — attachments visible in raw view] - view raw
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@canb.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
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
linux-next: manual merge of the usb tree with the mips tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-06-03 08:50 +0200
csiph-web