aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2013-07-12 18:29:13 -0700
committerCarl Worth <cworth@cworth.org>2013-07-15 11:35:28 -0700
commit083f5f08485845246356b15059d84ca2813a4221 (patch)
tree38ff03eeaf5c3621170543d2da826aa76f4add84 /bin
parentf4cf23e35081205f25e78f90437ead15cbec7792 (diff)
cherry-ignore: Ignore previously backported patch
Chad was diligent and already applied this patch to the stable branch, (but without the "cherry-picked from" since he did a backport to a different file, not a cherry-pick, so get-pick-list.sh wasn't clever enough to notice).
Diffstat (limited to 'bin')
-rw-r--r--bin/.cherry-ignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 6f63354e845..27893e7a9db 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -30,3 +30,6 @@ dca5fc14358a8b267b3854c39c976a822885898f i965/fs: Improve performance of varying
# Already cherry-picked, but squashed with the commit that broke what this fixed
4405ff4055685841c9d9545da52c7edc8708b14b i965: Fix haswell_upload_cut_index when there's no index buffer.
+
+# Already cherry-picked as commit bf8053a2dbac1500586d6d387cd88c30aad63a60
+6b676e66343356d5096260c2bc1601014c808cb0 i965,i915: Return early if miptree allocation fails