Re: Fwd: [PATCH] bq27x00_battery: Some fixes

[Pali RohÃr]

2011/1/31 Lars-Peter Clausen <lars@xxxxxxxxxx>:
> On 01/31/2011 07:27 PM, Anton Vorontsov wrote:
>> On Mon, Jan 31, 2011 at 07:15:06PM +0100, Lars-Peter Clausen wrote:
>>> On 01/31/2011 02:54 PM, Anton Vorontsov wrote:
>>>> The same is for this patch.
>>>>
>>>> Comments, Reviewed-by or Acked-by?
>>>>
>>>> p.s. FWIW, I already asked Pali to factor out bq27x00_battery_time()
>>>> Â Â Âfix to a separate patch.
>>>>
>>>
>>> Hi
>>>
>>> I have a larger series pending which adds support for the bq27000 chip and polling to
>>> the bq27x00 driver. Since this series does some refactoring of the bq27x00 driver, it
>>> might make sense to rebase this (and the other) patch ontop of that series instead of
>>> the other way around.
>>
>> Pali was first to send out his work, so I think that it would make
>> sense to ask you to rebase your work on top. Especially since Pali's
>> patches were somewhat reviewed already.
>
> I suspect it to be substantial more work to rebase mine on top of his. That's why I'm
> asking for a exception in this case. I would be willing to adjust his patches, so
> they can be applied on top of mine.
>
>>
>> I hope Pali will resend the fixed versions quickly enough so
>> that I'll apply the patches asap and you'll easily use git
>> for rebasing.
>>
>
> git won't help in this case, because my patches basically rewrite the parts changed
> by Palis patches. It would be one merge conflict after another, I guess.
>
>> Thanks!
>>
>
>

Can you then merge my changes with your in git?

-- 
Pali RohÃr
pali.rohar@xxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/