From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2020 19:57:50 +0000 (-0700)
Subject: Merge tag 'linux-kselftest-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.7-rc6~18
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ce24729667cf8aaebf290613a6026a50a22c3eee;p=users%2Fhch%2Fmisc.git

Merge tag 'linux-kselftest-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:

 - lkdtm runner fixes to prevent dmesg clearing and shellcheck errors

 - ftrace test handling when test module doesn't exist

 - nsfs test fix to replace zero-length array with flexible-array

 - dmabuf-heaps test fix to return clear error value

* tag 'linux-kselftest-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/lkdtm: Use grep -E instead of egrep
  selftests/lkdtm: Don't clear dmesg when running tests
  selftests/ftrace: mark irqsoff_tracer.tc test as unresolved if the test module does not exist
  tools/testing: Replace zero-length array with flexible-array
  kselftests: dmabuf-heaps: Fix confused return value on expected error testing
---

ce24729667cf8aaebf290613a6026a50a22c3eee