From: Petr Vorel <pvorel@suse.cz>
To: Andrea Cervesato <andrea.cervesato@suse.com>
Cc: ltp@lists.linux.it
Subject: Re: [LTP] [PATCH v4 4/4] Update syscalls files
Date: Fri, 25 Oct 2024 11:37:32 +0200 [thread overview]
Message-ID: <20241025093732.GA682542@pevik> (raw)
In-Reply-To: <2857ad7b-9d0f-496b-bed8-566508d7b9d8@suse.com>
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
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2024-10-25 9:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-09 9:45 [LTP] [PATCH v4 0/4] Automatically generate syscalls.h Andrea Cervesato
2024-10-09 9:45 ` [LTP] [PATCH v4 1/4] Refactor regen.sh script to generate syscalls Andrea Cervesato
2024-10-14 12:45 ` Li Wang
2024-10-25 10:03 ` Petr Vorel
2024-10-09 9:45 ` [LTP] [PATCH v4 2/4] Add script to generate arch(s) dependant syscalls Andrea Cervesato
2024-10-15 8:12 ` Li Wang
2024-10-25 10:20 ` Petr Vorel
2024-10-30 8:40 ` Andrea Cervesato via ltp
2024-10-09 9:45 ` [LTP] [PATCH v4 3/4] Delete obsolete strip_syscall.awk file Andrea Cervesato
2024-10-15 8:10 ` Li Wang
2024-10-25 10:23 ` Petr Vorel
2024-10-09 9:45 ` [LTP] [PATCH v4 4/4] Update syscalls files Andrea Cervesato
2024-10-15 6:49 ` Li Wang
2024-10-15 7:04 ` Li Wang
2024-10-15 17:17 ` Petr Vorel
2024-10-23 12:34 ` Andrea Cervesato via ltp
2024-10-23 12:57 ` Petr Vorel
2024-10-23 14:30 ` Andrea Cervesato via ltp
2024-10-25 9:37 ` Petr Vorel [this message]
2024-10-23 12:11 ` Andrea Cervesato via ltp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241025093732.GA682542@pevik \
--to=pvorel@suse.cz \
--cc=andrea.cervesato@suse.com \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox