public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Keith Packard" <keithp@keithp.com>
To: airlied@gmail.com, Akshay Joshi <me@akshayjoshi.com>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
	dri-devel@lists.freedesktop.org
Subject: Whitespace cleanups in drm/i915
Date: Thu, 15 Sep 2011 18:37:33 -0700	[thread overview]
Message-ID: <yun8vppw9lu.fsf@aiko.keithp.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]


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.

-- 
keith.packard@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

             reply	other threads:[~2011-09-16  3:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-16  1:37 Keith Packard [this message]
2011-09-16 14:31 ` Whitespace cleanups in drm/i915 Daniel Vetter
2011-09-17  1:01 ` Ben Widawsky
     [not found] ` <CAC7LmnuOieBzq=833UOjbdPfdjQaHWou_keu0_coZ-KCFJ2kaw@mail.gmail.com>
2011-09-21 20:56   ` Akshay Joshi
2011-09-21 22:20     ` Keith Packard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=yun8vppw9lu.fsf@aiko.keithp.com \
    --to=keithp@keithp.com \
    --cc=airlied@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=me@akshayjoshi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox