diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 17:35:41 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-26 17:35:41 -0800 |
commit | db2ab474c4a434872e1794c2af8b2e561caa756e (patch) | |
tree | b2edb128f38e0a799508e2cd390d802f2d944ceb /fs/buffer.c | |
parent | 312a466155108329c458049dc76a21ad56106960 (diff) | |
parent | aa02ef099cff042c2a9109782ec2bf1bffc955d4 (diff) | |
download | linux-db2ab474c4a434872e1794c2af8b2e561caa756e.tar.bz2 |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu updates from Ingo Molnar:
"Misc changes:
- Fix nr_cpus= boot option interaction bug with logical package
management
- Clean up UMIP detection messages
- Add WBNOINVD instruction detection
- Remove the unused get_scattered_cpuid_leaf() function"
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/topology: Use total_cpus for max logical packages calculation
x86/umip: Make the UMIP activated message generic
x86/umip: Print UMIP line only once
x86/cpufeatures: Add WBNOINVD feature definition
x86/cpufeatures: Remove get_scattered_cpuid_leaf()
Diffstat (limited to 'fs/buffer.c')
0 files changed, 0 insertions, 0 deletions