From: Greg Kroah-Hartman Date: Wed, 13 Aug 2025 08:06:22 +0000 (+0200) Subject: drop queue-6.16/erofs-fix-build-error-with-config_erofs_fs_zip_accel.patch X-Git-Tag: v6.1.148~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1d95a1a00f1778a3d373be9c1222be1c9249cab;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.16/erofs-fix-build-error-with-config_erofs_fs_zip_accel.patch --- diff --git a/queue-6.16/erofs-fix-build-error-with-config_erofs_fs_zip_accel.patch b/queue-6.16/erofs-fix-build-error-with-config_erofs_fs_zip_accel.patch deleted file mode 100644 index d09a26b7f1..0000000000 --- a/queue-6.16/erofs-fix-build-error-with-config_erofs_fs_zip_accel.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4533981c0089f2621ac5ce876c6fb3ae93d4ab44 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 17 Jul 2025 23:30:39 -0400 -Subject: erofs: fix build error with CONFIG_EROFS_FS_ZIP_ACCEL=y - -From: Bo Liu (OpenAnolis) - -[ Upstream commit 5e0bf36fd156b8d9b09f8481ee6daa6cdba1b064 ] - -fix build err: - ld.lld: error: undefined symbol: crypto_req_done - referenced by decompressor_crypto.c - fs/erofs/decompressor_crypto.o:(z_erofs_crypto_decompress) in archive vmlinux.a - referenced by decompressor_crypto.c - fs/erofs/decompressor_crypto.o:(z_erofs_crypto_decompress) in archive vmlinux.a - - ld.lld: error: undefined symbol: crypto_acomp_decompress - referenced by decompressor_crypto.c - fs/erofs/decompressor_crypto.o:(z_erofs_crypto_decompress) in archive vmlinux.a - - ld.lld: error: undefined symbol: crypto_alloc_acomp - referenced by decompressor_crypto.c - fs/erofs/decompressor_crypto.o:(z_erofs_crypto_enable_engine) in archive vmlinux.a - -Reported-by: kernel test robot -Closes: https://lore.kernel.org/oe-kbuild-all/202507161032.QholMPtn-lkp@intel.com/ -Fixes: b4a29efc5146 ("erofs: support DEFLATE decompression by using Intel QAT") -Signed-off-by: Bo Liu (OpenAnolis) -Link: https://lore.kernel.org/r/20250718033039.3609-1-liubo03@inspur.com -Reviewed-by: Gao Xiang -Signed-off-by: Gao Xiang -Signed-off-by: Sasha Levin ---- - fs/erofs/Kconfig | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/fs/erofs/Kconfig b/fs/erofs/Kconfig -index 6beeb7063871..7b26efc271ee 100644 ---- a/fs/erofs/Kconfig -+++ b/fs/erofs/Kconfig -@@ -147,6 +147,8 @@ config EROFS_FS_ZIP_ZSTD - config EROFS_FS_ZIP_ACCEL - bool "EROFS hardware decompression support" - depends on EROFS_FS_ZIP -+ select CRYPTO -+ select CRYPTO_DEFLATE - help - Saying Y here includes hardware accelerator support for reading - EROFS file systems containing compressed data. It gives better --- -2.39.5 - diff --git a/queue-6.16/series b/queue-6.16/series index d9ac11f121..329dabbd5f 100644 --- a/queue-6.16/series +++ b/queue-6.16/series @@ -25,7 +25,6 @@ io_uring-fix-breakage-in-expert-menu.patch btrfs-remove-partial-support-for-lowest-level-from-b.patch eventpoll-fix-semi-unbounded-recursion.patch eventpoll-fix-sphinx-documentation-build-warning.patch -erofs-fix-build-error-with-config_erofs_fs_zip_accel.patch block-restore-two-stage-elevator-switch-while-runnin.patch sched-task_stack-add-missing-const-qualifier-to-end_.patch asoc-rockchip-fix-capture-stream-handling-in-rockchi.patch