* Benoit Cousson <b-cousson@xxxxxx> [130408 05:11]: > Hi Tony, > > On 04/05/2013 05:43 PM, Tony Lindgren wrote: > > * Benoit Cousson <b-cousson@xxxxxx> [130405 03:00]: > >> On 04/05/2013 10:30 AM, Benoit Cousson wrote: > >> > >> ... > >> > >>>> ARM: dts: OMAP4: Add HS USB Host IP nodes > >>>> ARM: dts: OMAP3: Add HS USB Host IP nodes > >>>> ARM: dts: omap3-beagle: Add USB Host support > >>> > >>> These 3 DTS patches are good to me, but I cannot applied them on top of > >>> the already existing patches I queued for 3.10. > >>> > >>> git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git > >>> for_3.10/dts > >>> > >>> Could you rebase these 3 ones only, and I will applied them. > >> > >> Mmm, in fact, I've just seen the pull request from Tony :-( > >> > >> > >> Tony, > >> > >> Don't you want to remove these DTS patches from the pull-request? > > > > Oops sorry :( Looks like I applied them mistakenly as I saved all > > the patches into a mbox, then applied it. Anyways, too late to start > > messing with it now. > > > >> Otherwise, I will have to rebase the whole DTS series on top of yours. > >> That being said, if the branch is not supposed to be rebased, it is doable. > > > > I pulled in your for_3.10/dts for testing, and to me it looks like > > it's just overlapping additions. So that should be OK to resolve while > > pulling it in. > > > > It seems there's no need to add omap-for-v3.10/usb as a dependency for > > your for_3.10/dts unless the conflict gets non-trivial with some > > additional patches. > > The branch was not complete, with the latest additions, we do have > conflict due to the addition of several new nodes at the same place. OK > The resolution is not that hard since it is addition of node only, but > the rebase on to of omap-for-v3.10/usb will avoid the issue. > > I have a new pre-merged branch available. for_3.10/dts_merged is based > on omap-for-v3.10/usb and Paul's omap-devel-b-for-3.10 branch to get the > AM33xx hwmod. > Paul's branch is just needed to avoid AM33xx regression introduced by > Santosh hwmod changes present in my branch. > > Just let me know which one you will prefer to pull. If the merge conflicts are non-trivial, then let's do the pre-merged branch. That will be easier to test also in this case for am33xx. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
