From owner-freebsd-current@FreeBSD.ORG Tue Dec 22 17:42:54 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 347A51065679 for ; Tue, 22 Dec 2009 17:42:54 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirg.bris.ac.uk (dirg.bris.ac.uk [137.222.10.102]) by mx1.freebsd.org (Postfix) with ESMTP id E277B8FC1A for ; Tue, 22 Dec 2009 17:42:53 +0000 (UTC) Received: from seis.bris.ac.uk ([137.222.10.93]) by dirg.bris.ac.uk with esmtp (Exim 4.69) (envelope-from ) id 1NN8kz-0007l2-Up; Tue, 22 Dec 2009 17:42:52 +0000 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by seis.bris.ac.uk with esmtp (Exim 4.67) (envelope-from ) id 1NN8kz-00056U-3l; Tue, 22 Dec 2009 17:42:49 +0000 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.3/8.14.3) with ESMTP id nBMHgmdo061739; Tue, 22 Dec 2009 17:42:48 GMT (envelope-from mexas@bristol.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.3/8.14.3/Submit) id nBMHgmkp061738; Tue, 22 Dec 2009 17:42:48 GMT (envelope-from mexas@bristol.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bristol.ac.uk using -f Date: Tue, 22 Dec 2009 17:42:48 +0000 From: Anton Shterenlikht To: Anton Shterenlikht Message-ID: <20091222174248.GA61700@mech-cluster241.men.bris.ac.uk> References: <20091222141939.GA60890@mech-cluster241.men.bris.ac.uk> <86iqbz5bju.fsf@ds4.des.no> <20091222153638.GB61098@mech-cluster241.men.bris.ac.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20091222153638.GB61098@mech-cluster241.men.bris.ac.uk> User-Agent: Mutt/1.5.20 (2009-06-14) X-Spam-Score: -5.0 X-Spam-Level: ----- Cc: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= , freebsd-current@freebsd.org, "b. f." Subject: Re: still trouble with pci.c on i386 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2009 17:42:54 -0000 On Tue, Dec 22, 2009 at 03:36:38PM +0000, Anton Shterenlikht wrote: > On Tue, Dec 22, 2009 at 03:27:17PM +0100, Dag-Erling Smørgrav wrote: > > Anton Shterenlikht writes: > > > However, I'm not sure > > > what the strategy is for reverting to previous revisions. > > > For example if I know (from previous posts) that r 200341 > > > breaks src/sys/dev/pci/pci.c and pci_pci.c, then which > > > revision should I sync with? > > > > r200340, of course. > > > > > First I updated all src: > > > > > > svn update svn://svn.freebsd.org/base/head /usr/src > > > > > > then I reverted to r 200315, but only for pci src: > > > > > > svn update -r 200315 svn://svn.freebsd.org/base/head/sys/dev/pci /usr/src/sys/dev/pci > > > > Umm, is your /usr/src actually a Subversion working copy? > > > > Both svn commands are wrong, didn't you notice the error messages? > > no, I don't think so. > > I tried to follow this guide: http://wiki.freebsd.org/SubversionPrimer > > and this book: http://svnbook.red-bean.com/ > > Are these adequate? > > > The easiest way to do this is to apply the problematic revision in > > reverse: > > > > % cd /usr/src/sys > > % svn diff -c200341 http://svn.freebsd.org/base/head/sys | patch -R I did just that, rebuilt kernel, but still get panic. Perhaps I misunderstand svn, but isn't it possible that the changes which cause panic are not between 200341 and 200340, but have to be recovered from an earlier revision. For example, looking at http://svn.freebsd.org/viewvc/base/head/sys/dev/pci/pci.c?view=log&pathrev=200341 the previous version of pci.c was in r 200315, and the previous version of pci_pci.c was in r192481. So shouldn't I revert to 192481? I'll try to roll back to r192481, and see if this helps. If this is not the right list for these quiestions, just tell me off. many thanks -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423