]> www.infradead.org Git - users/hch/block.git/commit
projects / users / hch / block.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 48b1db7 6f6060a)
Merge branch 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jul 2018 00:23:58 +0000 (17:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jul 2018 00:23:58 +0000 (17:23 -0700)
commit43227e098c36b6338d55bfb232ab52896f782cda
tree3376c1e10b52eb370ddf9294300e47d115cfe300tree
parent48b1db7c7a952b5e7021826e727baedae35d7f3fcommit | diff
parent6f6060a5c9cc76fdbc22748264e6aa3779ec2427commit | diff
Merge branch 'x86-pti-urgent-for-linus' of git://git.kernel.org/pub/scm/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
Unnamed repository; edit this file 'description' to name the repository.