From owner-freebsd-stable@FreeBSD.ORG Wed Jan 7 00:56:03 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39D5A1065676 for ; Wed, 7 Jan 2009 00:56:03 +0000 (UTC) (envelope-from swhetzel@gmail.com) Received: from yx-out-2324.google.com (yx-out-2324.google.com [74.125.44.28]) by mx1.freebsd.org (Postfix) with ESMTP id D92458FC22 for ; Wed, 7 Jan 2009 00:56:02 +0000 (UTC) (envelope-from swhetzel@gmail.com) Received: by yx-out-2324.google.com with SMTP id 8so3504432yxb.13 for ; Tue, 06 Jan 2009 16:56:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=VJjaMLhter2IEpXK2fkMc56Ax3LQZ+WgcQuP0/Sg5O8=; b=nJEvUHpj9W2uhpskC5KK+hmO55nUT1oSYYBlvy5D3U4rT3SkdD8x8MO+2dQecI4oVa yMxD/GbG2p5wLAwpDvbAXMrVm0L7PsR1C1sjghrgcAS/HyZX4yoDGfuRm+BNY7cn2UBO RjwGmeHhLYfkzqgJ6kMs3azbizg2gs7VqV7pA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=EwoQaSbZRJR4tYVoBCTHCCqD7Q7HRQ1NaTp0VUjjuAmyrZPyMXoW0tZsLupTElhNPR 12asPZuWEmMNXO+72YIChVfEDbBkf8N3npOrUTdFcbfQJByuP9wJHqEmtfvvnp5g5YMM 8/0o8rHS2sbWoPK1EOZ9qB1O6ZvQRV9Ds+pao= Received: by 10.90.96.15 with SMTP id t15mr10597620agb.37.1231288376375; Tue, 06 Jan 2009 16:32:56 -0800 (PST) Received: by 10.90.116.13 with HTTP; Tue, 6 Jan 2009 16:32:56 -0800 (PST) Message-ID: <790a9fff0901061632v2639daf2h7935439f4dbbacc@mail.gmail.com> Date: Tue, 6 Jan 2009 18:32:56 -0600 From: "Scot Hetzel" To: "Torfinn Ingolfsen" In-Reply-To: <20090107012457.f9ce6dba.torfinn.ingolfsen@broadpark.no> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1231263380.57454.23.camel@squirrel.corp.cox.com> <20090107012457.f9ce6dba.torfinn.ingolfsen@broadpark.no> Cc: freebsd-stable@freebsd.org Subject: Re: Pending MFC of drm updates X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jan 2009 00:56:03 -0000 On Tue, Jan 6, 2009 at 6:24 PM, Torfinn Ingolfsen wrote: > On Tue, 06 Jan 2009 12:36:20 -0500 > Robert Noland wrote: > >> I am planning to merge most all of the drm from -CURRENT to releng_7 >> shortly. The merge that I have staged includes the following. >> : >> I have a patch available for testing at >> http://people.freebsd.org/~rnoland/drm-update-7-010609.patch.bz2 > > Applied fine to my RELENG_7 / amd64 system (freshly cvsup'ed and built > yesterday): > root@kg-v2# uname -a > FreeBSD kg-v2.kg4.no 7.1-STABLE FreeBSD 7.1-STABLE #1: Tue Jan 6 > 21:49:31 CET 2009 root@kg-v2.kg4.no:/usr/obj/usr/src/sys/GENERIC amd64 > > - except for the patch to sys/modules/drm/i915/Makefile: : > Apparently patch gets confuseed when it finds a file with the same name > in the current directory (which was /usr/src), or perhaps I don't know > how to tell patch how to find the right file. > I just did: > cd /usr/src > patch < /dir/name/patchfile > use: patch -p0 < /dir/name/patchfile See the man page on patch. Scot.