From owner-freebsd-x11@FreeBSD.ORG Sat Sep 13 12:47:13 2014 Return-Path: Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6933B7E4 for ; Sat, 13 Sep 2014 12:47:13 +0000 (UTC) Received: from mail.made4.biz (mail.made4.biz [IPv6:2001:41d0:2:c018::1:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A3C33F9 for ; Sat, 13 Sep 2014 12:47:12 +0000 (UTC) Received: from 2a02-8428-011b-e000-0290-f5ff-fe9d-b78c.rev.sfr.net ([2a02:8428:11b:e000:290:f5ff:fe9d:b78c] helo=magellan.dumbbell.fr) by mail.made4.biz with esmtpsa (TLSv1.2:DHE-RSA-AES128-SHA:128) (Exim 4.83 (FreeBSD)) (envelope-from ) id 1XSmjP-0001jj-3y for freebsd-x11@freebsd.org; Sat, 13 Sep 2014 14:47:11 +0200 Message-ID: <54143CCE.2050403@dumbbell.fr> Date: Sat, 13 Sep 2014 14:47:10 +0200 From: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: freebsd-x11@freebsd.org Subject: Re: drm-i915-hw-context.7.patch References: <4838138.9H5HhdVozA@chrysaor> <54142397.2060304@FreeBSD.org> In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wmOgCCQ5QV9j1jP3dpTNkPfv53toaXkDJ" X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Sep 2014 12:47:13 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --wmOgCCQ5QV9j1jP3dpTNkPfv53toaXkDJ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 13.09.2014 14:19, Lundberg, Johannes wrote: > Just to make sure, is this the only patch that needs to be applied and > should it be applied to a recent unmodified 11-current kernel? You need to revert the previous patch before applying a new one. In particular, you need to check that the file sys/dev/drm2/i915/i915_gem_context.c is removed before applying. The patch adds this new file. The error you encouter is because i915_gem_context.c contains its contents twice. --=20 Jean-S=C3=A9bastien P=C3=A9dron --wmOgCCQ5QV9j1jP3dpTNkPfv53toaXkDJ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJUFDzOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NzA4N0ZEMUFFQUUwRTEyREJDNkE2RjAz OUU5OTc2MUE1RkQ5NENDAAoJEDnpl2Gl/ZTMPloP+we7qZNlGKcxL3uOqTri+gFH jHa7angV2WFaruCcA4OxOWwO2cSlqHOtICPiPCjyRM/VNVGbg10u3iamwcqAMZ52 eNNpf9lVU6h9hhjpi/PoxT/n5KCWVRL58aCNZqBC9qBj5fWMj8RZYHWg/yZawCcH tHRkJr6Q0SV3Ul6JPmnG58jbximecAdRiqlUqJ0bozn3xk6piqyRtMgzlv86EPRp cKDHf6Y18K0LxNuiu3EdYavGdTydGRFh7w1YK7MfREYxWS2uJyFSmPSZMoCjWe4S +foLym3D4aorFj2zPNtMLixtkh1JGjCRJJhofgABIVV9YFfdULQWV6zGaHrGZ8qM IY03iP1EQMMYiLgiTiazbT8DBxcDDLUdyAFG7ie64JzjJK0i3/zcdhUQwyNxjGJl FM+SojhA/3U6KyroNhbjygUZ66aEDOfwWRG0L/7vjE+V2/vu6+1S+3yWD1L7Ul0k bYP2FF/CusxmTUbIui86kTxOoTSzanoED4CxRd4DDtVw8MQb/NVbS6VQRZxBgdXq Wx89KU1eWGPTT0cBGSkPDPbyKBPHr1Z/VMXXn8J0vyf48rfPGp/DlbURF7a1ulgC DYMvbjGPIWVWoCOVPyrugvLsUc50I1CUzL4qnfJO1uAWTxmBxQMgXdxDPaRgkdQ/ ob8nAr1zlAI1+mmrQt94 =LcHE -----END PGP SIGNATURE----- --wmOgCCQ5QV9j1jP3dpTNkPfv53toaXkDJ--