From mboxrd@z Thu Jan 1 00:00:00 1970 From: Otto Solares Subject: Re: Merge of Luca and Ben's sysfs work for Radeon Date: Fri, 26 Sep 2003 02:39:46 -0600 Sender: linux-fbdev-devel-admin@lists.sourceforge.net Message-ID: <20030926083946.GA14350@guug.org> References: <20030926023617.GD9615@guug.org> <20030926025744.80379.qmail@web14905.mail.yahoo.com> Mime-Version: 1.0 Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.11] helo=sc8-sf-mx1.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Cipher TLSv1:DES-CBC3-SHA:168) (Exim 3.31-VA-mm2 #1 (Debian)) id 1A2o9K-0001TJ-00 for ; Fri, 26 Sep 2003 01:40:26 -0700 Received: from guug.org ([168.234.203.30] helo=guug.galileo.edu) by sc8-sf-mx1.sourceforge.net with esmtp (Exim 4.22) id 1A2o9J-00068j-Tu for linux-fbdev-devel@lists.sourceforge.net; Fri, 26 Sep 2003 01:40:26 -0700 Content-Disposition: inline In-Reply-To: <20030926025744.80379.qmail@web14905.mail.yahoo.com> Errors-To: linux-fbdev-devel-admin@lists.sourceforge.net List-Help: List-Post: List-Subscribe: , List-Id: List-Unsubscribe: , List-Archive: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Jon Smirl Cc: fb-devel On Thu, Sep 25, 2003 at 07:57:44PM -0700, Jon Smirl wrote: > The merged tree is a copy of everything in Linus' tree plus our fbdev work. > Just treat it like a normal kernel tree. > > make proper > copy your config > make oldconfig > make > > The tree contains all of: > test5 > fbdev work > hundreds of patches in the Linus tree past test5 > > To make sure it is absolutely up to date with Linus, cd into it and: > bk pull bk://linux.bkbits.net/linux-2.5 > This will pull the up to the minute changes from Linus' own tree into yours. done, it finish correctly with: Consistency check passed, resolve complete. > To see the diffs from test5 to present: > bk revtool and find last revision number, probably something like 1.1303. > bk export -tpatch -rv2.6.0-test2,1.1303 -h >../patch > > There will be a lot of diffs, Linus is about ready to tag test6. > > To look at a specific file: > bk revtool file-name > > Now that you have a bk tree you don't have to wait for a tagged release. Just > pull the changes fron Linus' tree when you want to update. Probably am doing something wrong because there are no sane files, just s.*.{c,h} binaries in SCCS subdir so i can't treat it normally: solca@appsrv:~/devel/radeon$ ls drivers/video/aty/SCCS/ s.aty128fb.c s.atyfb.h s.mach64_ct.c s.mach64_gx.c s.radeon_base.c s.radeon_i2c.c s.radeon_pm.c s.atyfb_base.c s.mach64_accel.c s.mach64_cursor.c s.Makefile s.radeonfb.h s.radeon_monitor.c s.xlinit.c -solca ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf