From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1EdInJ-0000p8-5F for user-mode-linux-devel@lists.sourceforge.net; Fri, 18 Nov 2005 18:49:37 -0800 Received: from smtp004.mail.ukl.yahoo.com ([217.12.11.35]) by mail.sourceforge.net with smtp (Exim 4.44) id 1EdInG-0003CA-Op for user-mode-linux-devel@lists.sourceforge.net; Fri, 18 Nov 2005 18:49:37 -0800 From: Blaisorblade MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200511190358.23945.blaisorblade@yahoo.it> Subject: [uml-devel] Misimported patch in your tree Sender: user-mode-linux-devel-admin@lists.sourceforge.net Errors-To: user-mode-linux-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: The user-mode Linux development list List-Post: List-Help: List-Subscribe: , List-Archive: Date: Sat, 19 Nov 2005 03:58:23 +0100 To: Jeff Dike , user-mode-linux-devel@lists.sourceforge.net 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