2022-12-17 01:50:47

by Nick Terrell

[permalink] [raw]
Subject: [GIT PULL] zstd changes for v6.2-rc1

The following changes since commit 830b3c68c1fb1e9176028d02ef86f3cf76aa2476:

Linux 6.1 (2022-12-11 14:15:18 -0800)

are available in the Git repository at:

https://github.com/terrelln/linux.git tags/zstd-linus-v6.2

for you to fetch changes up to 70d822cfb782ebed5c41bdad9fa520b5ec1c6923:

Merge branch 'zstd-next' into zstd-linus (2022-12-13 16:24:40 -0800)

----------------------------------------------------------------
Update to zstd-1.5.2

The major goal of this PR is to update the kernel to upstream zstd v1.5.2 [0].
Specifically to the tag v1.5.2-kernel [1] which includes several cherrypicked
fixes for the kernel on top of v1.5.2.

Excepting the MAINTAINERS change, all the changes in this PR can be generated by:

```
git clone https://github.com/facebook/zstd
cd zstd/contrib/linux-kernel
git checkout v1.5.2-kernel
LINUX=/path/to/linux/repo make import
```

These changes have been baking in linux-next since 2022/10/24 when I put up
my patchset [2]. Notably the first commit is a small refactor of the only zstd
commit since the last update [3] to fit the upstream import scheme.

Additionally, this PR includes several minor typo fixes, which have all been
fixed upstream so they are maintained on the next import.

[0] https://github.com/facebook/zstd/releases/tag/v1.5.2
[1] https://github.com/facebook/zstd/tree/v1.5.2-kernel
[2] https://lore.kernel.org/lkml/[email protected]/
[3] https://github.com/torvalds/linux/commit/637a642f5ca5e850186bb64ac75ebb0f124b458d

Signed-off-by: Nick Terrell <[email protected]>

----------------------------------------------------------------
Jilin Yuan (1):
lib: zstd: fix repeated words in comments

Nick Terrell (6):
Merge branch 'main' into zstd-next
Merge branch 'main' into zstd-next
zstd: Move zstd-common module exports to zstd_common_module.c
zstd: import usptream v1.5.2
Merge branch 'main' into zstd-linus
Merge branch 'zstd-next' into zstd-linus

Palmer Dabbelt (1):
MAINTAINERS: git://github -> https://github.com for terrelln

Tom Rix (1):
lib: zstd: clean up double word in comment.

Xin Gao (1):
lib: zstd: Fix comment typo

MAINTAINERS | 2 +-
include/linux/zstd_lib.h | 479 +++---
lib/zstd/Makefile | 1 +
lib/zstd/common/bitstream.h | 9 +
lib/zstd/common/compiler.h | 67 +-
lib/zstd/common/entropy_common.c | 11 +-
lib/zstd/common/error_private.h | 81 +-
lib/zstd/common/fse.h | 3 +-
lib/zstd/common/fse_decompress.c | 2 +-
lib/zstd/common/huf.h | 46 +-
lib/zstd/common/mem.h | 2 +
lib/zstd/common/portability_macros.h | 93 ++
lib/zstd/common/zstd_common.c | 10 -
lib/zstd/common/zstd_internal.h | 175 +--
lib/zstd/compress/clevels.h | 132 ++
lib/zstd/compress/fse_compress.c | 83 +-
lib/zstd/compress/huf_compress.c | 644 ++++++--
lib/zstd/compress/zstd_compress.c | 2000 ++++++++++++++++++------
lib/zstd/compress/zstd_compress_internal.h | 375 ++++-
lib/zstd/compress/zstd_compress_literals.c | 9 +-
lib/zstd/compress/zstd_compress_literals.h | 4 +-
lib/zstd/compress/zstd_compress_sequences.c | 31 +-
lib/zstd/compress/zstd_compress_superblock.c | 295 +---
lib/zstd/compress/zstd_cwksp.h | 225 ++-
lib/zstd/compress/zstd_double_fast.c | 413 +++--
lib/zstd/compress/zstd_fast.c | 441 ++++--
lib/zstd/compress/zstd_lazy.c | 1352 ++++++++++++----
lib/zstd/compress/zstd_lazy.h | 38 +
lib/zstd/compress/zstd_ldm.c | 76 +-
lib/zstd/compress/zstd_ldm.h | 1 +
lib/zstd/compress/zstd_ldm_geartab.h | 5 +-
lib/zstd/compress/zstd_opt.c | 402 +++--
lib/zstd/decompress/huf_decompress.c | 912 ++++++++---
lib/zstd/decompress/zstd_decompress.c | 80 +-
lib/zstd/decompress/zstd_decompress_block.c | 1022 +++++++++---
lib/zstd/decompress/zstd_decompress_block.h | 10 +-
lib/zstd/decompress/zstd_decompress_internal.h | 38 +-
lib/zstd/decompress_sources.h | 6 +
lib/zstd/zstd_common_module.c | 32 +
lib/zstd/zstd_compress_module.c | 6 +-
40 files changed, 6989 insertions(+), 2624 deletions(-)
create mode 100644 lib/zstd/common/portability_macros.h
create mode 100644 lib/zstd/compress/clevels.h
create mode 100644 lib/zstd/zstd_common_module.c


2022-12-19 20:18:28

by pr-tracker-bot

[permalink] [raw]
Subject: Re: [GIT PULL] zstd changes for v6.2-rc1

The pull request you sent on Sat, 17 Dec 2022 01:24:40 +0000:

> https://github.com/terrelln/linux.git tags/zstd-linus-v6.2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/158738ea75059fb4ddf812e2cb9fe1ff6e22bc70

Thank you!

--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html