>> new x86 feature bits should definitely show up in the x86 tree too So can we add sse4.1 into this patch also as: #define X86_FEATURE_XMM4_1 (4*32+19) even though now no obvious user is asking it in kernel. -----Original Message----- From: Ingo Molnar [mailto:mingo@xxxxxxx] Sent: 2008年8月25日 15:39 To: Herbert Xu Cc: Stephen Rothwell; linux-next@xxxxxxxxxxxxxxx; Siddha, Suresh B; Zhang, Austin; Thomas Gleixner; H. Peter Anvin Subject: Re: linux-next: manual merge of the crypto tree * Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote: > 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. new x86 feature bits should definitely show up in the x86 tree too. Could you please send a standalone patch that only touches the .h file, which could be applied to v2.6.27 as well? Thanks, Ingo -- 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
