diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 09:59:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 09:59:04 -0700 |
| commit | 08328814256d888634ff15ba8fb67e2ae4340b64 (patch) | |
| tree | f8fd156c069214ea57547505294241a08ca957f7 /fs/f2fs | |
| parent | 9d71bdfbcba12b55ed671166896cd785dcd57216 (diff) | |
| parent | 0e60439c22ec551e9b5780eba73ddfeb63ab63d9 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes, plus hw-enablement changes:
- fix persistent RAM handling
- remove pkeys warning
- remove duplicate macro
- fix debug warning in irq handler
- add new 'Knights Mill' CPU related constants and enable the perf bits"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel/uncore: Add Knights Mill CPUID
perf/x86/intel/rapl: Add Knights Mill CPUID
perf/x86/intel: Add Knights Mill CPUID
x86/cpu/intel: Add Knights Mill to Intel family
x86/e820: Don't merge consecutive E820_PRAM ranges
pkeys: Remove easily triggered WARN
x86: Remove duplicate rtit status MSR macro
x86/smp: Add irq_enter/exit() in smp_reschedule_interrupt()
Diffstat (limited to 'fs/f2fs')
0 files changed, 0 insertions, 0 deletions