* Benoit Cousson <bcousson@xxxxxxxxxxxx> [131011 12:13]: > Hi Tony, > > On 11/10/2013 20:03, Tony Lindgren wrote: > >Hi Benoit, > > > >* Benoit Cousson <bcousson@xxxxxxxxxxxx> [131011 09:50]: > >>Add the minimal DTS support for DRA7xx based SoC core. > >>Add the initial support for N900 and gta04 phones. > >>Enable USB3 on OMAP5 evm board. > >>Add support for cryto accelerators > >>Add new IGEP AQUILA board > >>Add AM33XX EDMA support > >>Update HSUSB node to use the reset-gpios fmwk > > > >Looks good to me, but we're getting self-inflicted merge > >conflicts in two places now with Paul's hwmod changes, > >and my defconfig changes. > > Damn! :) > >Can you please respin without the following two patches: > > > >49bcd824c1c0db32fe4de0c1ba3ee36defdb11ca ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies > >736c4bb159c793b00331261438deb982cbac3c03 ARM: OMAP5: hwmod: add missing ocp2scp hwmod data > > > >I can pick the two patches above and apply after pulling in > >Paul's branch first. > > OK, no problem. > > > > >However, if other branches are based on this, then we just > >need to deal with the merge conflicts, and there's no point > >in redoing your branch. > > Considering the patches, I don't see any dependency with the other > ones, as soon as they are pulled before the DTS changes. > > I'll do that ASAP and repost. OK thanks! I'll cherry pick the above two commits then. 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
