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>,
Deepak Sikri <deepak.sikri@st.com>,
Viresh Kumar <viresh.kumar@st.com>,
Pavankumar Kondeti <pkondeti@codeaurora.org>
Subject: Re: linux-next: manual merge of the usb tree with the arm tree
Date: Mon, 3 Jan 2011 21:29:18 -0800 [thread overview]
Message-ID: <20110104052918.GA14119@kroah.com> (raw)
In-Reply-To: <20110104155513.e8c36240.sfr@canb.auug.org.au>
On Tue, Jan 04, 2011 at 03:55:13PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/Kconfig between commit
> 760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and
> OHCI bus glue for cns3xxx SOCs") from the arm tree and commits
> c8c38de9d8002578599222296b90696745ac0fe3 ("USB host: Adding USB ehci &
> ohci support for spear platform") and
> b0848aea10da186372582f33152efdda43944f26 ("USB: EHCI: Add MSM Host
> Controller driver") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, that 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:55 linux-next: manual merge of the usb tree with the arm tree Stephen Rothwell
2011-01-04 5:29 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-01-04 4:58 Stephen Rothwell
2011-01-04 5:07 ` Stephen Rothwell
2011-01-04 5:29 ` Greg KH
2011-01-31 4:53 Stephen Rothwell
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=20110104052918.GA14119@kroah.com \
--to=greg@kroah.com \
--cc=cbouatmailru@gmail.com \
--cc=deepak.sikri@st.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mkl0301@gmail.com \
--cc=pkondeti@codeaurora.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--cc=viresh.kumar@st.com \
/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