* linux-next: manual merge of the loongarch tree with the perf tree
@ 2024-07-09 0:05 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2024-07-09 0:05 UTC (permalink / raw)
To: Huacai Chen, Arnaldo Carvalho de Melo, Namhyung Kim
Cc: Bibo Mao, Huacai Chen, Ian Rogers, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1471 bytes --]
Hi all,
Today's linux-next merge of the loongarch tree got a conflict in:
tools/perf/arch/loongarch/util/Build
between commit:
e467705a9fb3 ("perf util: Make util its own library")
from the perf tree and commit:
c4d8557f0f71 ("perf kvm: Add kvm-stat for loongarch64")
from the loongarch 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/arch/loongarch/util/Build
index 2386ebbf6dd4,b12d374d7096..000000000000
--- a/tools/perf/arch/loongarch/util/Build
+++ b/tools/perf/arch/loongarch/util/Build
@@@ -1,5 -1,7 +1,7 @@@
-perf-y += header.o
-perf-y += perf_regs.o
++perf-util-y += header.o
+perf-util-y += perf_regs.o
-perf-$(CONFIG_DWARF) += dwarf-regs.o
-perf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
-perf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
-perf-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o
+perf-util-$(CONFIG_DWARF) += dwarf-regs.o
+perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
+perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
++perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-07-09 0:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-09 0:05 linux-next: manual merge of the loongarch tree with the perf tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox