summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorCarl Worth <[email protected]>2013-10-28 09:17:02 -0700
committerCarl Worth <[email protected]>2013-10-28 09:21:05 -0700
commit26c599e00ac9859ce0f8cb5b7a22f89ef2135c9a (patch)
tree8bd7c8cb13da3417a04a33b5bc1793160a485bc3 /bin
parent6f966b58a1257cc89a04b8a1ca80d038ba66a39d (diff)
cherry-ignore: Ignore two more patches.
One of these was recently backported, (the backported commit message doesn't have the exact format expected by get-pick-list.sh, so we add it manually here). On the other, I haven't heard back from a couple of requests to the authors to backport the patch to 9.2.
Diffstat (limited to 'bin')
-rw-r--r--bin/.cherry-ignore8
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index dec062418b8..3f4e9324c02 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -8,3 +8,11 @@ d8ac987f6ab228df1a478b36c3d889992754374f glsl: Disallow uniform block layout qua
# 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.
+
+# Backported as 7ab2b8c4c4607817c91946dcba943b29f1bd1895 but without "cherry
+# picked from" in commit message
+360a141f24a9d00891665b7fedb77ffb116944ca wayland: Don't rely on static variable for identifying wl_drm buffers
+
+# Doesn't cherry-pick cleanly. Haven't heard back from requests to authors to
+# rebase.
+57f38e9f921bcfac0087765b4acb2c258604ea29 radeonsi: fix blitting the last 2 mipmap levels of compressed textures