From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Nov 2023 03:08:10 +0000 (-1000)
Subject: Merge tag 'linux_kselftest-next-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.7-rc1~119
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/7dc0e9c7dda66bd91eeada00d90033e3eb647fc3?hp=-c

Merge tag 'linux_kselftest-next-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest updates from Shuah Khan:

 - kbuild kselftest-merge target fixes

 - fixes to several tests

 - resctrl test fixes and enhancements

 - ksft_perror() helper and reporting improvements

 - printf attribute to kselftest prints to improve reporting

 - documentation and clang build warning fixes

The bulk of the patches are for resctrl fixes and enhancements.

* tag 'linux_kselftest-next-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (51 commits)
  selftests/resctrl: Fix MBM test failure when MBA unavailable
  selftests/clone3: Report descriptive test names
  selftests:modify the incorrect print format
  selftests/efivarfs: create-read: fix a resource leak
  selftests/ftrace: Add riscv support for kprobe arg tests
  selftests/ftrace: add loongarch support for kprobe args char tests
  selftests/amd-pstate: Added option to provide perf binary path
  selftests/amd-pstate: Fix broken paths to run workloads in amd-pstate-ut
  selftests/resctrl: Move run_benchmark() to a more fitting file
  selftests/resctrl: Fix schemata write error check
  selftests/resctrl: Reduce failures due to outliers in MBA/MBM tests
  selftests/resctrl: Fix feature checks
  selftests/resctrl: Refactor feature check to use resource and feature name
  selftests/resctrl: Move _GNU_SOURCE define into Makefile
  selftests/resctrl: Remove duplicate feature check from CMT test
  selftests/resctrl: Extend signal handler coverage to unmount on receiving signal
  selftests/resctrl: Fix uninitialized .sa_flags
  selftests/resctrl: Cleanup benchmark argument parsing
  selftests/resctrl: Remove ben_count variable
  selftests/resctrl: Make benchmark command const and build it with pointers
  ...
---

7dc0e9c7dda66bd91eeada00d90033e3eb647fc3
diff --combined Makefile
index c3ba618ca6a4,fd8329474e86..a1e931ff7eb0
--- a/Makefile
+++ b/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  VERSION = 6
  PATCHLEVEL = 6
  SUBLEVEL = 0
 -EXTRAVERSION = -rc2
 +EXTRAVERSION =
  NAME = Hurr durr I'ma ninja sloth
  
  # *DOCUMENTATION*
@@@ -378,7 -378,7 +378,7 @@@ include $(srctree)/scripts/subarch.incl
  # When performing cross compilation for other architectures ARCH shall be set
  # to the target architecture. (See arch/* for the possibilities).
  # ARCH can be set during invocation of make:
 -# make ARCH=ia64
 +# make ARCH=arm64
  # Another way is to have ARCH set in the environment.
  # The default ARCH is the host where make is executed.
  
@@@ -386,7 -386,7 +386,7 @@@
  # during compilation. Only gcc and related bin-utils executables
  # are prefixed with $(CROSS_COMPILE).
  # CROSS_COMPILE can be set on the command line
 -# make CROSS_COMPILE=ia64-linux-
 +# make CROSS_COMPILE=aarch64-linux-gnu-
  # Alternatively CROSS_COMPILE can be set in the environment.
  # Default value for CROSS_COMPILE is not to prefix executables
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
@@@ -1367,8 -1367,8 +1367,8 @@@ kselftest-%: headers FORC
  PHONY += kselftest-merge
  kselftest-merge:
  	$(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!))
- 	$(Q)find $(srctree)/tools/testing/selftests -name config | \
- 		xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config
+ 	$(Q)find $(srctree)/tools/testing/selftests -name config -o -name config.$(UTS_MACHINE) | \
+ 		xargs $(srctree)/scripts/kconfig/merge_config.sh -y -m $(objtree)/.config
  	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
  
  # ---------------------------------------------------------------------------
@@@ -1474,7 -1474,7 +1474,7 @@@ endif # CONFIG_MODULE
  # Directories & files removed with 'make clean'
  CLEAN_FILES += vmlinux.symvers modules-only.symvers \
  	       modules.builtin modules.builtin.modinfo modules.nsdeps \
 -	       compile_commands.json .thinlto-cache rust/test rust/doc \
 +	       compile_commands.json .thinlto-cache rust/test \
  	       rust-project.json .vmlinux.objs .vmlinux.export.c
  
  # Directories & files removed with 'make mrproper'