On Tue, 2013-04-09 at 10:22 -0400, Josh Boyer wrote: > On Tue, Apr 09, 2013 at 05:12:18PM +0300, Jani Nikula wrote: > > On Tue, 09 Apr 2013, Josh Boyer <jwboyer@xxxxxxxxxx> wrote: > > > Upstream commit 01e3a8feb40e54b962a20fa7eb595c5efef5e109 > > > > This patch seems to be the above commit and > > > > commit 1ffff60320879830e469e26062c18f75236822ba > > Author: Jani Nikula <jani.nikula@xxxxxxxxx> > > Date: Tue Jan 22 12:50:34 2013 +0200 > > > > drm/i915: add quirk to invert brightness on eMachines G725 > > > > squashed together. There's a separate bug for that too: > > https://bugs.freedesktop.org/show_bug.cgi?id=59628 > > Oh... that actually does seem to be the case. I did a cherry-pick > of just the commit I mentioned on top of 3.8.6 and it seems I resolved > the conflict by including in changes for both. The conflict came up as: > > <<<<<<< HEAD > /* Acer Aspire 4736Z */ > { 0x2a42, 0x1025, 0x0260, quirk_invert_brightness }, > ======= > /* Acer/eMachines G725 */ > { 0x2a42, 0x1025, 0x0210, quirk_invert_brightness }, > > /* Acer/eMachines e725 */ > { 0x2a42, 0x1025, 0x0212, quirk_invert_brightness }, > >>>>>>> 01e3a8f... drm/i915: add quirk to invert brightness on eMachines e725 > > Thanks for catching that. > > > I think both are okay for stable, but by the stable rules you should > > probably split this up, with the appropriate upstream references in > > both. Or do whatever the stable team tells you to do. ;) > > Yeah. I'm happy to split them up and send them out separately. Or if > Greg wants to just list both upstream commit IDs with a single backport, > that would also be fine. I cherry-picked the following series for Debian: [pre-3.8] 7bd90909bbf9 drm/i915: panel: invert brightness via parameter 4dca20efb1a9 drm/i915: panel: invert brightness via quirk 5a15ab5b93e4 drm/i915: panel: invert brightness acer aspire 5734z 5f85f176c2f1 DRM/i915: Add QUIRK_INVERT_BRIGHTNESS for NCR machines. [post-3.8] 1ffff6032087 drm/i915: add quirk to invert brightness on eMachines G725 01e3a8feb40e drm/i915: add quirk to invert brightness on eMachines e725 5559ecadad5a drm/i915: add quirk to invert brightness on Packard Bell NCL20 Should these all be applied to the various 3.x.y stable branches? Ben. -- Ben Hutchings The program is absolutely right; therefore, the computer must be wrong.
Attachment:
signature.asc
Description: This is a digitally signed message part