From owner-freebsd-x11@FreeBSD.ORG  Sat Apr 21 22:12:26 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 61DFB106566B
	for <freebsd-x11@freebsd.org>; Sat, 21 Apr 2012 22:12:26 +0000 (UTC)
	(envelope-from zeising@daemonic.se)
Received: from mail.lysator.liu.se (mail.lysator.liu.se
	[IPv6:2001:6b0:17:f0a0::3])
	by mx1.freebsd.org (Postfix) with ESMTP id D2B638FC16
	for <freebsd-x11@freebsd.org>; Sat, 21 Apr 2012 22:12:25 +0000 (UTC)
Received: from mail.lysator.liu.se (localhost [127.0.0.1])
	by mail.lysator.liu.se (Postfix) with ESMTP id 1767140009
	for <freebsd-x11@freebsd.org>; Sun, 22 Apr 2012 00:12:25 +0200 (CEST)
Received: by mail.lysator.liu.se (Postfix, from userid 1004)
	id 0CC6140007; Sun, 22 Apr 2012 00:12:25 +0200 (CEST)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	bernadotte.lysator.liu.se
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=AWL autolearn=disabled
	version=3.3.1
X-Spam-Score: 0.0
Received: from mx.daemonic.se (mx.daemonic.se [IPv6:2001:470:dca9:0:1::3])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.lysator.liu.se (Postfix) with ESMTPSA id D853940002;
	Sun, 22 Apr 2012 00:12:23 +0200 (CEST)
Received: from mailscanner.daemonic.se (mailscanner.daemonic.se
	[IPv6:2001:470:dca9:0:1::6])
	by mx.daemonic.se (Postfix) with ESMTPS id 3VZp874cPPz8ggx;
	Sun, 22 Apr 2012 00:12:23 +0200 (CEST)
X-Virus-Scanned: amavisd-new at daemonic.se
Received: from mx.daemonic.se ([10.1.0.3]) (using TLS with cipher
	CAMELLIA256-SHA)
	by mailscanner.daemonic.se (mailscanner.daemonic.se [10.1.0.6])
	(amavisd-new, port 10025)
	with ESMTPS id LFMYiv21Ahze; Sun, 22 Apr 2012 00:12:21 +0200 (CEST)
Received: from mail.daemonic.se (mail.daemonic.se [10.1.0.4])
	by mx.daemonic.se (Postfix) with ESMTPS id 3VZp850v5sz8ggv;
	Sun, 22 Apr 2012 00:12:21 +0200 (CEST)
Received: from [IPv6:2001:470:dca9:1::4] (vivi.daemonic.se
	[IPv6:2001:470:dca9:1::4])
	by mail.daemonic.se (Postfix) with ESMTPSA id 3VZp8507pNz9Ctj;
	Sun, 22 Apr 2012 00:12:20 +0200 (CEST)
Message-ID: <4F9330C0.7080701@daemonic.se>
Date: Sun, 22 Apr 2012 00:12:16 +0200
From: Niclas Zeising <zeising@daemonic.se>
User-Agent: Mutt/1.5.21
MIME-Version: 1.0
To: Sevan / Venture37 <venture37@gmail.com>
References: <4F9302F8.40108@gmail.com>
In-Reply-To: <4F9302F8.40108@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: ClamAV using ClamSMTP
Cc: freebsd-x11@freebsd.org
Subject: Re: all.14.4.patch
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: Sat, 21 Apr 2012 22:12:26 -0000

On 2012-04-21 20:56, Sevan / Venture37 wrote:
> Hi,
> The patches for sys/dev/drm/i915_suspend.c & i915_mem.c fail to apply to
> -HEAD src updated earlier today.
> 
> 
> Sevan

This is a FAQ.  See http://wiki.freebsd.org/Intel_GPU , specifically
I get a reject in i915_suspend.c.
The cause is that you use subversion-freebsd, which causes $FreeBSD$ tag
expansion in the checkout. Manually edit the i195_suspend.c before
applying the patch, to undo the expanded $FreeBSD$ tag into it short form.
I get a reject in i915_mem.c.
Remove this file, also remove i915_mem.c.rej, i915_mem.c.orig.

Regards!
-- 
Niclas