Re: [PATCH v3] generic/746: install two necessary files

[An Long <lan@suse.com>]

On Thu, 2024-10-10 at 17:44 +0800, Zorro Lang wrote:
> On Thu, Oct 10, 2024 at 11:40:20AM +0800, An Long wrote:
> > parse-dev-tree.awk and parse-extent-tree.awk are used by
> > generic/746.
> > We need to make sure them are installed, otherwise generic/746 will
> > have problems if fstests is installed via "make install".
> > 
> > Signed-off-by: An Long <lan@suse.com>
> > ---
> 
> There might be something (format) wrong when you generated or sent
> this
> patch, I can't merge it directly, the `git am` shows:
> 
>   Applying: generic/746: install two necessary files
>   error: corrupt patch at line 18
>   Patch failed at 0001 generic/746: install two necessary files
>   hint: Use 'git am --show-current-patch=diff' to see the failed
> patch
>   hint: When you have resolved this problem, run "git am --continue".
>   hint: If you prefer to skip this patch, run "git am --skip"
> instead.
>   hint: To restore the original branch and stop patching, run "git am
> --abort".
>   hint: Disable this message with "git config advice.mergeConflict
> false"
> 
> Anyway, this change is simple enough, so I've maken this change
> manually
> (with author=$you), so don't need to send one more version, just
> remind it.
> 
> Thanks,
> Zorro
Thank you, Lang! I've double checked, there is a "=20"(space) in the
end of mail. However, I'll ensure the format is correct next time.
> 
> >  src/Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/src/Makefile b/src/Makefile
> > index 3097c29e..a0396332 100644
> > --- a/src/Makefile
> > +++ b/src/Makefile
> > @@ -38,7 +38,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize
> > preallo_rw_pattern_reader \
> > 
> >  EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh
> > \
> >               btrfs_crc32c_forged_name.py popdir.pl popattr.py \
> > -             soak_duration.awk
> > +             soak_duration.awk parse-dev-tree.awk parse-extent-
> > tree.awk
> > 
> >  SUBDIRS = log-writes perf
> > 
> > -- 
> > 2.43.0
> > 
> > 
> 

-- 
An Long <lan@suse.com>
SUSE QE LSG, QE 2, Beijing