From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Daney <ddaney@caviumnetworks.com>,
Ralf Baechle <ralf@linux-mips.org>,
Anatolij Gustschin <agust@denx.de>
Subject: Re: linux-next: manual merge of the usb tree with the mips tree
Date: Tue, 19 Oct 2010 08:47:08 -0700 [thread overview]
Message-ID: <20101019154707.GE4589@kroah.com> (raw)
In-Reply-To: <20101018170911.63f76c60.sfr@canb.auug.org.au>
On Mon, Oct 18, 2010 at 05:09:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/Makefile between commit
> cd97084c3aff6f1037e00ee711a872719b60441d ("USB: Add EHCI and OHCH glue
> for OCTEON II SOCs") from the mips tree and commit
> f668f1e9868f9bc1bed3d5df1701879ac89cc3ed ("USB: add platform glue driver
> for FSL USB DR controller") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks for the fix, looks fine.
greg k-h
next prev parent reply other threads:[~2010-10-19 15:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-18 6:09 linux-next: manual merge of the usb tree with the mips tree Stephen Rothwell
2010-10-19 15:47 ` Greg KH [this message]
-- 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-04 8:39 Stephen Rothwell
2015-06-05 10:53 ` Greg KH
2015-06-03 6:48 Stephen Rothwell
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=20101019154707.GE4589@kroah.com \
--to=greg@kroah.com \
--cc=agust@denx.de \
--cc=ddaney@caviumnetworks.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).