From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Nov 2020 17:36:10 +0000 (-0800)
Subject: Merge tag 'trace-v5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.15~2435
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6186313d06dfadbfd0cda5e36e485877d6600179;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'trace-v5.10-rc3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull bootconfig fix from Steven Rostedt:
 "Fix alignment of bootconfig

  GRUB may align the init ramdisk size to 4 bytes, the magic number at
  the end of the init ramdisk that denotes bootconfig is attached may
  not be at the exact end of the ramdisk. The kernel needs to check back
  at least 4 bytes"

* tag 'trace-v5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  bootconfig: Extend the magic check range to the preceding 3 bytes
---

6186313d06dfadbfd0cda5e36e485877d6600179