From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Dec 2020 00:51:27 +0000 (-0800)
Subject: Merge tag 'ktest-v5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: microblaze-v5.12~229
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=33dc9614dc208291d0c4bcdeb5d30d481dcd2c4c

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

Pull ktest fix from Steven Rostedt:
 "Fix issues with grub2bls in ktest.pl

  ktest.pl did not know about grub2bls that was introduced in Fedora 30,
  and now it does"

* tag 'ktest-v5.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest.pl: Fix incorrect reboot for grub2bls
---

33dc9614dc208291d0c4bcdeb5d30d481dcd2c4c