diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 21:35:46 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 21:35:46 +0100 |
commit | 206f18f2caaf965870ff558e237e9c23164a66f0 (patch) | |
tree | cada65e0ec7c80ddbcff85ac83a00786ad9aeb48 /arch/x86/purgatory | |
parent | Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | x86/purgatory, build: Suppress kexec-purgatory.c is up to date message (diff) | |
parent | Merge tag 'x86_queue_for_3.19' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | x86/kconfig/defconfig: Enable CONFIG_FHANDLE=y (diff) | |
download | linux-206f18f2caaf965870ff558e237e9c23164a66f0.tar.xz linux-206f18f2caaf965870ff558e237e9c23164a66f0.zip |
Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build, cleanup and defconfig updates from Ingo Molnar:
"A single minor build change to suppress a repetitive build messages,
misc cleanups and a defconfig update"
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/purgatory, build: Suppress kexec-purgatory.c is up to date message
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, CPU, AMD: Move K8 TLB flush filter workaround to K8 code
x86, espfix: Remove stale ptemask
x86, msr: Use seek definitions instead of hard-coded values
x86, msr: Convert printk to pr_foo()
x86, msr: Use PTR_ERR_OR_ZERO
x86/simplefb: Use PTR_ERR_OR_ZERO
x86/sysfb: Use PTR_ERR_OR_ZERO
x86, cpuid: Use PTR_ERR_OR_ZERO
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kconfig/defconfig: Enable CONFIG_FHANDLE=y