From owner-freebsd-x11@FreeBSD.ORG Tue Mar 10 13:05:41 2009 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 524F21065676 for ; Tue, 10 Mar 2009 13:05:41 +0000 (UTC) (envelope-from alex@mailinglist.ahhyes.net) Received: from syd-srv02.ezyreg.com (syd-srv02.ezyreg.com [117.58.251.3]) by mx1.freebsd.org (Postfix) with ESMTP id C131C8FC1D for ; Tue, 10 Mar 2009 13:05:36 +0000 (UTC) (envelope-from alex@mailinglist.ahhyes.net) Received: from localhost ([127.0.0.1]) by syd-srv02.ezyreg.com with esmtpa (Exim 4.69) (envelope-from ) id 1Lh1Aq-0004jM-SE for freebsd-x11@freebsd.org; Tue, 10 Mar 2009 08:35:08 -0400 Received: from 211.30.26.44 ([211.30.26.44]) by syd-srv02.ezyreg.com (Horde MIME library) with HTTP; Tue, 10 Mar 2009 08:35:08 -0400 Message-ID: <20090310083508.8oyf6s8yiowo0gks@syd-srv02.ezyreg.com> Date: Tue, 10 Mar 2009 08:35:08 -0400 From: alex@mailinglist.ahhyes.net To: freebsd-x11@freebsd.org References: <20090305161651.GB1369@lobo.ewinter.org> <1236275215.1384.50.camel@widget.2hip.net> <20090305180523.GA2039@lobo.ewinter.org> <20090306133119.1af6894c@ernst.jennejohn.org> <1236363408.55221.16.camel@balrog.2hip.net> <20090306203055.582faa02@ernst.jennejohn.org> <1236371734.1671.5.camel@balrog.2hip.net> <49B3D755.2050308@phat.za.net> <1236536316.1778.22.camel@balrog.2hip.net> <49B42548.3000308@phat.za.net> <49B57ACD.5030405@phat.za.net> <1236634490.1730.5.camel@balrog.2hip.net> <49B60C3F.9090104@mailinglist.ahhyes.net> <1236668133.1730.21.camel@balrog.2hip.net> <49B615D6.3090503@mailinglist.ahhyes.net> <49B61965.5070005@mailinglist.ahhyes.net> <1236678699.1725.2.camel@balrog.2hip.net> In-Reply-To: <1236678699.1725.2.camel@balrog.2hip.net> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Internet Messaging Program (IMP) H3 (4.1.6) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - syd-srv02.ezyreg.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mailinglist.ahhyes.net X-Source: X-Source-Args: X-Source-Dir: Subject: Re: Radeon DRIVER X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 13:05:42 -0000 Hi Robert, Any ideas what the solution is? Quoting Robert Noland : > On Tue, 2009-03-10 at 18:40 +1100, Alex wrote: >> Was this meant to be an incremental patch? Should I have applied another >> patch before this one? > > No, it looks like svn diff is messing things up... i915_reg.h is a new > file, as are r600_microcode.h and r600_cp.c. > > robert. > >> Alex wrote: >> > Hi Robert, >> > >> > The patch does not cleanly apply to 7-stable (I ran csup against my >> > system about a minute or 2 before, so my system sources should be up >> > to date) >> > >> > [alex@desktop /usr/home/alex]$ uname -a >> > FreeBSD desktop.xor.net 7.1-STABLE FreeBSD 7.1-STABLE #4: Mon Feb 23 >> > 18:24:52 EST 2009 >> > root@desktop.xor.net:/usr/obj/usr/src/sys/custom amd64 >> > >> > patch copied to /usr/src/sys >> > >> > command issued was: patch -p0 < drm-7-synced-to-HEAD-030909.patch >> > >> > A lot of the patch succeeds then suddenly i am prompted about patching >> > certain files, heres what happens: >> >> _______________________________________________ >> freebsd-x11@freebsd.org mailing list >> http://lists.freebsd.org/mailman/listinfo/freebsd-x11 >> To unsubscribe, send any mail to "freebsd-x11-unsubscribe@freebsd.org" > -- > Robert Noland > FreeBSD >