Mesa (9.2): cherry-ignore: Ignore a commit which appeared twice on master

Carl Worth cworth at kemper.freedesktop.org
Tue Oct 1 21:13:28 UTC 2013


Module: Mesa
Branch: 9.2
Commit: f7fba18e2e35af9c2a26a4cb42598662c988e5da
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7fba18e2e35af9c2a26a4cb42598662c988e5da

Author: Carl Worth <cworth at cworth.org>
Date:   Tue Oct  1 14:08:17 2013 -0700

cherry-ignore: Ignore a commit which appeared twice on master

In between the two appearances, it was reverted once.

Regardless, the two versions on master are the same, and we've already
cherry-picked one of them, so ignore the second.

---

 bin/.cherry-ignore |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index c49d98a..dec0624 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -3,4 +3,8 @@ d8ac987f6ab228df1a478b36c3d889992754374f glsl: Disallow uniform block layout qua
 
 # The bug fixed by this patch does not exist in 9.2.  Discussed with Marek and
 # Brian Paul on the mesa-stable mailing list.
-89a665eb5fa176f68223bf54a472d6a0567c3546 draw: fix segfaults with aaline and aapoint stages disabled
\ No newline at end of file
+89a665eb5fa176f68223bf54a472d6a0567c3546 draw: fix segfaults with aaline and aapoint stages disabled
+
+# Previously cherry picked (patch originally appeared twice on master with a
+# revert in between)
+4e5eb8ba25054ede4798fa424e6f32b23aba0f98 i965/vec4: Only zero out unused message components when there are any.




More information about the mesa-commit mailing list