From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Aug 2021 16:30:24 +0000 (-1000)
Subject: Merge tag 'x86_urgent_for_v5.14_rc6' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~560
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b045b8cc865316062e520693ad6c8bac85aabece;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'x86_urgent_for_v5.14_rc6' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov:
 "Two fixes:

   - An objdump checker fix to ignore parenthesized strings in the
     objdump version

   - Fix resctrl default monitoring groups reporting when new subgroups
     get created"

* tag 'x86_urgent_for_v5.14_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Fix default monitoring groups reporting
  x86/tools: Fix objdump version check again
---

b045b8cc865316062e520693ad6c8bac85aabece