Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
#12672 reminded me that ZTS actually passing sometimes is important on 2.1 and 2.0 too, so here we are.
Description
731fbb5 and 90b77a0 cherrypicked and the three merge conflicts kicked into shape. I think they all looked reasonable...
How Has This Been Tested?
I pushed it and -r sanity passed.
Types of changes
Checklist:
Signed-off-by
.