On Wed, Feb 3, 2010 at 3:50 PM, Stefan Ringel <stefan.ringel@xxxxxxxx> wrote:
> Am 03.02.2010 21:25, schrieb Mauro Carvalho Chehab:
>> This one is a very obscure patch. What are you doing this patch and why?
>>
>> Stefan Ringel wrote:
>>
>>> signed-off-by: Stefan Ringel <stefan.ringel@xxxxxxxx>
>>>
>>> --- a/drivers/staging/tm6000/tm6000.h
>>> +++ b/drivers/staging/tm6000/tm6000.h
>>> @@ -90,12 +97,14 @@ enum tm6000_core_state {
>>> DEV_MISCONFIGURED = 0x04,
>>> };
>>>
>>> +#if 1
>>> /* io methods */
>>> enum tm6000_io_method {
>>> IO_NONE,
>>> IO_READ,
>>> IO_MMAP,
>>> };
>>> +#endif
>>>
>>>
> ? different between git and hg ? not mine
Stefan,
The patches *you submitted* included this "#if 1". Regardless of
whether it's differences between git and hg or some other weird merge
bug, you are responsible for the patches you submit. You should be
reviewing each patch before sending it, and if it contains things you
do not understand why they are there, then you need to resolve those
inconsistencies before submitting the patch.
Reviewing each patch individually before sending also helps avoid
avoid things like submitting patches which make arbitrary/unnecessary
whitespace changes.
Devin
--
Devin J. Heitmueller - Kernel Labs
http://www.kernellabs.com
--
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
