Merge branch 'zstd-next' of https://github.com/terrelln/linux.git

diff --cc include/linux/zstd.h
Simple merge

diff --cc lib/zstd/common/mem.h
Simple merge

diff --cc lib/zstd/compress/zstd_compress.c
Simple merge

diff --cc lib/zstd/zstd_compress_module.c
Simple merge

diff --cc lib/zstd/zstd_decompress_module.c
Simple merge