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,
Thierry Reding <thierry.reding@avionic-design.de>,
Kishon Vijay Abraham I <kishon@ti.com>,
Felipe Balbi <balbi@ti.com>
Subject: Re: linux-next: manual merge of the usb tree with the driver-core tree
Date: Tue, 29 Jan 2013 05:41:27 -0800 [thread overview]
Message-ID: <20130129134127.GC1505@kroah.com> (raw)
In-Reply-To: <20130128212309.58732e2b08398c4ecf326dfb@canb.auug.org.au>
On Mon, Jan 28, 2013 at 09:23:09PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/musb/omap2430.c between commit 148e11349b0c ("usb: Convert to
> devm_ioremap_resource()") from the driver-core tree and commit
> ca784be36cc7 ("usb: start using the control module driver") from the usb
> tree.
>
> I fixed it up (the latter removed the code modified by the former, so I
> did that) and can carry the fix as necessary (no action is required).
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2013-01-29 13:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 10:23 linux-next: manual merge of the usb tree with the driver-core tree Stephen Rothwell
2013-01-29 13:41 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-28 10:35 Stephen Rothwell
2013-01-28 10:46 ` Felipe Balbi
2013-02-18 4:32 Stephen Rothwell
2013-02-18 4:45 ` Greg KH
2014-11-28 6:32 Stephen Rothwell
2014-12-02 18:10 ` 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=20130129134127.GC1505@kroah.com \
--to=greg@kroah.com \
--cc=balbi@ti.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=thierry.reding@avionic-design.de \
/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).