Re: [PATCH v3 2/3] erofs-utils: mkfs: allow to specify dictionary size for compression algorithms

[Gao Xiang <xiang@kernel.org>]

Hi Yifan,

On Fri, Jan 19, 2024 at 08:46:55PM +0800, Yifan Zhao wrote:
> Currently, the dictionary size for compression algorithms is fixed. This
> patch allows to specify different ones with new -zX,dictsize=<dictsize>
> options.
> 
> This patch also changes the way to specify compression levels. Now, the
> compression level is specified with -zX,level=<level> options and could
> be specified together with dictsize. The old -zX,<level> form is still
> supported for compatibility.
> 
> Suggested-by: Gao Xiang <hsiangkao@linux.alibaba.com>
> Signed-off-by: Yifan Zhao <zhaoyifan@sjtu.edu.cn>

I cannot apply this patch.  The error message shows as below:

Applying: erofs-utils: mkfs: merge erofs_compressor_setlevel() into
erofs_compressor_init()
Applying: erofs-utils: mkfs: allow to specify dictionary size for
compression algorithms
Using index info to reconstruct a base tree...
error: patch failed: lib/compressor_liblzma.c:68
error: lib/compressor_liblzma.c: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0002 erofs-utils: mkfs: allow to specify dictionary size
for compression algorithms
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Did you use the proper branch (the latest -dev) to form patches?

Thanks,
Gao Xiang