From owner-freebsd-x11@FreeBSD.ORG  Thu Feb  9 11:21:44 2012
Return-Path: <owner-freebsd-x11@FreeBSD.ORG>
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 35921106564A
	for <freebsd-x11@freebsd.org>; Thu,  9 Feb 2012 11:21:44 +0000 (UTC)
	(envelope-from meowthink@gmail.com)
Received: from mail-tul01m020-f182.google.com (mail-tul01m020-f182.google.com
	[209.85.214.182])
	by mx1.freebsd.org (Postfix) with ESMTP id ED8B88FC0C
	for <freebsd-x11@freebsd.org>; Thu,  9 Feb 2012 11:21:42 +0000 (UTC)
Received: by obcwo16 with SMTP id wo16so3043635obc.13
	for <freebsd-x11@freebsd.org>; Thu, 09 Feb 2012 03:21:41 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:cc:content-type:content-transfer-encoding;
	bh=KPexLUDTHKqsNcHwO9+7Yt8GK1ScfjNr5ANNBq9qolI=;
	b=nBRCOUEhgz8pzQUDXsJ8xvWK19rZUEJ5LSNtE3/DOYlK5+DetVxQH0i99hFiYGx4bP
	N5BGFyQD+gCOXwhPZaeHU1uu9icWcRqboccpjVOu4HMOL0AIn9QjrG/NWxdb4LwgA4y6
	iYpH8uS1BTHtwunUyodSPl0umlv61riFo25yQ=
MIME-Version: 1.0
Received: by 10.182.31.47 with SMTP id x15mr1167771obh.76.1328786501743; Thu,
	09 Feb 2012 03:21:41 -0800 (PST)
Received: by 10.60.47.135 with HTTP; Thu, 9 Feb 2012 03:21:41 -0800 (PST)
In-Reply-To: <alpine.BSF.2.00.1202082325210.28356@wonkity.com>
References: <CABnABobGoLGO200z238o=xNRgrOhA4s2xAnJ-mTiQ+vsUKDw=A@mail.gmail.com>
	<alpine.BSF.2.00.1202071413280.88011@wonkity.com>
	<alpine.BSF.2.00.1202072029110.94134@wonkity.com>
	<CABnABoYbquaA3OfdNWVqfe3OGh2jBX3rq++6L9w33Qi=dJ-NRQ@mail.gmail.com>
	<alpine.BSF.2.00.1202082325210.28356@wonkity.com>
Date: Thu, 9 Feb 2012 19:21:41 +0800
Message-ID: <CABnABoYdUmOTTxe3-4YoUuFyKGOwFAtcmpXKAONg_bZmABo=Cg@mail.gmail.com>
From: Meowthink <meowthink@gmail.com>
To: Warren Block <wblock@wonkity.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: freebsd-x11@freebsd.org
Subject: Re: Intel GPU patch 13.1 for stable/9 ([CFT] Xorg Upgrade 7.5.2)
X-BeenThere: freebsd-x11@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11>
List-Post: <mailto:freebsd-x11@freebsd.org>
List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>,
	<mailto:freebsd-x11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Feb 2012 11:21:44 -0000

On Thu, Feb 9, 2012 at 2:39 PM, Warren Block <wblock@wonkity.com> wrote:
> On Wed, 8 Feb 2012, Meowthink wrote:
>
>> Hello Warren,
>>
>> It seems that your problem came from command line. Seems I chose a
>> style that not so friendly? Try patch by this way:
>>
>> cd /path/of/src/
>> patch -p3 < /path/to/drm-all.13.1-stable9.1.patch
>
>
> The patch applies (after the sed), but I'm still seeing the duplicated
> files. =A0It's like the patch is doubled, so the kernel build errors out =
on
> finding all the redefinitions.
>
> This is 9stable as of today. =A0It's i386 on a netbook that does not supp=
ort
> amd64.
>
> If there's some step I've missed, please let me know.

Ooops. Seems like patch will simply append the context, when the
target file exists but the diff is made to /dev/null. Though am not
good at dealing with this, I think you can try:

svn revert -R .
svn st | grep '?' | awk {'print $2'} | xargs rm

to gets your local repository fresh/clean. Then do the patchwork all over a=
gain.

Maybe a little off-topic but do worth to discuss. Sorry for
inappropriate if any.
Meowthink