On 11/07/11 22:31, Tony Lindgren wrote:
> * Igor Grinberg <grinberg@xxxxxxxxxxxxxx> [111106 04:45]:
>> Hi Tony,
>>
>> On 11/05/11 01:57, Tony Lindgren wrote:
>>> * Tony Lindgren <tony@xxxxxxxxxxx> [111104 16:05]:
>>>> * Igor Grinberg <grinberg@xxxxxxxxxxxxxx> [111019 02:05]:
>>>>
>>>> Applying to board branch for v3.3 merge window.
>>>
>>> Hmm, actually I suggest you respin patches 2 and 3 so they apply
>>> on their own to current fixes branch. Then update 1 and 4 to
>>> apply on top of those.
>>>
>>> This way we can apply 2 and 3 during the -rc cycle, and then
>>> queue 1 and 4 for the next merge window.
>>
>> Well, actually all them are fixes, although it cannot be understood
>> from the subject.
>> I will adjust the subjects (and may be the commit messages also)
>> to be more specific and resend.
>
> Hmm 1 & 4 are "features that never worked" type fixes, so they
> have flame potential. Those have to wait for the next merge window.
Not exactly:
1/4 is a fix that I should have submitted more than a year ago,
just after the ads7846 got support for the regulators:
---------
commit 91143379b01b2020d8878d627ebe9dfb9d6eb4c8
Author: Grazvydas Ignotas <notasas@xxxxxxxxx>
Date: Thu Feb 25 02:04:56 2010 -0800
Input: ads7846 - add regulator support
The ADS7846/TSC2046 touchscreen controllers can (and usually are)
connected to various regulators for power, so add regulator support.
Valid regulator will now be required, so boards without complete
regulator setup should either disable regulator framework or enable
CONFIG_REGULATOR_DUMMY.
Signed-off-by: Grazvydas Ignotas <notasas@xxxxxxxxx>
Acked-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
---------
4/4 is a functionality fix, that also should have been submitted
some time ago. We had this one locally and finally I've sent it out.
With out it, the USB hub sometimes works, but not always.
I've came back to that issue while working on CM-T3730 and
finally sent it.
So now, when I'm sure you have all the information,
what will it be?
If you still think it should be split up - that's fine with me,
I will do the thing and resend.
Otherwise, what about the v2 I've sent?
>
> Patches 2 & 3 could be justified as fixes during the -rc cycle.
So here we have no doubt. Good.
>
> Or I can just apply all of them into board branch to wait for the
> next merge window.
That can be an option, if it bothers you too much,
but I prefer to have this already in 3.2.
Thanks
--
Regards,
Igor.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
