From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Mar 2023 00:03:25 +0000 (-0700)
Subject: Merge tag 'zstd-linus-v6.3-rc3' of https://github.com/terrelln/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ed38ff164fba98a21993c95d240013f32309ccab;p=linux.git

Merge tag 'zstd-linus-v6.3-rc3' of https://github.com/terrelln/linux

Pull zstd fixes from Nick Terrell:
 "A small number of fixes for zstd-v1.5.2.

  I'm not pulling in zstd-v1.5.4 from upstream this release because it
  didn't have any time to bake in linux-next, but I'm aiming for the
  next update in v6.4"

* tag 'zstd-linus-v6.3-rc3' of https://github.com/terrelln/linux:
  zstd: Fix definition of assert()
  lib: zstd: Backport fix for in-place decompression
  lib: zstd: Fix -Wstringop-overflow warning
---

ed38ff164fba98a21993c95d240013f32309ccab