From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2014 23:01:43 +0000 (-0800)
Subject: Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.19-rc1~144
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3a5dc1fafb016560315fe45bb4ef8bde259dd1bc;p=~emulex%2Finfiniband.git

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

Pull x86 microcode loading updates from Ingo Molnar:
 "The main changes in this cycle are:

   - Reload microcode when resuming and the case when only the early
     loader has been utilized.  (Borislav Petkov)

   - Also, do not load the driver on paravirt guests.  (Boris
     Ostrovsky)"

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode/intel: Fish out the stashed microcode for the BSP
  x86, microcode: Reload microcode on resume
  x86, microcode: Don't initialize microcode code on paravirt
  x86, microcode, intel: Drop unused parameter
  x86, microcode, AMD: Do not use smp_processor_id() in preemtible context
---

3a5dc1fafb016560315fe45bb4ef8bde259dd1bc