From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Aug 2017 19:49:43 +0000 (-0700)
Subject: Merge tag 'linux-kselftest-4.13-rc6-fixes' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=40c6d1b9e2fc4251ca19fa69398f6fa34e813e27;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'linux-kselftest-4.13-rc6-fixes' of git://git./linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "This update consists of important compile and run-time error fixes to
  timers/freq-step, kmod, and sysctl tests"

* tag 'linux-kselftest-4.13-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: timers: freq-step: fix compile error
  selftests: futex: fix run_tests target
  test_sysctl: fix sysctl.sh by making it executable
  test_kmod: fix kmod.sh by making it executable
---

40c6d1b9e2fc4251ca19fa69398f6fa34e813e27