From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Ralf Baechle <ralf@linux-mips.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrew Bresticker <abrestic@chromium.org>,
Brian Norris <computersforpeace@gmail.com>,
Kishon Vijay Abraham I <kishon@ti.com>
Subject: linux-next: manual merge of the usb tree with the mips tree
Date: Thu, 4 Jun 2015 18:39:33 +1000 [thread overview]
Message-ID: <20150604183933.5f403cfd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 990 bytes --]
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 0d486806ffd0 ("phy:
add Broadcom SATA3 PHY driver for Broadcom STB SoCs") 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,bc92b427e5ca..000000000000
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -40,4 -40,5 +40,6 @@@ 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
+ obj-$(CONFIG_PHY_BRCMSTB_SATA) += phy-brcmstb-sata.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-04 8:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-04 8:39 Stephen Rothwell [this message]
2015-06-05 10:53 ` linux-next: manual merge of the usb tree with the mips tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2017-09-04 5:51 Stephen Rothwell
2017-09-04 9:17 ` Greg KH
2015-06-03 6:48 Stephen Rothwell
2010-10-18 6:09 Stephen Rothwell
2010-10-19 15:47 ` Greg KH
2010-10-18 6:06 Stephen Rothwell
2010-10-19 15:46 ` Greg KH
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=20150604183933.5f403cfd@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=abrestic@chromium.org \
--cc=computersforpeace@gmail.com \
--cc=greg@kroah.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ralf@linux-mips.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).