Hello Lee,
On Fri, Feb 15, 2013 at 12:44:30PM +0000, Lee Jones wrote:
> This is the 3rd and final instalment of the push to synchronise
> the ABx500 Battery Management series of internal development patches
> due for Mainline.
>
> This patch-set submission is for reviewing purposes only. Please
> don't apply patches directly from this patch-set, as there are some
> interdependencies with another patch-set due for the MFD tree. We
> can chat about how to over-come this at a later date.
It looks so much better than the initial series! Frankly, I couldn't find
anything utterly wrong with it. :-) (I did notice a couple of cosmetic
issues, but considering the amount of work and patches needed rebasing, it
would be insane of me to ask fixing these. :-)
So, I can easily merge it, as long as MFD part is either Acked or handled
somehow else. But I do want to merge the drivers/power/ part via battery
tree -- the part is quite large and thus prone to conflicts if someone
asks me to merge a patch that would touch the same lines.
Thanks so much!
Anton
Hi Anton,
On Sat, Mar 02, 2013 at 03:33:35PM -0800, Anton Vorontsov wrote:
> Hello Lee,
>
> On Fri, Feb 15, 2013 at 12:44:30PM +0000, Lee Jones wrote:
> > This is the 3rd and final instalment of the push to synchronise
> > the ABx500 Battery Management series of internal development patches
> > due for Mainline.
> >
> > This patch-set submission is for reviewing purposes only. Please
> > don't apply patches directly from this patch-set, as there are some
> > interdependencies with another patch-set due for the MFD tree. We
> > can chat about how to over-come this at a later date.
>
> It looks so much better than the initial series! Frankly, I couldn't find
> anything utterly wrong with it. :-) (I did notice a couple of cosmetic
> issues, but considering the amount of work and patches needed rebasing, it
> would be insane of me to ask fixing these. :-)
>
> So, I can easily merge it, as long as MFD part is either Acked or handled
> somehow else.
I can Ack the MFD parts, they look good to me. And then you can take the whole
thing through your tree, but I'd prefer you to do so by pulling the branch Lee
prepared for us. I want to avoid conflicts this way.
> But I do want to merge the drivers/power/ part via battery
> tree -- the part is quite large and thus prone to conflicts if someone
> asks me to merge a patch that would touch the same lines.
Certainly. I will only take the MFD parts of it through Lee's branch.
Conflicts will be avoided this way.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
On Mon, Mar 04, 2013 at 11:08:24AM +0100, Samuel Ortiz wrote:
[...]
> > So, I can easily merge it, as long as MFD part is either Acked or handled
> > somehow else.
> I can Ack the MFD parts, they look good to me. And then you can take the whole
> thing through your tree, but I'd prefer you to do so by pulling the branch Lee
> prepared for us. I want to avoid conflicts this way.
Sure, that works for me.
Thanks,
Anton