On Mon, Aug 25, 2008 at 04:44:18PM +1000, Stephen Rothwell wrote:
>
> On Thu, 7 Aug 2008 13:35:25 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > Today's linux-next merge of the crypto tree got a conflict in
> > include/asm-x86/cpufeature.h between commit
> > 32e1d0a0651004f5fe47f85a2a5c725ad579a90c ("x64, x2apic/intr-remap: cpuid
> > bits for x2apic feature") from the x86 tree and commit
> > 1f4f8a5d7935c81b5b3c7601ec9ac021db30ba4f ("crypto: crc32c - Use Intel
> > CRC32 instruction") from the crypto tree.
> >
> > Just simple overlapping additions. I added both of them and can carry
> > the fixup.
>
> This now also conflicts with commit
> a648bf4632628c787abb0514277f2a231fca39ca ("x86, xsave: xsave cpuid
> feature bits") from the x86 tree.
>
> The fixup looks like below. Maybe the X86_FEATURE_XMM4_2 bits could also
Yep looks good.
> be added in the x86 tree.
Sure that sounds like a good idea.
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
