From: Ingo Molnar Date: Tue, 7 Nov 2017 09:53:06 +0000 (+0100) Subject: Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts X-Git-Tag: v4.19~2241^2~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3d9a136815ca9284ade2a897a3b7d2b0084c33c;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts Conflicts: arch/x86/kernel/cpu/Makefile Signed-off-by: Ingo Molnar --- b3d9a136815ca9284ade2a897a3b7d2b0084c33c diff --cc arch/x86/kernel/cpu/Makefile index de260fa,236999c..570e8bb --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@@ -21,8 -22,7 +22,8 @@@ obj-y += common. obj-y += rdrand.o obj-y += match.o obj-y += bugs.o - obj-$(CONFIG_CPU_FREQ) += aperfmperf.o + obj-y += aperfmperf.o +obj-y += cpuid-deps.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o