From: Felipe Balbi <balbi@ti•com>
To: Felipe Balbi <balbi@ti•com>
Cc: Greg KH <greg@kroah•com>, 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.adi@gmail•com>
Subject: Re: linux-next: manual merge of the usb tree with Linus' tree
Date: Thu, 16 Dec 2010 10:45:52 +0200 [thread overview]
Message-ID: <20101216084552.GD2601@legolas.emea.dhcp.ti.com> (raw)
In-Reply-To: <20101216080527.GA2601@legolas.emea.dhcp.ti.com>
Hi,
On Thu, Dec 16, 2010 at 10:05:27AM +0200, Felipe Balbi wrote:
>On Wed, Dec 15, 2010 at 07:08:57PM -0800, Greg KH wrote:
>>On Thu, Dec 16, 2010 at 02:01:22PM +1100, Stephen Rothwell wrote:
>>>Hi Greg,
>>>
>>>Today's linux-next merge of the usb tree got a conflict in
>>>drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
>>>drivers/usb/musb/musb_core.h between commit
>>>1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
>>>it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
>>>tree.
>>>
>>>It was not immediately obvious how to fix these up, so I just used the
>>>versions from the usb tree. This may not be correct and it would be good
>>>if this was fixed properly in the usb tree.
>>
>>Hm. Felipe, I'll merge in the -rc4 tree into usb-next if it makes sense
>>to do so now, can you send me the patch that ends up being the correct
>>merge?
>
>Sure, I'll check it now and send in a patch in a few minutes.
There are two commits you didn't have in your usb-next branch which are
in mainline. Reverting them will make greg/usb-next apply cleanly on top
of v2.6.47-rc4. The commits are:
32d5dc9520f0c6f60f691dd478741c774e292406 : USB: musb: pm: don't rely fully on clock support
1e393c6eece048052d4131ec4dad3b98e35a98e2 : USB: musb: blackfin: pm: make it work
Do you want me to rebase on top of -rc4 or is reverting those two enough
for you ? As a sidenote, the series I sent you already fixes those two
cases as we moved PM and clock handling entirely to glue layer, so those
two cases are taken care of on the series, reverting those patches won't
pose any regressions.
--
balbi
next prev parent reply other threads:[~2010-12-16 8:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-16 3:01 linux-next: manual merge of the usb tree with Linus' tree Stephen Rothwell
2010-12-16 3:08 ` Greg KH
2010-12-16 8:05 ` Felipe Balbi
2010-12-16 8:45 ` Felipe Balbi [this message]
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
-- 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-06 1:47 Stephen Rothwell
2010-12-07 4:43 ` Greg KH
2010-12-07 5:49 ` Felipe Balbi
[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=20101216084552.GD2601@legolas.emea.dhcp.ti.com \
--to=balbi@ti$(echo .)com \
--cc=greg@kroah$(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.adi@gmail$(echo .)com \
/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