On Thu, Jun 29, 2017 at 12:41:04PM -0700, Nick Terrell wrote: > lib/zstd/Makefile | 18 + > lib/zstd/bitstream.h | 374 +++++ > lib/zstd/compress.c | 3479 > ++++++++++++++++++++++++++++++++++++++++++++ > lib/zstd/decompress.c | 2526 ++++++++++++++++++++++++++++++++ > lib/zstd/entropy_common.c | 243 ++++ > lib/zstd/error_private.h | 53 + > lib/zstd/fse.h | 575 ++++++++ > lib/zstd/fse_compress.c | 795 ++++++++++ > lib/zstd/fse_decompress.c | 332 +++++ > lib/zstd/huf.h | 212 +++ > lib/zstd/huf_compress.c | 771 ++++++++++ > lib/zstd/huf_decompress.c | 960 ++++++++++++ > lib/zstd/mem.h | 151 ++ > lib/zstd/zstd_common.c | 75 + > lib/zstd/zstd_internal.h | 269 ++++ > lib/zstd/zstd_opt.h | 1014 +++++++++++++
I don't see patch 2/4 in the mailinglist, probably over the 100kb limit. The lib/* stuff needs to be merged first, I shouldn't add non-btrfs code to our regular for-next branch. A testing branch with all the zstd code can be created, but from the upstream merging process, I don't think we can avoid two step merging.