Re: Whitespace cleanups in drm/i915

From: Akshay Joshi
Date: Wed Sep 21 2011 - 16:56:21 EST


On Sat, Sep 17, 2011 at 4:17 PM, Eugeni Dodonov <eugeni@xxxxxxxxxxx> wrote:
> On Thu, Sep 15, 2011 at 22:37, Keith Packard <keithp@xxxxxxxxxx> wrote:
>>
>> I've got this nice patch from Akshay Joshi that removes almost all of
>> the checkpatch.pl warnings from drm/i915. If I don't merge it now, it's
>> going to go stale and be useless; if I merge it only to drm-intel-next,
>> it will be the source of endless conflicts.
>>
>> However, it's a huge patch (yes, the code was rather sloppy), and
>> doesn't exactly fit into the "critical patches only please" mode of the
>> current stage of 3.1 development.
>>
>> I've checked the patch very carefully, using the obvious git diff -b to
>> make sure it really doesn't touch anything but whitespace, but also
>> using objdump -s to compare the output of the compiler. There were no
>> differences found with git-diff -b. The only differences found by
>> objdump are two whitespace changes in some debug output messages in
>> intel_bios.c.
>>
>> I think I have three choices:
>>
>> Â1) merge the patch and expect complaints from upstream
>>
>> Â2) thank Akshay for his good intentions, discard the patch and hope
>> Â Âthat he feels motivated enough to do it all over again in time for
>> Â Âthe 3.2 merge window.
>>
>> Â3) thank Akshay for his good intentions and leave the code as-is,
>> Â Âforever to ease back-porting of fixes to older kernel versions.
>>
>> Frankly, if we're ever going to merge whitespace fixups, this would be a
>> pretty darn good time; drm-intel-fixes and drm-intel-next are in-sync as
>> I haven't started pulling 3.2 code into -next.
>
> I think that if we donÂt get to push this patch now, we are unlikely to do
> it in nearby future. And such kind of cleanup is a nice thing to have.
> So IÂd vote for option 1, and then 3, in this order.
> --
> Eugeni Dodonov
>
>

Have we reached a consensus on this? Just curious.

Akshay
--
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/