linux-kernel - linux-next: manual merge of the loongarch tree with the perf tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240709100536.238f4d12@canb.auug.org.au>
Date: Tue, 9 Jul 2024 10:05:36 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Huacai Chen <chenhuacai@...ngson.cn>, Arnaldo Carvalho de Melo
 <arnaldo.melo@...il.com>, Namhyung Kim <namhyung@...nel.org>
Cc: Bibo Mao <maobibo@...ngson.cn>, Huacai Chen <chenhuacai@...nel.org>, Ian
 Rogers <irogers@...gle.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the loongarch tree with the perf tree

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

Content of type "application/pgp-signature" skipped