Merge branch 'zstd-upstream-2' into linus

Signed-off-by: Chris Mason <clm@fb.com>