[LTP] [PATCH v4 4/4] Update syscalls files

Petr Vorel pvorel@suse.cz
Fri Oct 25 11:37:32 CEST 2024


Hi Andrea,

> On 10/23/24 14:57, Petr Vorel wrote:
> > Hi Andrea,

> > > Hi Petr,
> > ...
> > > > Also, this 4th patch also does not apply. Unlike first commit there are more
> > > > conflicts (applying of course on the top of the 3 previous patches):
> > > > Description: [v4,4/4] Update syscalls files
> > > > Applying: Update syscalls files
> > > > error: patch failed: include/lapi/syscalls/arm.in:1
> > > > error: include/lapi/syscalls/arm.in: patch does not apply
> > > > error: patch failed: include/lapi/syscalls/arm64.in:294
> > > > error: include/lapi/syscalls/arm64.in: patch does not apply
> > > > error: patch failed: include/lapi/syscalls/ia64.in:341
> > > > error: include/lapi/syscalls/ia64.in: patch does not apply
> > > > error: patch failed: include/lapi/syscalls/x86_64.in:349
> > > > error: include/lapi/syscalls/x86_64.in: patch does not apply
> > > > Patch failed at 0001 Update syscalls files
> > > This is really strange. It's not happening for me even with the latest HEAD.
> > > Did you rebase first?
> > I was applying to the master (as I wrote first I need to adjust first patch
> > which also didn't apply, but that's just a single line). Don't bother if the
> > problem is really on my side.  But pushing the patchset to your fork would help
> > me to actually test the code.

> You can check it out here:
> https://github.com/acerv/ltp/actions/runs/11480881574

thanks, but the run points to the b4/generate_syscalls branch [1], which is not the
same as you post as v4. It has 4 commits, but 1st of them "Automatically
generate syscalls.h" [2] is a cover letter without change. And it does not have
the 4th commit [3] which I was unable to apply (the error reported, it's in few
lines above in the email).

Anyway, you got a review from Li, thus feel free just merge what you sent as v4,
no need to resent a new version just because it's not applicable.
I try to have a quick look on v4, but you don't have to wait for me.

Kind regards,
Petr

[1] https://github.com/acerv/ltp/commits/refs/heads/b4/generate_syscalls/
[2] https://github.com/acerv/ltp/commit/7544e1faa28cced4fdd6c47dc81ee5b84fb2ae01
[3] https://lore.kernel.org/ltp/20241009-generate_syscalls-v4-4-5328a785bbad@suse.com/

> Andrea


> > Kind regards,
> > Petr

> > > > Kind regards,
> > > > Petr
> > > Andrea


More information about the ltp mailing list