<div class="gmail_quote">On Thu, Sep 15, 2011 at 22:37, Keith Packard <span dir="ltr"><<a href="mailto:keithp@keithp.com" target="_blank">keithp@keithp.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
I've got this nice patch from Akshay Joshi that removes almost all of<br>
the <a href="http://checkpatch.pl" target="_blank">checkpatch.pl</a> warnings from drm/i915. If I don't merge it now, it's<br>
going to go stale and be useless; if I merge it only to drm-intel-next,<br>
it will be the source of endless conflicts.<br>
<br>
However, it's a huge patch (yes, the code was rather sloppy), and<br>
doesn't exactly fit into the "critical patches only please" mode of the<br>
current stage of 3.1 development.<br>
<br>
I've checked the patch very carefully, using the obvious git diff -b to<br>
make sure it really doesn't touch anything but whitespace, but also<br>
using objdump -s to compare the output of the compiler. There were no<br>
differences found with git-diff -b. The only differences found by<br>
objdump are two whitespace changes in some debug output messages in<br>
intel_bios.c.<br>
<br>
I think I have three choices:<br>
<br>
1) merge the patch and expect complaints from upstream<br>
<br>
2) thank Akshay for his good intentions, discard the patch and hope<br>
that he feels motivated enough to do it all over again in time for<br>
the 3.2 merge window.<br>
<br>
3) thank Akshay for his good intentions and leave the code as-is,<br>
forever to ease back-porting of fixes to older kernel versions.<br>
<br>
Frankly, if we're ever going to merge whitespace fixups, this would be a<br>
pretty darn good time; drm-intel-fixes and drm-intel-next are in-sync as<br>
I haven't started pulling 3.2 code into -next.<br></blockquote><div><br></div><div>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.</div>
<div><br></div><div>So Iīd vote for option 1, and then 3, in this order.</div><div><br></div></div>-- <br>Eugeni Dodonov<a href="http://eugeni.dodonov.net/" target="_blank"><br></a><br>