From owner-freebsd-stable@FreeBSD.ORG Tue Jun 18 14:30:37 2013 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4C408ED for ; Tue, 18 Jun 2013 14:30:37 +0000 (UTC) (envelope-from javad.kouhi@gmail.com) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by mx1.freebsd.org (Postfix) with ESMTP id C7A2B1D39 for ; Tue, 18 Jun 2013 14:30:36 +0000 (UTC) Received: by mail-lb0-f170.google.com with SMTP id t13so3684475lbd.1 for ; Tue, 18 Jun 2013 07:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=XA50qFJjvzrgO0V/tcACqgw0UcFwY/78cTiUdofuPbU=; b=w+YPOCyz/pdnQV6s78DZyaM7fQAxsEpUd2qzWRawYYmaGM9+K9/hz8PLyYFyLyeHD1 54xh/f/xfhShnLClSUBenHqfegUNEtImOlpdsGJSfmdORZTiP0VQSrp/uK7ln9nNJfcK WNT1VqYn5B/+Ypvyku6+SSlXHXL3JrnlakfFdAWpkN7Koi+k8aq4VZwcFz9vG0/MWnh0 dQ2AKhNZAZDXj+q4occSufYJaFRCz2G+ugdjBW2UcC4vFId2ksMzFPMFay8UvRO1UjTl Ut0Cf1m92ZFafk/PLE8DhjsIomKgoT78g60+msvWpFauog9MxPb/jZmfsS6viYmYJBWF ClKA== MIME-Version: 1.0 X-Received: by 10.152.23.99 with SMTP id l3mr9033684laf.82.1371565830297; Tue, 18 Jun 2013 07:30:30 -0700 (PDT) Received: by 10.114.19.236 with HTTP; Tue, 18 Jun 2013 07:30:30 -0700 (PDT) In-Reply-To: <51C06AD2.5030404@xs4all.nl> References: <51BDD593.5000102@xs4all.nl> <51BF60A8.6000503@xs4all.nl> <20130617193726.GR91021@kib.kiev.ua> <51C06AD2.5030404@xs4all.nl> Date: Tue, 18 Jun 2013 19:00:30 +0430 Message-ID: Subject: Re: system sporadically hangs on shutdown after switching to WITH_NEW_XORG From: Javad Kouhi To: Michiel Boland Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-stable@freebsd.org X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 14:30:37 -0000 Thanks for the reply, seems that our source trees are not same, I got this: % patch -p1 < /path/to/patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/sys/dev/drm2/i915/intel_fb.c b/sys/dev/drm2/i915/intel_fb.c |index 3cb3b78..e41a49f 100644 |--- a/sys/dev/drm2/i915/intel_fb.c |+++ b/sys/dev/drm2/i915/intel_fb.c -------------------------- Patching file sys/dev/drm2/i915/intel_fb.c using Plan A... Hunk #1 succeeded at 207 with fuzz 1. Hunk #2 failed at 231. 1 out of 2 hunks failed--saving rejects to sys/dev/drm2/i915/intel_fb.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c |index 6e6663c..fc7f02f 100644 |--- a/sys/dev/syscons/scvgarndr.c |+++ b/sys/dev/syscons/scvgarndr.c -------------------------- Patching file sys/dev/syscons/scvgarndr.c using Plan A... Hunk #1 succeeded at 395. Hunk #2 failed at 447. 1 out of 2 hunks failed--saving rejects to sys/dev/syscons/scvgarndr.c.rej done And the git way: % git apply /path/to/patch error: patch failed: sys/dev/drm2/i915/intel_fb.c:207 error: sys/dev/drm2/i915/intel_fb.c: patch does not apply error: patch failed: sys/dev/syscons/scvgarndr.c:445 error: sys/dev/syscons/scvgarndr.c: patch does not apply I have revision 251934 of -STABLE branch. (I updated my source tree about 3 hours ago using svn)