Re: [PATCH] x86/tip: AMDC1E and XTOPOLOGY conflict in cpufeature

[H. Peter Anvin]

Venki Pallipadi wrote:
> Fix two features from conflicting in feature bits. Looks like the conflict
> came from automatic conflict resolution?
>
> Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@xxxxxxxxx>

Applied to x86/cpu, thanks!

	-hpa
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/