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 <xiong.y.zhang at intel.com> > 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 <ben at bwidawsk.net> 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
