From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Nov 2025 13:02:59 +0000 (-0800)
Subject: Merge tag 'erofs-for-6.18-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.18-rc6~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ccec5944606ee1389abc7ee41986825c6ceb574;p=thirdparty%2Flinux.git

Merge tag 'erofs-for-6.18-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs

Pull erofs fixes from Gao Xiang:

 - Add Chunhai Guo as a EROFS reviewer to get more eyes from interested
   industry vendors

 - Fix infinite loop caused by incomplete crafted zstd-compressed data
   (thanks to Robert again!)

* tag 'erofs-for-6.18-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
  erofs: avoid infinite loop due to incomplete zstd-compressed data
  MAINTAINERS: erofs: add myself as reviewer
---

2ccec5944606ee1389abc7ee41986825c6ceb574