On Tue, Mar 3, 2009 at 5:29 PM, Janne Grunau <j@xxxxxxxxxx> wrote:
> On Tuesday 03 March 2009 22:18:55 Hans Verkuil wrote:
>> On Tuesday 03 March 2009 13:50:30 Brandon Jenkins wrote:
>> > Hello all,
>> >
>> > I was upgrading drivers this morning to capture the latest changes
>> > for the cx18 and I received a merge conflict in v4l2-common.c. In
>> > my system, 1 HDPVR and 3 CX18s. The HDPVR sources are 5 weeks old
>> > from their last sync up but contain:
>> >
>> > case V4L2_CID_SHARPNESS:
>> >
>> > The newer sources do not, but still have reference to sharpness at
>> > line 420: case V4L2_CID_SHARPNESS: return
>> > "Sharpness";
>> >
>> > Because I don't know which way the code is going (is sharpness in
>> > or out) I can't submit a patch, but thought I would raise here.
>> > Diff below was pulled from clean clone of v4l-dvb tree.
>>
>> Sharpness is definitely in. This is a bug, please submit this patch
>> with a Signed-off-by line and I'll get it merged.
>
> It is and afaik was never handled in v4l2_ctrl_query_fill(), the hdpvr
> tree adds that. Since I intend request the merge of the driver in a
> couple of days a seperate patch shouldn't be needed.
>
> janne
>
This is interesting to me. I attempted to merge from a clean clone and
pull this morning. The only file which failed was v4l2-common.c.
Here's the fail marker:
<<<<<<< local
case V4L2_CID_SHARPNESS:
=======
case V4L2_CID_RED_BALANCE:
case V4L2_CID_BLUE_BALANCE:
case V4L2_CID_GAMMA:
>>>>>>> other
To produce this I did this from a clean start this morning:
hg clone http://hg.jannau.net/hdpvr/
cd hdpvr
hg pull http://linuxtv.org/hg/v4l-dvb/
hg merge
hg commit
I did the very same thing last week as well without a fail.
Brandon
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
