commit 2ccec5944606ee1389abc7ee41986825c6ceb574
author Linus Torvalds <torvalds@linux-foundation.org> Thu Nov 13 05:02:59 2025 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Nov 13 05:02:59 2025 -0800
tree cc3796c15f73e2ac31fb126fef52da1fb64eb403
parent 967a72fa7f6b77eb9f65c7365487662a4d04dbe4
parent f2a12cc3b97f062186568a7b94ddb7aa2ef68140

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