From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 May 2019 20:01:16 +0000 (-0700)
Subject: Merge branch 'core-speculation-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v5.2-rc1~210
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0a499fc5c37e6db096969a83534fd98a2bf2b36c;p=linux.git

Merge branch 'core-speculation-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull speculation mitigation update from Ingo Molnar:
 "This adds the "mitigations=" bootline option, which offers a
  cross-arch set of options that will work on x86, PowerPC and s390 that
  will map to the arch specific option internally"

* 'core-speculation-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  s390/speculation: Support 'mitigations=' cmdline option
  powerpc/speculation: Support 'mitigations=' cmdline option
  x86/speculation: Support 'mitigations=' cmdline option
  cpu/speculation: Add 'mitigations=' cmdline option
---

0a499fc5c37e6db096969a83534fd98a2bf2b36c