diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore index 7a18e169a02..6e098d12990 100644 --- a/bin/.cherry-ignore +++ b/bin/.cherry-ignore @@ -82,6 +82,9 @@ aa3020592964344c7032396d159e4ab2df743587 063264db5be2941746fa58f164cdc803362753a9 748f4cce183007587a6688ef25ad5f9dbea5c33c 9de062ef207c6062d1fabb70209f4bbc9dc4732d +7d1d1208c2b38890fe065b6431ef2e3b7166bae4 +0796c3934ebfe3448acf2d63f478f51c08e33046 +864c780566b8782c4fc69b4337db768223717bd8 # These have more than one fixes tag and generate a warning # @@ -118,3 +121,9 @@ a72dbc461bdb7714656e62cd8f4b00a404c2e6e0 # This patch was reverted on master shortly after merging. # 90819abb56f6b1a0cd4946b13b6caf24fb46e500 + +# These were supreceeded by patches backported to 18.1 +# +3341429d74099b436c3824164837eebd47029ded +9158e0bd82ffdad4baf46221bccbbb3fe4764c11 +cc3b99bb48769ccd018b781338b548306af5046b