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]
Date: Thu, 7 Mar 2024 14:54:22 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Anup Patel <anup@...infault.org>, Arnaldo Carvalho de Melo
 <arnaldo.melo@...il.com>, Namhyung Kim <namhyung@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Masahiro Yamada
 <masahiroy@...nel.org>, Paolo Bonzini <pbonzini@...hat.com>
Subject: linux-next: manual merge of the kvm-riscv tree with the perf tree

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)

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ