From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnaldo Carvalho de Melo <arnaldo.melo@gmail•com>,
Namhyung Kim <namhyung@kernel•org>
Cc: jslaby@suse•cz, "Arnaldo Carvalho de Melo" <acme@redhat•com>,
"Björn Töpel" <bjorn@rivosinc•com>,
"Jiri Slaby" <jirislaby@kernel•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the perf tree with Linus' tree
Date: Fri, 1 Nov 2024 10:33:45 +1100 [thread overview]
Message-ID: <20241101103345.45340b53@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1499 bytes --]
Hi all,
Today's linux-next merge of the perf tree got a conflict in:
tools/perf/util/syscalltbl.c
between commit:
5d35634ecc2d ("perf trace: Fix non-listed archs in the syscalltbl routines")
from Linus' tree and commit:
8c0d1202bad3 ("perf, riscv: Wire up perf trace support for RISC-V")
from the perf tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/perf/util/syscalltbl.c
index 6c45ded922b6,349986f6e5f5..000000000000
--- a/tools/perf/util/syscalltbl.c
+++ b/tools/perf/util/syscalltbl.c
@@@ -46,11 -46,10 +46,15 @@@ static const char *const *syscalltbl_na
#include <asm/syscalls.c>
const int syscalltbl_native_max_id = SYSCALLTBL_LOONGARCH_MAX_ID;
static const char *const *syscalltbl_native = syscalltbl_loongarch;
+ #elif defined(__riscv)
+ #include <asm/syscalls.c>
+ const int syscalltbl_native_max_id = SYSCALLTBL_RISCV_MAX_ID;
+ static const char *const *syscalltbl_native = syscalltbl_riscv;
+#else
+const int syscalltbl_native_max_id = 0;
+static const char *const syscalltbl_native[] = {
+ [0] = "unknown",
+};
#endif
struct syscall {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-10-31 23:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-31 23:33 Stephen Rothwell [this message]
2024-11-04 18:11 ` linux-next: manual merge of the perf tree with Linus' tree Namhyung Kim
-- strict thread matches above, loose matches on Subject: below --
2023-11-28 21:53 Stephen Rothwell
2023-11-30 0:11 ` Namhyung Kim
2022-07-07 23:28 Stephen Rothwell
2021-10-26 22:17 Stephen Rothwell
2021-10-26 23:06 ` Arnaldo Carvalho de Melo
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=20241101103345.45340b53@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=acme@redhat$(echo .)com \
--cc=arnaldo.melo@gmail$(echo .)com \
--cc=bjorn@rivosinc$(echo .)com \
--cc=jirislaby@kernel$(echo .)org \
--cc=jslaby@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=namhyung@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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