summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-08-27 13:33:14 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-27 13:37:26 +0100
commite8d7e3bc5758976504154281eeac827aacbd6bb8 (patch)
treeffbf166fb77a76cdbfc11c99986356e4c5f05b12 /bin
parent869e6e39552a4b0d6524cf2b1d507ef039bf5070 (diff)
cherry-ignore: reject a15088338eb
The commit "radeonsi/compute: Stop leaking the input buffer" is not meant for 10.2 as it relies on code that was never part of this branch and breaks the build. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'bin')
-rw-r--r--bin/.cherry-ignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 9f68d8fe77f..ad7611cda76 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -24,3 +24,7 @@ b3121bfd413973f460e2cc9a9f852bdfa1265fcf mesa: guard better when building with s
# No whitespace fixes for the stable branches.
38fccc37c1fa57c1fd373e8d71621bb4aed31083 radeonsi/compute: Whitespace fixes
+
+# The commit relies of patches restructuring r600_resource, which never made
+# it in the 10.2 branch.
+a15088338ebe544efd90bfa7934cb99521488141 radeonsi/compute: Stop leaking the input buffer