[uml-devel] Misimported patch in your tree

[uml-devel] Misimported patch in your tree

[Blaisorblade]

Just looking at 

http://user-mode-linux.sourceforge.net/work/current/2.6/2.6.15-rc1/patches/uml-reuse-i386-cpu-optim-fix.patch

And noticed it was barfed in your importing - you lost some piece from it. I 
was moving "source "arch/i386/Kconfig.cpu"" to arch/um/Kconfig.i386, not 
removing it. Look at current Linus tree.

Once you get that fixed, you should also remove l1-shift just below - the bug 
you see is due to the mismerge.

Also the patch makes sure uml avoids cmpxchg on i386, as it should.
-- 
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it



-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Re: [uml-devel] Misimported patch in your tree

[Jeff Dike]

On Sat, Nov 19, 2005 at 03:58:23AM +0100, Blaisorblade wrote:
> Also the patch makes sure uml avoids cmpxchg on i386, as it should.

OK, I'll take a look at this next time I'm awake and alert...

				Jeff


-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel