It somewhat concerns me, because one of the conflicts is generated by
collision with x2apic. The rest of them I don't think are too problematic.
hpa, confilicts with x2apic branch are very small and related to cpuid bits.
commit 04df16d2465cbb59b84c9c57ad865dbbeebadad8
Author: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Date: Tue Jul 29 10:29:18 2008 -0700
x86, xsave: xsave cpuid feature bits
Add xsave CPU feature bits.
and
commit 32e1d0a0651004f5fe47f85a2a5c725ad579a90c
Author: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Date: Thu Jul 10 11:16:50 2008 -0700
x64, x2apic/intr-remap: cpuid bits for x2apic feature
cpuid feature for x2apic.
Both of these patches are straight forward, simple and can be moved
to x86/core(?) now, if that helps.