From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 May 2019 23:46:32 +0000 (-0700)
Subject: Merge tag 'ktest-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux... 
X-Git-Tag: v5.4-rc1~977
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b06ed1e7a2fa9b636f368a9e97c3c8877623f8b2;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'ktest-v5.2' of git://git./linux/kernel/git/rostedt/linux-ktest

Pull more ktest updates from Steven Rostedt:

 - Add support for grub2bls boot loader

 - Show name and test iteration number in error message sent in mail

 - Minor fixes and clean ups

* tag 'ktest-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: update sample.conf for grub2bls
  ktest: remove get_grub2_index
  ktest: pass KERNEL_VERSION to POST_KTEST
  ktest: introduce grub2bls REBOOT_TYPE option
  ktest: cleanup get_grub_index
  ktest: introduce _get_grub_index
---

b06ed1e7a2fa9b636f368a9e97c3c8877623f8b2