Commit c0f53f0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-next-6.18-rc1' of... 

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

Pull kselftest updates from Shuah Khan:

 - Fix watchdog test to exit when device doesn't support keep-alive

 - Fix missing header build complaints during out of tree build

 - A few minor fixes to git ignore

 - MAINTAINERS file change to update dma_map_benchmark

* tag 'linux_kselftest-next-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  MAINTAINERS: add myself and Barry to dma_map_benchmark maintainers
  selftests/kexec: Ignore selftest binary
  selftests: always install UAPI headers to the correct directory
  selftests/kselftest_harness: Add harness-selftest.expected to TEST_FILES
  selftests: watchdog: skip ping loop if WDIOF_KEEPALIVEPING not supported
parents 30bbcb44 19692013

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -7261,10 +7261,11 @@ F: include/linux/dmaengine.h 
F:	include/linux/of_dma.h









DMA MAPPING BENCHMARK









M:	Xiang Chen <chenxiang66@hisilicon.com>









M:	Barry Song <baohua@kernel.org>









M:	Qinxin Xia <xiaqinxin@huawei.com>









L:	iommu@lists.linux.dev









F:	kernel/dma/map_benchmark.c









F:	tools/testing/selftests/dma/









F:	tools/dma/

















DMA MAPPING HELPERS









M:	Marek Szyprowski <m.szyprowski@samsung.com>
































tools/testing/selftests/kexec/.gitignore
0 → 100644



+2
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









test_kexec_jump
























tools/testing/selftests/kselftest_harness/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -2,6 +2,7 @@

















TEST_GEN_PROGS_EXTENDED := harness-selftest









TEST_PROGS := harness-selftest.sh









TEST_FILES := harness-selftest.expected









EXTRA_CLEAN := harness-selftest.seen



















include ../lib.mk
























tools/testing/selftests/lib.mk



+4
−1






























Original line number
Diff line number
Diff line







@@ -228,7 +228,10 @@ $(OUTPUT)/%:%.S







	$(LINK.S) $^ $(LDLIBS) -o $@









endif



















# Extract the expected header directory









khdr_output := $(patsubst %/usr/include,%,$(filter %/usr/include,$(KHDR_INCLUDES)))



















headers:









	$(Q)$(MAKE) -C $(top_srcdir) headers









	$(Q)$(MAKE) -f $(top_srcdir)/Makefile -C $(khdr_output) headers



















.PHONY: run_tests all clean install emit_tests gen_mods_dir clean_mods_dir headers
























tools/testing/selftests/watchdog/watchdog-test.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -332,6 +332,12 @@ int main(int argc, char *argv[])







	if (oneshot)









		goto end;



















	/* Check if WDIOF_KEEPALIVEPING is supported */









	if (!(info.options & WDIOF_KEEPALIVEPING)) {









		printf("WDIOC_KEEPALIVE not supported by this device\n");









		goto end;









	}



















	printf("Watchdog Ticking Away!\n");



















	/*