[Intel-gfx] Chris Wilson <chris at chris-wilson.co.uk>

[Peter Clifton]

Non-fastforward of drm-intel-next

Hi Chris,

I was looking at logs of the drm-intel-next branch, and noted that one
of the commits:

commit b5dc608c98d929abbf2fe932ed07b3c868d83342
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 20 20:59:57 2010 +0100

    drm/i915: Copy the updated reloc->presumed_offset back to the user

Refers to a regression introduced in commit 12f889c

That commit is not in the git history for drm-intel-next, as it was
killed by a non-fast-forward push.

I've not quite been able to figure out what the non-fast-forward commit
was all about (whether it was a rebase or something?), but I noted in my
reflogs:

git reflog show --date=rfc drm-intel/drm-intel-next
297b0c5 refs/remotes/drm-intel/drm-intel-next@{Fri, 22 Oct 2010 21:39:05 +0100}: fetch drm-intel: fast-forward
878a3c3 refs/remotes/drm-intel/drm-intel-next@{Fri, 22 Oct 2010 12:36:57 +0100}: fetch drm-intel: fast-forward
b5dc608 refs/remotes/drm-intel/drm-intel-next@{Thu, 21 Oct 2010 00:28:04 +0100}: fetch drm-intel: fast-forward
69dc498 refs/remotes/drm-intel/drm-intel-next@{Wed, 20 Oct 2010 14:05:40 +0100}: fetch drm-intel: forced-update
36eb1cd refs/remotes/drm-intel/drm-intel-next@{Tue, 19 Oct 2010 21:27:46 +0100}: fetch drm-intel: fast-forward
12f889c refs/remotes/drm-intel/drm-intel-next@{Tue, 19 Oct 2010 21:13:20 +0100}: fetch drm-intel: fast-forward
2d7b836 refs/remotes/drm-intel/drm-intel-next@{Wed, 13 Oct 2010 17:53:30 +0100}: fetch drm-intel: storing head

And that around the forced update, we have this delta. Was it intentional?

(Attached).

-- 
Peter Clifton

Electrical Engineering Division,
Engineering Department,
University of Cambridge,
9, JJ Thomson Avenue,
Cambridge
CB3 0FA

Tel: +44 (0)7729 980173 - (No signal in the lab!)
Tel: +44 (0)1223 748328 - (Shared lab phone, ask for me)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: forced_update_36eb1cd..69dc498.diff
Type: text/x-patch
Size: 2491 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20101022/ea440387/attachment.bin>