tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fix from Thomas Gleixner:
"A single fix to unbreak the vdso32 build for 64bit kernels caused by
excess #includes in the mshyperv header"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mshyperv: Remove excess #includes from mshyperv.h

Linus Torvalds a4fd8b3a 5f4b37d8

+1 -2
+1 -2
arch/x86/include/asm/mshyperv.h
··· 2 2 #define _ASM_X86_MSHYPER_H 3 3 4 4 #include <linux/types.h> 5 - #include <linux/interrupt.h> 6 - #include <linux/clocksource.h> 5 + #include <linux/atomic.h> 7 6 #include <asm/hyperv.h> 8 7 9 8 /*