From: Olof Johansson <olof@lixom.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Pratyush Anand <pratyush.anand@st.com>,
Viresh Kumar <viresh.kumar@linaro.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Kishon Vijay Abraham I <kishon@ti.com>
Subject: Re: linux-next: manual merge of the usb tree with the arm-soc tree
Date: Thu, 24 Jul 2014 08:39:30 -0700 [thread overview]
Message-ID: <CAOesGMgZHHKLMeyGKq_ZfSxWsRcLL3a=ogbW8s=KTUrjf6L3qA@mail.gmail.com> (raw)
In-Reply-To: <20140724163329.03002387@canb.auug.org.au>
On Wed, Jul 23, 2014 at 11:33 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> On Thu, 24 Jul 2014 16:28:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the usb tree got a conflict in
>> drivers/phy/Kconfig between commit 64562e99477f ("phy: Add drivers for
>> PCIe and SATA phy on SPEAr13xx") from the arm-soc tree and commit
>> 1de990d8a169 ("phy: qcom: Add driver for QCOM APQ8064 SATA PHY") from
>> the usb tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Also drivers/phy/Makefile
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/phy/Makefile
> index 241c741e6e39,971ad0aac388..000000000000
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@@ -18,8 -21,7 +21,10 @@@ phy-exynos-usb2-y += phy-samsung-usb2
> phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o
> phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o
> phy-exynos-usb2-$(CONFIG_PHY_EXYNOS5250_USB2) += phy-exynos5250-usb2.o
> +phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2) += phy-s5pv210-usb2.o
> obj-$(CONFIG_PHY_EXYNOS5_USBDRD) += phy-exynos5-usbdrd.o
> obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
> +obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o
> +obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o
> + obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o
> + obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o
We've both been sinners here. New entries should be added in
alphabetical order to avoid these conflicts, and neither of us caught
it.
Resolution looks OK though.
-Olof
WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the usb tree with the arm-soc tree
Date: Thu, 24 Jul 2014 08:39:30 -0700 [thread overview]
Message-ID: <CAOesGMgZHHKLMeyGKq_ZfSxWsRcLL3a=ogbW8s=KTUrjf6L3qA@mail.gmail.com> (raw)
In-Reply-To: <20140724163329.03002387@canb.auug.org.au>
On Wed, Jul 23, 2014 at 11:33 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> On Thu, 24 Jul 2014 16:28:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the usb tree got a conflict in
>> drivers/phy/Kconfig between commit 64562e99477f ("phy: Add drivers for
>> PCIe and SATA phy on SPEAr13xx") from the arm-soc tree and commit
>> 1de990d8a169 ("phy: qcom: Add driver for QCOM APQ8064 SATA PHY") from
>> the usb tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Also drivers/phy/Makefile
>
> --
> Cheers,
> Stephen Rothwell sfr at canb.auug.org.au
>
> diff --cc drivers/phy/Makefile
> index 241c741e6e39,971ad0aac388..000000000000
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@@ -18,8 -21,7 +21,10 @@@ phy-exynos-usb2-y += phy-samsung-usb2
> phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o
> phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4X12_USB2) += phy-exynos4x12-usb2.o
> phy-exynos-usb2-$(CONFIG_PHY_EXYNOS5250_USB2) += phy-exynos5250-usb2.o
> +phy-exynos-usb2-$(CONFIG_PHY_S5PV210_USB2) += phy-s5pv210-usb2.o
> obj-$(CONFIG_PHY_EXYNOS5_USBDRD) += phy-exynos5-usbdrd.o
> obj-$(CONFIG_PHY_XGENE) += phy-xgene.o
> +obj-$(CONFIG_PHY_ST_SPEAR1310_MIPHY) += phy-spear1310-miphy.o
> +obj-$(CONFIG_PHY_ST_SPEAR1340_MIPHY) += phy-spear1340-miphy.o
> + obj-$(CONFIG_PHY_QCOM_APQ8064_SATA) += phy-qcom-apq8064-sata.o
> + obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o
We've both been sinners here. New entries should be added in
alphabetical order to avoid these conflicts, and neither of us caught
it.
Resolution looks OK though.
-Olof
next prev parent reply other threads:[~2014-07-24 15:39 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-24 6:28 linux-next: manual merge of the usb tree with the arm-soc tree Stephen Rothwell
2014-07-24 6:28 ` Stephen Rothwell
2014-07-24 6:28 ` Stephen Rothwell
2014-07-24 6:33 ` Stephen Rothwell
2014-07-24 6:33 ` Stephen Rothwell
2014-07-24 6:33 ` Stephen Rothwell
2014-07-24 6:42 ` Greg KH
2014-07-24 6:42 ` Greg KH
2014-07-24 15:39 ` Olof Johansson [this message]
2014-07-24 15:39 ` Olof Johansson
2014-07-24 15:39 ` Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2021-06-17 4:43 Stephen Rothwell
2021-06-17 4:43 ` Stephen Rothwell
2021-06-17 16:34 ` Matthias Kaehlcke
2021-06-17 16:34 ` Matthias Kaehlcke
2021-06-17 17:30 ` Bjorn Andersson
2021-06-17 17:30 ` Bjorn Andersson
2021-06-18 6:35 ` Greg KH
2021-06-18 6:35 ` Greg KH
2014-03-03 7:13 Stephen Rothwell
2014-03-03 7:13 ` Stephen Rothwell
2014-03-03 7:13 ` Stephen Rothwell
2011-10-04 5:50 Stephen Rothwell
2011-10-04 15:26 ` Greg KH
2011-10-05 8:52 ` Felipe Balbi
2011-10-05 10:51 ` Stephen Rothwell
2011-10-05 10:53 ` Felipe Balbi
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='CAOesGMgZHHKLMeyGKq_ZfSxWsRcLL3a=ogbW8s=KTUrjf6L3qA@mail.gmail.com' \
--to=olof@lixom.net \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pratyush.anand@st.com \
--cc=sfr@canb.auug.org.au \
--cc=srinivas.kandagatla@linaro.org \
--cc=viresh.kumar@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.