https://bugs.freedesktop.org/show_bug.cgi?id=69830

--- Comment #8 from Alan Ott <[email protected]> ---
I'm on mainline. As evidence, noice the SHA1 of my HEAD:

alan@ato:~/work/linux-3.12$ git log |head
commit 4a10c2ac2f368583138b774ca41fac4207911983
Author: Linus Torvalds <[email protected]>
Date:   Mon Sep 23 15:41:09 2013 -0700

    Linux 3.12-rc2

commit 9d23108df359e572a0dca0b631bfee9f5e0fa9ea
Merge: e04a0a5 6174081
Author: Linus Torvalds <[email protected]>
Date:   Mon Sep 23 12:53:07 2013 -0700

See 3.12-rc2 has the same SHA1:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=4a10c2ac2f368583138b774ca41fac4207911983


The gitk shows that while 791dc is the parent of 30f, there was a lot of merge
activity in between, so I think we're looking at the same thing. Sorry to
confuse the matter.

-- 
You are receiving this mail because:
You are the assignee for the bug.
_______________________________________________
Nouveau mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau

Reply via email to