Hi all, I am just curious but where do you plan to merge this serie ? in git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git ? You have conflicts because I use linux-next as base repository. Thanks for your feebacks (all of you). Romain 2014-10-15 16:03 GMT+02:00 Mark Brown <broonie@xxxxxxxxxx>: > On Wed, Oct 15, 2014 at 03:56:03PM +0200, Heiko Stübner wrote: >> Am Mittwoch, 15. Oktober 2014, 15:42:45 schrieb Mark Brown: > >> > I guess I should apply these (except the DTS update) since the first >> > user that's being added is a regulator driver? > >> I'd think so. >> In any case, I'll take the "ARM: dts: ..." patch if you take the others. > > Sounds like a plan. I just tried applying and got some conflicts but > I'm guessing that this is due to changes that are landing in the merge > window so I'll try again once -rc1 is out. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
