From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@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: Wed, 23 Jul 2014 23:42:18 -0700 [thread overview]
Message-ID: <20140724064218.GB22398@kroah.com> (raw)
In-Reply-To: <20140724163329.03002387@canb.auug.org.au>
On Thu, Jul 24, 2014 at 04:33:29PM +1000, Stephen Rothwell 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
Both look good, thanks.
greg k-h
next prev parent reply other threads:[~2014-07-24 6:42 UTC|newest]
Thread overview: 14+ 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:33 ` Stephen Rothwell
2014-07-24 6:42 ` Greg KH [this message]
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 16:34 ` Matthias Kaehlcke
2021-06-17 17:30 ` Bjorn Andersson
2021-06-18 6:35 ` Greg KH
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=20140724064218.GB22398@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--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 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).