Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux_kselftest-next-6.18-rc1 

- Fixes 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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPZKym/RZuOCGeA/kCwJExA0NQxwFAmjbD5YACgkQCwJExA0N
 QxzUPw//U/sUb/+3eAOvF3A698j54u7Phtm9VTzyXdGmZ3tXDsnkP1spRoK32F5d
 kO2qhTIGPoo8FKS8CDL8a8UUr3TvqEd7+8Hcv37s/JluYCDnLuRJ87XTAXoH2vWy
 LkLD41Gt2BySH//99ciBB+N3DuAKc/+Ln5YXgPTIkzOEm+8a6Ux0lW5RjF+RzkH9
 jGXyoSFdeQcWKEz/CJ9Mp7gwgwig9KTAIL62hB69aP35Wjbw+le1POCs6bo4UuzU
 A+XdNit6Hau/JKS+Sw2/lpMcMz+Aev4gdFo2FukPuJSLJMR7KVNyiCVuIHIVI1oC
 v4yj5/QfUgZzWojweI9IVvt4BCuiSh3ke26cxO+xYSWTIlSbBDpAYRe3AVSp5xGq
 aPhaviqlgDLzxVuXTmGCyrxhpybgxGOQGmo6NulJ8wGaQ1GLllptB6hKnKrLBTrp
 jIwKUVBcl/xIeP4sd8vIvTNTyL56/XJYnouZYF+IXkX/8BY9L4OJycjPNgvZ0+IK
 LsTVXb2gdMghEGUFR2XNwoQljpyPSUFFcqoteOCaVhHaeD0CEAGBVSQNa7m3MtkO
 0q6pu/XfQAziVd6/dllDGueWTjzqvNChTipSe9dSgolZgKrvc2t4bw48rB+oORPe
 f/cBIWjpyZlwpggb8aSC4KAIkTG8ugz4EIOV6t3a7IAx6K71zwQ=
 =Z4UE
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-10-01 20:41:10 -07:00
parent 30bbcb4470 1969201341
commit c0f53f0d2e
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MAINTAINERS
View File

@ -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>

2
tools/testing/selftests/kexec/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0-only
test_kexec_jump

1
tools/testing/selftests/kselftest_harness/Makefile
View File

@ -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

5
tools/testing/selftests/lib.mk
View File

@ -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

6
tools/testing/selftests/watchdog/watchdog-test.c
View File

@ -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");
/*