From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jul 2018 00:23:58 +0000 (-0700)
Subject: Merge branch 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~8400
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43227e098c36b6338d55bfb232ab52896f782cda;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'x86-pti-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 pti fixes from Ingo Molnar:
 "An APM fix, and a BTS hardware-tracing fix related to PTI changes"

* 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apm: Don't access __preempt_count with zeroed fs
  x86/events/intel/ds: Fix bts_interrupt_threshold alignment
---

43227e098c36b6338d55bfb232ab52896f782cda