From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Mar 2024 22:38:29 +0000 (-0700)
Subject: Merge tag 'linux_kselftest-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: nvme-6.9-2024-04-04~22
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1ab5c8a338c470ceda8221e3a00ad0fc0a3be55b;p=nvme.git

Merge tag 'linux_kselftest-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "Fixes to seccomp and ftrace tests and a change to add config file for
  dmabuf-heap test to increase coverage"

* tag 'linux_kselftest-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: dmabuf-heap: add config file for the test
  selftests/seccomp: Try to fit runtime of benchmark into timeout
  selftests/ftrace: Fix event filter target_func selection
---

1ab5c8a338c470ceda8221e3a00ad0fc0a3be55b