From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips.org>,
James Hogan <james.hogan@imgtec.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Hauke Mehrtens <hauke@hauke-m.de>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
Kishon Vijay Abraham I <kishon@ti.com>
Subject: Re: linux-next: manual merge of the usb tree with the mips tree
Date: Mon, 4 Sep 2017 11:17:23 +0200 [thread overview]
Message-ID: <20170904091723.GA13245@kroah.com> (raw)
In-Reply-To: <20170904155132.007b788b@canb.auug.org.au>
On Mon, Sep 04, 2017 at 03:51:32PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> drivers/phy/Makefile
>
> between commit:
>
> 0ab3aa747f26 ("phy: Add an USB PHY driver for the Lantiq SoCs using the RCU module")
>
> from the mips tree and commit:
>
> cd4ec4b03dc1 ("phy: phy-mt65xx-usb3: add mediatek directory and rename file")
>
> from the usb 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 drivers/phy/Makefile
> index a8b9439a5d8e,06f3c500030d..000000000000
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@@ -4,12 -4,12 +4,12 @@@
>
> obj-$(CONFIG_GENERIC_PHY) += phy-core.o
> obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o
> - obj-$(CONFIG_PHY_MT65XX_USB3) += phy-mt65xx-usb3.o
> obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
> obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o
> -
> obj-$(CONFIG_ARCH_SUNXI) += allwinner/
> obj-$(CONFIG_ARCH_MESON) += amlogic/
> +obj-$(CONFIG_LANTIQ) += lantiq/
> + obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/
> obj-$(CONFIG_ARCH_RENESAS) += renesas/
> obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
> obj-$(CONFIG_ARCH_TEGRA) += tegra/
Looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2017-09-04 9:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-04 5:51 linux-next: manual merge of the usb tree with the mips tree Stephen Rothwell
2017-09-04 9:17 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-04 8:39 Stephen Rothwell
2015-06-05 10:53 ` 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=20170904091723.GA13245@kroah.com \
--to=greg@kroah.com \
--cc=chunfeng.yun@mediatek.com \
--cc=hauke@hauke-m.de \
--cc=james.hogan@imgtec.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ralf@linux-mips.org \
--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).