tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds c0f53f0d 30bbcb44

+16 -3
+3 -2
MAINTAINERS
··· 7261 7261 F: include/linux/of_dma.h 7262 7262 7263 7263 DMA MAPPING BENCHMARK 7264 - M: Xiang Chen <chenxiang66@hisilicon.com> 7264 + M: Barry Song <baohua@kernel.org> 7265 + M: Qinxin Xia <xiaqinxin@huawei.com> 7265 7266 L: iommu@lists.linux.dev 7266 7267 F: kernel/dma/map_benchmark.c 7267 - F: tools/testing/selftests/dma/ 7268 + F: tools/dma/ 7268 7269 7269 7270 DMA MAPPING HELPERS 7270 7271 M: Marek Szyprowski <m.szyprowski@samsung.com>
+2
tools/testing/selftests/kexec/.gitignore
··· 1 + # SPDX-License-Identifier: GPL-2.0-only 2 + test_kexec_jump
+1
tools/testing/selftests/kselftest_harness/Makefile
··· 2 2 3 3 TEST_GEN_PROGS_EXTENDED := harness-selftest 4 4 TEST_PROGS := harness-selftest.sh 5 + TEST_FILES := harness-selftest.expected 5 6 EXTRA_CLEAN := harness-selftest.seen 6 7 7 8 include ../lib.mk
+4 -1
tools/testing/selftests/lib.mk
··· 228 228 $(LINK.S) $^ $(LDLIBS) -o $@ 229 229 endif 230 230 231 + # Extract the expected header directory 232 + khdr_output := $(patsubst %/usr/include,%,$(filter %/usr/include,$(KHDR_INCLUDES))) 233 + 231 234 headers: 232 - $(Q)$(MAKE) -C $(top_srcdir) headers 235 + $(Q)$(MAKE) -f $(top_srcdir)/Makefile -C $(khdr_output) headers 233 236 234 237 .PHONY: run_tests all clean install emit_tests gen_mods_dir clean_mods_dir headers
+6
tools/testing/selftests/watchdog/watchdog-test.c
··· 332 332 if (oneshot) 333 333 goto end; 334 334 335 + /* Check if WDIOF_KEEPALIVEPING is supported */ 336 + if (!(info.options & WDIOF_KEEPALIVEPING)) { 337 + printf("WDIOC_KEEPALIVE not supported by this device\n"); 338 + goto end; 339 + } 340 + 335 341 printf("Watchdog Ticking Away!\n"); 336 342 337 343 /*