Re: [PATCH] finish processor.h integration

[Glauber de Oliveira Costa]

On Dec 19, 2007 8:17 AM, Ingo Molnar <mingo@xxxxxxx> wrote:
>
> * Glauber de Oliveira Costa <gcosta@xxxxxxxxxx> wrote:
>
> > What's left in processor_32.h and processor_64.h cannot be cleanly
> > integrated. However, it's just a couple of definitions. They are moved
> > to processor.h around ifdefs, and the original files are deleted. Note
> > that there's much less headers included in the final version.
>
> hm, doesnt apply;
>
>  Applying patch patches/x86-finish-processor-h-integration.patch
>  patching file include/asm-x86/processor.h
>  Hunk #2 FAILED at 287.
>  Hunk #3 FAILED at 311.
>  Hunk #4 succeeded at 786 (offset -8 lines).
>  2 out of 4 hunks FAILED -- rejects in file include/asm-x86/processor.h
>
> i fixed it up by hand - the result is below - does it look OK to you?
> (Also, could you check latest x86.git whether i've picked up all your
> patches correctly - the reject might be indicative of some missing
> pieces.)

Your fix is okay. The other patches seems to be all there. The reason
for this is that
it conflicts with Roland's (welcome) i387 patches.


-- 
Glauber de Oliveira Costa.
"Free as in Freedom"
http://glommer.net

"The less confident you are, the more serious you have to act."
--
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/