On 09/09/2013 01:43 PM, Koen Kooi wrote: > > Op 9 sep. 2013, om 20:27 heeft Joel Fernandes <jo...@ti.com> het volgende > geschreven: > >> On 09/09/2013 10:51 AM, Koen Kooi wrote: >>> >>> Op 9 sep. 2013, om 17:23 heeft Kevin Hilman <khil...@linaro.org> het >>> volgende geschreven: >>> >>>> Koen Kooi <k...@dominion.thruhere.net> writes: >>>> >>>>> The BeagleBone Black is basically a regular BeagleBone with eMMC and HDMI >>>>> added, >>>>> so create a common dtsi both can use. >>>>> >>>>> IMPORTANT: booting the existing am335x-bone.dts will blow up the HDMI >>>>> transceiver >>>>> after a dozen boots with an uSD card inserted because LDO will be at 3.3V >>>>> instead >>>>> of 1.8. >>>>> >>>>> MMC support for AM335x still isn't in, so only the LDO change has been >>>>> added. >>>>> >>>>> Cc: sta...@vger.kernel.org >>>>> >>>>> Signed-off-by: Koen Kooi <k...@dominion.thruhere.net> >>>>> Tested-by: Tom Rini <tr...@ti.com> >>>>> Tested-by: Matt Porter <matt.por...@linaro.org> >>>> >>>> I guess the subject should've included v5? >>> >>> Yes, I blame it on being monday :) >> >> The series you're posting will require rebasing on the current MMC DT series >> that is being discussed last couple of weeks on the mailing list which were >> waiting until now as DMA support was missing. Now that DMA support is pulled >> in, >> it is safe to apply those patches so I will be reposting them shortly. >> >> Please hold off any changes until those patches are posted. This will avoid >> unnecessary conflicts. > > Or you can rebase on top of this patch since it has no dependencies *and* > fixes blowing up boards. FWIW, git-rebase, git-cherry-pick and git-am -3 > track the rename in my patch just fine. >
That's fair enough, since Kevin Acked and Benoit is pulling it, I'm fine with rebasing on top of it and we avoid any merge conflicts. Regards, -Joel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/