Hi Heiko, Oh sure, no problem. It was just to understand better how things will happen ;) If my patches needs to be rebased, will do, of course. Have a nice day, Romain 2014-10-17 8:06 GMT+02:00 Heiko Stübner <heiko@xxxxxxxxx>: > Hi Romain, > > Am Freitag, 17. Oktober 2014, 08:01:31 schrieb PERIER Romain: >> 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 ? > > The single dts patch will be going into my dts branch and the rest will go > through Mark's regulator tree. As Mark said, he'll try to apply these again > once 3.18-rc1 is released and if it still doesn't apply then, he'll probably > ask you to rebase them onto the regulator tree [which will at the time include > everything that is in -rc1]. > > > Heiko > > > >> 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
