linux-next: manual merge of the usb tree with Linus' tree

linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 544 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-pci.c between commit
baab93afc2844b68d57b0dcca5e1d34c5d7cf411 ("USB: EHCI: ASPM quirk of ISOC
on AMD Hudson") from Linus' tree and commit
b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 ("USB host: Move AMD PLL quirk
to pci-quirks.c") from the usb tree.

I just use the version from the usb tree, but this may need fixing up in
pci-quirks.c.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

RE: linux-next: manual merge of the usb tree with Linus' tree

[Xu, Andiry]

Hi,

I'll resend the PLL quirk moving patchset based on the latest linux-next
tree. 

Thanks & Best regards,
Andiry
 
> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Monday, February 07, 2011 12:08 PM
> To: Greg KH
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Xu,
Andiry;
> He, Alex
> Subject: linux-next: manual merge of the usb tree with Linus' tree
> 
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-pci.c between commit
> baab93afc2844b68d57b0dcca5e1d34c5d7cf411 ("USB: EHCI: ASPM quirk of
ISOC
> on AMD Hudson") from Linus' tree and commit
> b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 ("USB host: Move AMD PLL
quirk
> to pci-quirks.c") from the usb tree.
> 
> I just use the version from the usb tree, but this may need fixing up
in
> pci-quirks.c.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

RE: linux-next: manual merge of the usb tree with Linus' tree

[Xu, Andiry]

Hi,

I'll resend the PLL quirk moving patchset based on the latest linux-next
tree. 

Thanks & Best regards,
Andiry
 
> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Monday, February 07, 2011 12:08 PM
> To: Greg KH
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Xu,
Andiry;
> He, Alex
> Subject: linux-next: manual merge of the usb tree with Linus' tree
> 
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-pci.c between commit
> baab93afc2844b68d57b0dcca5e1d34c5d7cf411 ("USB: EHCI: ASPM quirk of
ISOC
> on AMD Hudson") from Linus' tree and commit
> b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 ("USB host: Move AMD PLL
quirk
> to pci-quirks.c") from the usb tree.
> 
> I just use the version from the usb tree, but this may need fixing up
in
> pci-quirks.c.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/

RE: linux-next: manual merge of the usb tree with Linus' tree

[Xu, Andiry]

Hi,

I just found that the patch is already in linux-next branch.

The patch "USB host: Move AMD PLL quirk to pci-quirks.c" already covers
the patch "USB: EHCI: ASPM quirk of ISOC on AMD Hudson", so with the
quirk moving patch, the EHCI ASPM patch is not needed. When I submit the
quirk moving patchset, the EHCI ASPM patch has not been merged into
linux-next. Sorry for the confliction.

Do I still need to resend the quirk moving patchset? 

Thanks & Best regards,
Andiry
 

> -----Original Message-----
> From: Xu, Andiry
> Sent: Wednesday, February 09, 2011 10:31 AM
> To: 'Stephen Rothwell'; Greg KH
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; He,
Alex;
> 'Alan Stern'
> Subject: RE: linux-next: manual merge of the usb tree with Linus' tree
> 
> Hi,
> 
> I'll resend the PLL quirk moving patchset based on the latest
linux-next
> tree.
> 
> Thanks & Best regards,
> Andiry
> 
> > -----Original Message-----
> > From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> > Sent: Monday, February 07, 2011 12:08 PM
> > To: Greg KH
> > Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Xu,
Andiry;
> > He, Alex
> > Subject: linux-next: manual merge of the usb tree with Linus' tree
> >
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/host/ehci-pci.c between commit
> > baab93afc2844b68d57b0dcca5e1d34c5d7cf411 ("USB: EHCI: ASPM quirk of
ISOC
> > on AMD Hudson") from Linus' tree and commit
> > b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 ("USB host: Move AMD PLL
quirk
> > to pci-quirks.c") from the usb tree.
> >
> > I just use the version from the usb tree, but this may need fixing
up in
> > pci-quirks.c.
> > --
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au
> > http://www.canb.auug.org.au/~sfr/

RE: linux-next: manual merge of the usb tree with Linus' tree

[Xu, Andiry]

Hi,

I just found that the patch is already in linux-next branch.

The patch "USB host: Move AMD PLL quirk to pci-quirks.c" already covers
the patch "USB: EHCI: ASPM quirk of ISOC on AMD Hudson", so with the
quirk moving patch, the EHCI ASPM patch is not needed. When I submit the
quirk moving patchset, the EHCI ASPM patch has not been merged into
linux-next. Sorry for the confliction.

Do I still need to resend the quirk moving patchset? 

Thanks & Best regards,
Andiry
 

> -----Original Message-----
> From: Xu, Andiry
> Sent: Wednesday, February 09, 2011 10:31 AM
> To: 'Stephen Rothwell'; Greg KH
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; He,
Alex;
> 'Alan Stern'
> Subject: RE: linux-next: manual merge of the usb tree with Linus' tree
> 
> Hi,
> 
> I'll resend the PLL quirk moving patchset based on the latest
linux-next
> tree.
> 
> Thanks & Best regards,
> Andiry
> 
> > -----Original Message-----
> > From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> > Sent: Monday, February 07, 2011 12:08 PM
> > To: Greg KH
> > Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Xu,
Andiry;
> > He, Alex
> > Subject: linux-next: manual merge of the usb tree with Linus' tree
> >
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/host/ehci-pci.c between commit
> > baab93afc2844b68d57b0dcca5e1d34c5d7cf411 ("USB: EHCI: ASPM quirk of
ISOC
> > on AMD Hudson") from Linus' tree and commit
> > b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 ("USB host: Move AMD PLL
quirk
> > to pci-quirks.c") from the usb tree.
> >
> > I just use the version from the usb tree, but this may need fixing
up in
> > pci-quirks.c.
> > --
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au
> > http://www.canb.auug.org.au/~sfr/

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

On Mon, Feb 07, 2011 at 03:08:02PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-pci.c between commit
> baab93afc2844b68d57b0dcca5e1d34c5d7cf411 ("USB: EHCI: ASPM quirk of ISOC
> on AMD Hudson") from Linus' tree and commit
> b7d5b439b7a40dd0a0202fe1c118615a3fcc3b25 ("USB host: Move AMD PLL quirk
> to pci-quirks.c") from the usb tree.
> 
> I just use the version from the usb tree, but this may need fixing up in
> pci-quirks.c.

I have reverted the patch in the usb-next tree, and merged with Linus's
tree, so the usb-next tree should be all good now.

Andriy, can you resend me a new version of this patch that I can apply,
as I couldn't resolve the merge issues, they were just too great.

thanks,

greg k-h

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

On Mon, Jan 21, 2013 at 01:02:19PM -0800, Greg KH wrote:
> On Mon, Jan 21, 2013 at 03:07:11PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/serial/io_ti.c between commit 1ee0a224bc9a ("USB: io_ti: Fix
> > NULL dereference in chase_port()") from Linus' tree and commit
> > f40d781554ef ("USB: io_ti: kill custom closing_wait implementation") from
> > the usb tree.
> > 
> > I fixed it up (the latter removed the code fixed by the former, so I just
> > used thet) and can carry the fix as necessary (no action is required).
> 
> Yes, that is the correct fix, thanks for this.

This should now be resolved in my trees.

thanks,

greg k-h

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

On Mon, Jan 21, 2013 at 03:07:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/io_ti.c between commit 1ee0a224bc9a ("USB: io_ti: Fix
> NULL dereference in chase_port()") from Linus' tree and commit
> f40d781554ef ("USB: io_ti: kill custom closing_wait implementation") from
> the usb tree.
> 
> I fixed it up (the latter removed the code fixed by the former, so I just
> used thet) and can carry the fix as necessary (no action is required).

Yes, that is the correct fix, thanks for this.

greg k-h

linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/io_ti.c between commit 1ee0a224bc9a ("USB: io_ti: Fix
NULL dereference in chase_port()") from Linus' tree and commit
f40d781554ef ("USB: io_ti: kill custom closing_wait implementation") from
the usb tree.

I fixed it up (the latter removed the code fixed by the former, so I just
used thet) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

Hi Greg, Felipe,

On Thu, 16 Dec 2010 10:14:29 -0800 Greg KH <greg@kroah.com> wrote:
>
> Ok, now merged and pushed out.  Stephen, there shouldn't be any merge
> errors with the next linux-next and the usb-next branches anymore.

Thanks guys.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

On Thu, Dec 16, 2010 at 09:44:18AM -0800, Greg KH wrote:
> On Thu, Dec 16, 2010 at 05:55:54PM +0200, Felipe Balbi wrote:
> > Hi,
> > 
> > On Thu, Dec 16, 2010 at 07:52:25AM -0800, Greg KH wrote:
> > >On Thu, Dec 16, 2010 at 10:45:52AM +0200, Felipe Balbi wrote:
> > >>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.
> > >
> > >So, I should do the following things:
> > >	take -rc6
> > >	revert the above commits
> > >	merge with usb-next
> > >	push out
> > >
> > >and all should be good, right?  If so, that's fine with me, I'll do it
> > 
> > Perfect, I just tried again just to be sure Merges cleanly:
> > 
> > commit 6033eb6e16e602f97ac5b6424ef71c8e464ececc
> > Merge: fa05820 0b83ae9
> > Author: Felipe Balbi <balbi@ti.com>
> > Date:   Thu Dec 16 17:55:14 2010 +0200
> > 
> >     Merge remote-tracking branch 'greg/usb-next' into linus
> 
> Great, will go do this now...

Ok, now merged and pushed out.  Stephen, there shouldn't be any merge
errors with the next linux-next and the usb-next branches anymore.

thanks,

greg k-h

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

On Thu, Dec 16, 2010 at 05:55:54PM +0200, Felipe Balbi wrote:
> Hi,
> 
> On Thu, Dec 16, 2010 at 07:52:25AM -0800, Greg KH wrote:
> >On Thu, Dec 16, 2010 at 10:45:52AM +0200, Felipe Balbi wrote:
> >>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.
> >
> >So, I should do the following things:
> >	take -rc6
> >	revert the above commits
> >	merge with usb-next
> >	push out
> >
> >and all should be good, right?  If so, that's fine with me, I'll do it
> 
> Perfect, I just tried again just to be sure Merges cleanly:
> 
> commit 6033eb6e16e602f97ac5b6424ef71c8e464ececc
> Merge: fa05820 0b83ae9
> Author: Felipe Balbi <balbi@ti.com>
> Date:   Thu Dec 16 17:55:14 2010 +0200
> 
>     Merge remote-tracking branch 'greg/usb-next' into linus

Great, will go do this now...

Re: linux-next: manual merge of the usb tree with Linus' tree

[Felipe Balbi]

Hi,

On Thu, Dec 16, 2010 at 07:52:25AM -0800, Greg KH wrote:
>On Thu, Dec 16, 2010 at 10:45:52AM +0200, Felipe Balbi wrote:
>> 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.
>
>So, I should do the following things:
>	take -rc6
>	revert the above commits
>	merge with usb-next
>	push out
>
>and all should be good, right?  If so, that's fine with me, I'll do it

Perfect, I just tried again just to be sure Merges cleanly:

commit 6033eb6e16e602f97ac5b6424ef71c8e464ececc
Merge: fa05820 0b83ae9
Author: Felipe Balbi <balbi@ti.com>
Date:   Thu Dec 16 17:55:14 2010 +0200

     Merge remote-tracking branch 'greg/usb-next' into linus

-- 
balbi

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

On Thu, Dec 16, 2010 at 10:45:52AM +0200, Felipe Balbi wrote:
> 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.

So, I should do the following things:
	take -rc6
	revert the above commits
	merge with usb-next
	push out

and all should be good, right?  If so, that's fine with me, I'll do it
today.  If not, please let me know.

thanks,

greg k-h

Re: linux-next: manual merge of the usb tree with Linus' tree

[Felipe Balbi]

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

Re: linux-next: manual merge of the usb tree with Linus' tree

[Felipe Balbi]

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.

-- 
balbi

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

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?

thanks,

greg k-h

linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 632 bytes --]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the usb tree with Linus' tree

[Felipe Balbi]

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

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

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.

thanks,

greg k-h

> diff --cc drivers/usb/musb/blackfin.c
> index fcb5206,e8cbcc5..0000000
> --- a/drivers/usb/musb/blackfin.c
> +++ b/drivers/usb/musb/blackfin.c
> @@@ -360,33 -380,6 +360,33 @@@ static void musb_platform_reg_init(stru
>   				EP2_RX_ENA | EP3_RX_ENA | EP4_RX_ENA |
>   				EP5_RX_ENA | EP6_RX_ENA | EP7_RX_ENA);
>   	SSYNC();
>  +}
>  +
> - int __init musb_platform_init(struct musb *musb, void *board_data)
> ++int __init musb_platform_init(struct musb *musb)
>  +{
>  +
>  +	/*
>  +	 * Rev 1.0 BF549 EZ-KITs require PE7 to be high for both DEVICE
>  +	 * and OTG HOST modes, while rev 1.1 and greater require PE7 to
>  +	 * be low for DEVICE mode and high for HOST mode. We set it high
>  +	 * here because we are in host mode
>  +	 */
>  +
>  +	if (gpio_request(musb->config->gpio_vrsel, "USB_VRSEL")) {
>  +		printk(KERN_ERR "Failed ro request USB_VRSEL GPIO_%d\n",
>  +			musb->config->gpio_vrsel);
>  +		return -ENODEV;
>  +	}
>  +	gpio_direction_output(musb->config->gpio_vrsel, 0);
>  +
>  +	usb_nop_xceiv_register();
>  +	musb->xceiv = otg_get_transceiver();
>  +	if (!musb->xceiv) {
>  +		gpio_free(musb->config->gpio_vrsel);
>  +		return -ENODEV;
>  +	}
>  +
>  +	musb_platform_reg_init(musb);
>   
>   	if (is_host_enabled(musb)) {
>   		musb->board_set_vbus = bfin_set_vbus;

linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/musb/blackfin.c
index fcb5206,e8cbcc5..0000000
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@@ -360,33 -380,6 +360,33 @@@ static void musb_platform_reg_init(stru
  				EP2_RX_ENA | EP3_RX_ENA | EP4_RX_ENA |
  				EP5_RX_ENA | EP6_RX_ENA | EP7_RX_ENA);
  	SSYNC();
 +}
 +
- int __init musb_platform_init(struct musb *musb, void *board_data)
++int __init musb_platform_init(struct musb *musb)
 +{
 +
 +	/*
 +	 * Rev 1.0 BF549 EZ-KITs require PE7 to be high for both DEVICE
 +	 * and OTG HOST modes, while rev 1.1 and greater require PE7 to
 +	 * be low for DEVICE mode and high for HOST mode. We set it high
 +	 * here because we are in host mode
 +	 */
 +
 +	if (gpio_request(musb->config->gpio_vrsel, "USB_VRSEL")) {
 +		printk(KERN_ERR "Failed ro request USB_VRSEL GPIO_%d\n",
 +			musb->config->gpio_vrsel);
 +		return -ENODEV;
 +	}
 +	gpio_direction_output(musb->config->gpio_vrsel, 0);
 +
 +	usb_nop_xceiv_register();
 +	musb->xceiv = otg_get_transceiver();
 +	if (!musb->xceiv) {
 +		gpio_free(musb->config->gpio_vrsel);
 +		return -ENODEV;
 +	}
 +
 +	musb_platform_reg_init(musb);
  
  	if (is_host_enabled(musb)) {
  		musb->board_set_vbus = bfin_set_vbus;

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

On Thu, Aug 05, 2010 at 12:35:29PM +0200, Michał Nazarewicz wrote:
> On Thu, 05 Aug 2010 12:17:05 +0200, Jiri Kosina <jkosina@suse.cz> wrote:
> 
> >On Thu, 5 Aug 2010, Stephen Rothwell wrote:
> >
> >>Today's linux-next merge of the usb tree got a conflict in
> >>Documentation/usb/linux.inf between commit
> >>0ea6e61122196509af82cc4f36cbdaacbefb8227 ("Documentation: update broken
> >>web addresses") from Linus' tree and commit
> >>2e73ce9389be011587a0ca581b6798b135e64807 ("USB: gadget: g_ether: updated
> >>INF file") from the usb tree.
> >>
> >>The URL that was fixed by the former was removed by the latter, so I just
> >>used the latter version.
> >
> >I see. Greg, will you just rebase the patch in USB tree on top of current
> >Linus' tree please?
> 
> It should be enough to add this delta to the "USB: gadget: g_ether: updated
> INF file":
> 
> -;   http://www.microsoft.com/whdc/hwdev/resources/HWservices/rndis.mspx
> +;   http://www.microsoft.com/whdc/device/network/ndis/rmndis.mspx

I've fixed this up in my tree now.

thanks,

greg k-h

Re: linux-next: manual merge of the usb tree with Linus' tree

[Michał Nazarewicz]

On Thu, 05 Aug 2010 12:17:05 +0200, Jiri Kosina <jkosina@suse.cz> wrote:

> On Thu, 5 Aug 2010, Stephen Rothwell wrote:
>
>> Today's linux-next merge of the usb tree got a conflict in
>> Documentation/usb/linux.inf between commit
>> 0ea6e61122196509af82cc4f36cbdaacbefb8227 ("Documentation: update broken
>> web addresses") from Linus' tree and commit
>> 2e73ce9389be011587a0ca581b6798b135e64807 ("USB: gadget: g_ether: updated
>> INF file") from the usb tree.
>>
>> The URL that was fixed by the former was removed by the latter, so I just
>> used the latter version.
>
> I see. Greg, will you just rebase the patch in USB tree on top of current
> Linus' tree please?

It should be enough to add this delta to the "USB: gadget: g_ether: updated
INF file":

-;   http://www.microsoft.com/whdc/hwdev/resources/HWservices/rndis.mspx
+;   http://www.microsoft.com/whdc/device/network/ndis/rmndis.mspx

-- 
Best regards,                                        _     _
| Humble Liege of Serenely Enlightened Majesty of  o' \,=./ `o
| Computer Science,  Michał "mina86" Nazarewicz       (o o)
+----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--

Re: linux-next: manual merge of the usb tree with Linus' tree

[Jiri Kosina]

On Thu, 5 Aug 2010, Stephen Rothwell wrote:

> Today's linux-next merge of the usb tree got a conflict in
> Documentation/usb/linux.inf between commit
> 0ea6e61122196509af82cc4f36cbdaacbefb8227 ("Documentation: update broken
> web addresses") from Linus' tree and commit
> 2e73ce9389be011587a0ca581b6798b135e64807 ("USB: gadget: g_ether: updated
> INF file") from the usb tree.
> 
> The URL that was fixed by the former was removed by the latter, so I just
> used the latter version.

I see. Greg, will you just rebase the patch in USB tree on top of current 
Linus' tree please?

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

Re: linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

Hi Greg,

On Wed, 23 Dec 2009 15:38:56 -0800 Greg KH <greg@kroah.com> wrote:
>
> Thanks, I fixed this up already in my tree and will resync in a few
> hours.

Thanks.  No hurry ("Christmas is coming" :-))

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

On Thu, Dec 24, 2009 at 09:30:36AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/serial/generic.c between commit
> 119eecc831a42bd090543568932e440c6831f1bb ("Fix usb_serial_probe() problem
> introduced by the recent kfifo changes") from Linus' tree and commit
> 40b2ba0dfb62bed0f7cc6f699053d18ca4553e91 ("USB: serial: mct_usb232: add
> drain on close") from the usb tree.
> 
> I fixed it up (see below) and can carry the fix for a while.  The result
> needs checking.

Thanks, I fixed this up already in my tree and will resync in a few
hours.

greg k-h

linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/generic.c between commit
119eecc831a42bd090543568932e440c6831f1bb ("Fix usb_serial_probe() problem
introduced by the recent kfifo changes") from Linus' tree and commit
40b2ba0dfb62bed0f7cc6f699053d18ca4553e91 ("USB: serial: mct_usb232: add
drain on close") from the usb tree.

I fixed it up (see below) and can carry the fix for a while.  The result
needs checking.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/usb/serial/generic.c
index f1ea3a3,3eea1d8..0000000
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@@ -386,12 -386,15 +386,15 @@@ int usb_serial_generic_chars_in_buffer(
  
  	dbg("%s - port %d", __func__, port->number);
  
+ 	spin_lock_irqsave(&port->lock, flags);
  	if (serial->type->max_in_flight_urbs) {
- 		spin_lock_irqsave(&port->lock, flags);
  		chars = port->tx_bytes_flight;
- 		spin_unlock_irqrestore(&port->lock, flags);
- 	} else if (serial->num_bulk_out)
+ 	} else if (serial->num_bulk_out) {
+ 		/* This overcounts badly, but is good enough for drain wait. */
 -		chars = __kfifo_len(port->write_fifo);
 +		chars = kfifo_len(&port->write_fifo);
+ 		chars += port->write_urb_busy * port->bulk_out_size;
+ 	}
+ 	spin_unlock_irqrestore(&port->lock, flags);
  
  	dbg("%s - returns %d", __func__, chars);
  	return chars;

Re: linux-next: manual merge of the usb tree with Linus' tree

[Greg KH]

On Wed, Sep 23, 2009 at 10:50:26PM +1000, Stephen Rothwell wrote:
> Hi Jason,
> 
> On Wed, 23 Sep 2009 07:38:23 -0500 Jason Wessel <jason.wessel@windriver.com> wrote:
> >
> > Please, let me know if there is something I need to do here.
> > 
> > Simply changing the context of the patch in Greg's branch should be
> > enough.   There are many more fixes beyond just the timing loop in the
> > dbgp series which cover, cold and warm restarts and various errata with
> > the ehci debug controllers.
> 
> Yeah, I think Greg just needs to rebase his series on to a more recent
> version of Linus' tree.  (and then test and submit it, of course :-))

It was a simple merge, I've now refreshed my tree with this change
locally, and will push it out in a bit.

thanks,

greg k-h

Re: linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 674 bytes --]

Hi Jason,

On Wed, 23 Sep 2009 07:38:23 -0500 Jason Wessel <jason.wessel@windriver.com> wrote:
>
> Please, let me know if there is something I need to do here.
> 
> Simply changing the context of the patch in Greg's branch should be
> enough.   There are many more fixes beyond just the timing loop in the
> dbgp series which cover, cold and warm restarts and various errata with
> the ehci debug controllers.

Yeah, I think Greg just needs to rebase his series on to a more recent
version of Linus' tree.  (and then test and submit it, of course :-))

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the usb tree with Linus' tree

[Jason Wessel]

Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/x86/kernel/early_printk.c between commit
> 414128bd33fef3242747154dfa444970bc5caf4c ("x86: Increase timeout for EHCI
> debug port reset completion in early printk") from Linus' tree and commit
> bd965307ef6b7a56219f8883d5038f6573a94f6e ("USB: ehci,dbgp,early_printk:
> split ehci debug driver from early_printk.c") from the usb tree.
>
> The latter moved the code that the former modified.  A later USB patch
> used an even longer loop delay.
>
>   
Please, let me know if there is something I need to do here.

Simply changing the context of the patch in Greg's branch should be
enough.   There are many more fixes beyond just the timing loop in the
dbgp series which cover, cold and warm restarts and various errata with
the ehci debug controllers.

Hopefully we can get the dbgp series merged soon because this particular
errata was fixed several months ago.  :-)

Thanks,
Jason.

linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 624 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/x86/kernel/early_printk.c between commit
414128bd33fef3242747154dfa444970bc5caf4c ("x86: Increase timeout for EHCI
debug port reset completion in early printk") from Linus' tree and commit
bd965307ef6b7a56219f8883d5038f6573a94f6e ("USB: ehci,dbgp,early_printk:
split ehci debug driver from early_printk.c") from the usb tree.

The latter moved the code that the former modified.  A later USB patch
used an even longer loop delay.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]