* linux-next: manual merge of the kvm-riscv tree with the perf tree
@ 2024-03-07 3:54 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2024-03-07 3:54 UTC (permalink / raw)
To: Anup Patel, Arnaldo Carvalho de Melo, Namhyung Kim
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Masahiro Yamada, Paolo Bonzini
[-- Attachment #1: Type: text/plain, Size: 2387 bytes --]
Hi all,
Today's linux-next merge of the kvm-riscv tree got a conflict in:
tools/testing/selftests/kvm/Makefile
between commit:
c2bd08ba20a5 ("treewide: remove meaningless assignments in Makefiles")
from the perf tree and commit:
2c5af1c84603 ("selftests/kvm: Fix issues with $(SPLIT_TESTS)")
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.
--
Cheers,
Stephen Rothwell
diff --cc tools/testing/selftests/kvm/Makefile
index 14684aeb4b55,426f85798aea..000000000000
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@@ -267,10 -270,13 +270,13 @@@ TEST_GEN_OBJ = $(patsubst %, %.o, $(TES
TEST_GEN_OBJ += $(patsubst %, %.o, $(TEST_GEN_PROGS_EXTENDED))
TEST_DEP_FILES = $(patsubst %.o, %.d, $(TEST_GEN_OBJ))
TEST_DEP_FILES += $(patsubst %.o, %.d, $(LIBKVM_OBJS))
- TEST_DEP_FILES += $(patsubst %.o, %.d, $(SPLIT_TESTS_OBJS))
+ TEST_DEP_FILES += $(patsubst %.o, %.d, $(SPLIT_TEST_GEN_OBJ))
-include $(TEST_DEP_FILES)
- $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED): %: %.o
-x := $(shell mkdir -p $(sort $(OUTPUT)/$(ARCH_DIR) $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ))))
++$(shell mkdir -p $(sort $(OUTPUT)/$(ARCH_DIR) $(dir $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ))))
+
+ $(filter-out $(SPLIT_TEST_GEN_PROGS), $(TEST_GEN_PROGS)) \
+ $(TEST_GEN_PROGS_EXTENDED): %: %.o
$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_ARCH) $< $(LIBKVM_OBJS) $(LDLIBS) -o $@
$(TEST_GEN_OBJ): $(OUTPUT)/%.o: %.c
$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $< -o $@
@@@ -298,8 -305,8 +305,8 @@@ $(LIBKVM_S_OBJ): $(OUTPUT)/%.o: %.S $(G
$(LIBKVM_STRING_OBJ): $(OUTPUT)/%.o: %.c
$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -ffreestanding $< -o $@
-x := $(shell mkdir -p $(sort $(dir $(TEST_GEN_PROGS))))
+$(shell mkdir -p $(sort $(dir $(TEST_GEN_PROGS))))
- $(SPLIT_TESTS_OBJS): $(GEN_HDRS)
+ $(SPLIT_TEST_GEN_OBJ): $(GEN_HDRS)
$(TEST_GEN_PROGS): $(LIBKVM_OBJS)
$(TEST_GEN_PROGS_EXTENDED): $(LIBKVM_OBJS)
$(TEST_GEN_OBJ): $(GEN_HDRS)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the kvm-riscv tree with the perf tree
@ 2024-06-28 18:56 Mark Brown
2024-07-02 19:06 ` Namhyung Kim
2024-07-17 4:16 ` Stephen Rothwell
0 siblings, 2 replies; 4+ messages in thread
From: Mark Brown @ 2024-06-28 18:56 UTC (permalink / raw)
To: Anup Patel
Cc: Ian Rogers, Linux Kernel Mailing List, Linux Next Mailing List,
Namhyung Kim, Shenlin Liang
[-- Attachment #1: Type: text/plain, Size: 1307 bytes --]
Hi all,
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the kvm-riscv tree with the perf tree
2024-06-28 18:56 Mark Brown
@ 2024-07-02 19:06 ` Namhyung Kim
2024-07-17 4:16 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Namhyung Kim @ 2024-07-02 19:06 UTC (permalink / raw)
To: Mark Brown
Cc: Anup Patel, Ian Rogers, Linux Kernel Mailing List,
Linux Next Mailing List, Shenlin Liang
Hello,
On Fri, Jun 28, 2024 at 11:57 AM Mark Brown <broonie@kernel•org> wrote:
>
> Hi all,
>
> 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.
Thanks for the fix, it looks good to me. I'll remember this
and report to Linus when I send the pull request later.
Thanks,
Namhyung
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the kvm-riscv tree with the perf tree
2024-06-28 18:56 Mark Brown
2024-07-02 19:06 ` Namhyung Kim
@ 2024-07-17 4:16 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2024-07-17 4:16 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Mark Brown, Anup Patel, Ian Rogers, Linux Kernel Mailing List,
Linux Next Mailing List, Namhyung Kim, Shenlin Liang, KVM
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-17 4:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-07 3:54 linux-next: manual merge of the kvm-riscv tree with the perf tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-06-28 18:56 Mark Brown
2024-07-02 19:06 ` Namhyung Kim
2024-07-17 4:16 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox