diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 23:35:46 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 23:35:46 +0300 |
| commit | 206f18f2caaf965870ff558e237e9c23164a66f0 (patch) | |
| tree | cada65e0ec7c80ddbcff85ac83a00786ad9aeb48 /arch/x86/purgatory | |
| parent | b6444bd0a18eb47343e16749ce80a6ebd521f124 (diff) | |
| parent | 3ea4b8ee2419e21295cabab66c317612c5a55d26 (diff) | |
| parent | 29cc3730370f5fef9762a90fb515a8b1cd5fd7a6 (diff) | |
| parent | 15bae280e412e79d74912c7ae6b6a002444edb1f (diff) | |
| download | linux-206f18f2caaf965870ff558e237e9c23164a66f0.tar.xz | |
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