From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paolo Bonzini <pbonzini@redhat•com>
Cc: Mark Brown <broonie@kernel•org>, Anup Patel <anup@brainfault•org>,
Ian Rogers <irogers@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Namhyung Kim <namhyung@kernel•org>,
Shenlin Liang <liangshenlin@eswincomputing•com>,
KVM <kvm@vger•kernel.org>
Subject: Re: linux-next: manual merge of the kvm-riscv tree with the perf tree
Date: Wed, 17 Jul 2024 14:16:29 +1000 [thread overview]
Message-ID: <20240717141629.08a04e4e@canb.auug.org.au> (raw)
In-Reply-To: <Zn8HeRRX3JV2IcxQ@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 1556 bytes --]
Hi all,
On Fri, 28 Jun 2024 19:56:57 +0100 Mark Brown <broonie@kernel•org> wrote:
>
> Today's linux-next merge of the kvm-riscv tree got a conflict in:
>
> tools/perf/arch/riscv/util/Build
>
> between commit:
>
> e467705a9fb37 ("perf util: Make util its own library")
>
> from the perf tree and commit:
>
> da7b1b525e972 ("perf kvm/riscv: Port perf kvm stat to RISC-V")
>
> from the kvm-riscv 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.
>
> diff --cc tools/perf/arch/riscv/util/Build
> index 65ec3c66a3754,d72b04f8d32bb..0000000000000
> --- a/tools/perf/arch/riscv/util/Build
> +++ b/tools/perf/arch/riscv/util/Build
> @@@ -1,5 -1,6 +1,6 @@@
> -perf-y += perf_regs.o
> -perf-y += header.o
> +perf-util-y += perf_regs.o
> +perf-util-y += header.o
>
> -perf-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o
> -perf-$(CONFIG_DWARF) += dwarf-regs.o
> -perf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
> ++perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o
> +perf-util-$(CONFIG_DWARF) += dwarf-regs.o
> +perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
This is now a conflict between the kvm tree ad Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-07-17 4:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-28 18:56 linux-next: manual merge of the kvm-riscv tree with the perf tree Mark Brown
2024-07-02 19:06 ` Namhyung Kim
2024-07-17 4:16 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-07 3:54 Stephen Rothwell
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=20240717141629.08a04e4e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=anup@brainfault$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=irogers@google$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=liangshenlin@eswincomputing$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=namhyung@kernel$(echo .)org \
--cc=pbonzini@redhat$(echo .)com \
/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