Dear Troy Kisky, > On 9/26/2013 9:18 AM, Stefano Babic wrote: > > Hi Troy, Marek, > > > > On 26/09/2013 03:41, Troy Kisky wrote: > >> Stefano, if you would you like to take the last 3 patches, > >> you should apply "i.MX6Q/DLS: Add MX6_PAD_GPIO_1__USB_OTG_ID" > >> from Eric Nelson first. > > > > Eric's patch is already in my queue, I will apply it. > > > >> The patches are mostly independent, so if a patch has > >> an issue, please feel free to skip it. > >> An exception is 1/17 should be before 2/17 if Stefano's branch merges > >> upstream first, otherwise nitrogen6x will get a build error. > > > > Maybe it is better if we agree who merge the patchset to avoid breaking > > the boards (Nitrogen). Mostly the patchset is Marek's stuff, and I have > > nothing again if Marek will apply also the i.MX relevant parts. It is > > better to merge this patchset at whole in the same tree as to split it. > > > > Marek, do you agree ? > > > > Regards, > > Stefano > > Then Marek would need Eric's patch, unless a temporary build error is > acceptable.
This will go to -next anyway, so if Stefano can pick this OTG_ID mux patch into master and push it out into current MW, there will be no problem at all. I'll pick the whole thing otherwise but only AFTER I reviewed it properly. Best regards, Marek Vasut _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
