From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Whitespace fix in gen6_ppgtt_init Date: Sat, 4 May 2013 10:40:36 +0200 Message-ID: <20130504084036.GR5763@phenom.ffwll.local> References: <1367626379-1525-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 8729DE5CD6 for ; Sat, 4 May 2013 01:37:31 -0700 (PDT) Received: by mail-wi0-f173.google.com with SMTP id ey16so1250558wid.12 for ; Sat, 04 May 2013 01:37:30 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1367626379-1525-1-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, May 03, 2013 at 05:12:59PM -0700, Ben Widawsky wrote: > When the recent pde calculation was fixed in: > commit 43b27290dd42b40f3f23f49677a7faa5a4eb1eff > Author: Zhang, Xiong Y > Date: Sat Apr 27 09:53:33 2013 +0000 > > drm/i915: correct the calculation of first_pd_entry_in_global_pt > > It had whitespace errors which I thought Daniel caught and fixed on > merge, but I still see it here on -nightly. > > Signed-off-by: Ben Widawsky git seems to be doing something funny when merging dinq and -fixes. It's not really a rerere mismatch, since I've killed that and re-resolved the conflicts. Anyway, I've used your patch to fix up the -nightly merge for now and will use it once I'll do an official backmerge. Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch