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,
Mac Lin <mkl0301@gmail•com>,
Anton Vorontsov <cbouatmailru@gmail•com>,
Russell King <rmk@arm•linux.org.uk>
Subject: Re: linux-next: manual merge of the usb tree with the arm tree
Date: Mon, 3 Jan 2011 21:29:36 -0800 [thread overview]
Message-ID: <20110104052936.GB14119@kroah.com> (raw)
In-Reply-To: <20110104160708.770eb1e2.sfr@canb.auug.org.au>
On Tue, Jan 04, 2011 at 04:07:08PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> On Tue, 4 Jan 2011 15:58:43 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/host/ehci-hcd.c between commit
> > 760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and
> > OHCI bus glue for cns3xxx SOCs") from the arm tree and various commits
> > from the usb tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary.
>
> The fix was not quite right (I left out a "#endif") - I fixed that up.
Thanks for doing this, it looks fine.
greg k-h
next prev parent reply other threads:[~2011-01-04 5:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-04 4:58 linux-next: manual merge of the usb tree with the arm tree Stephen Rothwell
2011-01-04 5:07 ` Stephen Rothwell
2011-01-04 5:29 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-01-31 4:53 Stephen Rothwell
2011-01-04 4:55 Stephen Rothwell
2011-01-04 5:29 ` 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=20110104052936.GB14119@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=cbouatmailru@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mkl0301@gmail$(echo .)com \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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