diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-07 14:50:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-07 14:50:38 -0700 |
commit | 813895f8dcb31bc6b0e9f5fc35e8c687a467f3dd (patch) | |
tree | 576996d2cae905f4af87a8604cfa5c59bdef54f5 /drivers/infiniband | |
parent | d4c54919ed86302094c0ca7d48a8cbd4ee753e92 (diff) | |
parent | 745c51673e289acf4d9ffc2835524de73ef923fd (diff) | |
download | blackbird-obmc-linux-813895f8dcb31bc6b0e9f5fc35e8c687a467f3dd.tar.gz blackbird-obmc-linux-813895f8dcb31bc6b0e9f5fc35e8c687a467f3dd.zip |
Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"A significantly larger than I'd like set of patches for just below the
wire. All of these, however, fix real problems.
The one thing that is genuinely scary in here is the change of SMP
initialization, but that *does* fix a confirmed hang when booting
virtual machines.
There is also a patch to actually do the right thing about not
offlining a CPU when there are not enough interrupt vectors available
in the system; the accounting was done incorrectly. The worst case
for that patch is that we fail to offline CPUs when we should (the new
code is strictly more conservative than the old), so is not
particularly risky.
Most of the rest is minor stuff; the EFI patches are all about
exporting correct information to boot loaders and kexec"
* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: EFI_MIXED should not prohibit loading above 4G
x86/smpboot: Initialize secondary CPU only if master CPU will wait for it
x86/smpboot: Log error on secondary CPU wakeup failure at ERR level
x86: Fix list/memory corruption on CPU hotplug
x86: irq: Get correct available vectors for cpu disable
x86/efi: Do not export efi runtime map in case old map
x86/efi: earlyprintk=efi,keep fix
Diffstat (limited to 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions