diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 15:01:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 15:01:43 -0800 |
| commit | 3a5dc1fafb016560315fe45bb4ef8bde259dd1bc (patch) | |
| tree | 6de33857df82f8b7f2200345192cf58939cb5823 /fs/ubifs/journal.c | |
| parent | 3100e448e7d74489a96cb7b45d88fe6962774eaa (diff) | |
| parent | 25cdb9c86826f8d035d8aaa07fc36832e76bd8a0 (diff) | |
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
Diffstat (limited to 'fs/ubifs/journal.c')
0 files changed, 0 insertions, 0 deletions