From: Felipe Balbi <balbi@ti•com>
To: Greg KH <greg@kroah•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Bob Liu <lliubbo@gmail•com>, Mike Frysinger <vapier@gentoo•org>,
Felipe Balbi <balbi@ti•com>, Hema Kalliguddi <hemahk@ti•com>
Subject: Re: linux-next: manual merge of the usb tree with Linus' tree
Date: Tue, 7 Dec 2010 07:49:42 +0200 [thread overview]
Message-ID: <20101207054942.GA2576@legolas.emea.dhcp.ti.com> (raw)
In-Reply-To: <20101207044358.GB29457@kroah.com>
On Mon, Dec 06, 2010 at 08:43:58PM -0800, Greg KH wrote:
>On Mon, Dec 06, 2010 at 12:47:18PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the usb tree got a conflict in
>> drivers/usb/musb/blackfin.c between commit
>> 1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
>> it work") from Linus' tree and commit
>> ea65df57c2eea803535a071752efb030c46a11f5 ("usb: musb: remove board_data
>> parameter from musb_platform_init()") from the usb tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary.
>
>Thanks. Felipe, does this patch look correct? I should probably merge
>the next -rc release into my USB tree to handle this type of thing.
Looks perfect. Thanks Stephen.
--
balbi
next prev parent reply other threads:[~2010-12-07 5:49 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-06 1:47 linux-next: manual merge of the usb tree with Linus' tree Stephen Rothwell
2010-12-07 4:43 ` Greg KH
2010-12-07 5:49 ` Felipe Balbi [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-21 4:07 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:52 ` Greg KH
2011-02-07 4:08 Stephen Rothwell
2011-02-09 2:31 ` Xu, Andiry
2011-02-09 5:42 ` Xu, Andiry
2011-02-17 18:04 ` Greg KH
2010-12-16 3:01 Stephen Rothwell
2010-12-16 3:08 ` Greg KH
2010-12-16 8:05 ` Felipe Balbi
2010-12-16 8:45 ` Felipe Balbi
2010-12-16 15:52 ` Greg KH
2010-12-16 15:55 ` Felipe Balbi
2010-12-16 17:44 ` Greg KH
2010-12-16 18:14 ` Greg KH
2010-12-16 22:33 ` Stephen Rothwell
[not found] <20100805132208.74bf6ab9.sfr@canb.auug.org.au>
2010-08-05 10:17 ` Jiri Kosina
2010-08-05 10:35 ` Michał Nazarewicz
2010-08-05 22:36 ` Greg KH
2009-12-23 22:30 Stephen Rothwell
2009-12-23 23:38 ` Greg KH
2009-12-24 0:22 ` Stephen Rothwell
2009-09-23 6:38 Stephen Rothwell
2009-09-23 12:38 ` Jason Wessel
2009-09-23 12:50 ` Stephen Rothwell
2009-09-23 13:20 ` 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=20101207054942.GA2576@legolas.emea.dhcp.ti.com \
--to=balbi@ti$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=hemahk@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lliubbo@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=vapier@gentoo$(echo .)org \
/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