From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Oct 2014 11:32:26 +0000 (-0400)
Subject: Merge tag 'ktest-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v3.18-rc1~83
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6bbcb1d3a2e0a31593e3b7d9bfd112fa7f447141;p=linux-2.6-block.git

Merge tag 'ktest-v3.18' of git://git./linux/kernel/git/rostedt/linux-ktest

Pull ktest update from Steven Rostedt:
 "A fix and a clean up to ktest, as well as two small features.

   - A way to allow users to skip a manual bisect.
   - Allowing cherry picked patches to be tested.

  The cherry pick worked for a test I needed, but stressing it may not
  have all the desired effects.  It doesn't cause any regressions so I
  kept it in"

* tag 'ktest-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Don't bother with bisect good or bad on replay
  ktest: Fix check for new kernel success on rebooting to good kernel
  ktest: add ability to skip during BISECT_MANUAL
  ktest: Add PATCHCHECK_CHERRY
---

6bbcb1d3a2e0a31593e3b7d9bfd112fa7f447141