Date: Tue, 18 Jun 2013 19:00:30 +0430 From: Javad Kouhi <javad.kouhi@gmail.com> To: Michiel Boland <boland37@xs4all.nl> Cc: freebsd-stable@freebsd.org Subject: Re: system sporadically hangs on shutdown after switching to WITH_NEW_XORG Message-ID: <CA%2Bg814dFmC1j4Czitn-VN9z3S29qBaMW47dOBOvbsaAxPvnWpg@mail.gmail.com> In-Reply-To: <51C06AD2.5030404@xs4all.nl> References: <51BDD593.5000102@xs4all.nl> <51BF60A8.6000503@xs4all.nl> <20130617193726.GR91021@kib.kiev.ua> <CA%2Bg814fgxmkCjVNrqoTiE0AEQwGr5gystCUiMzDLCtZ3aTtk%2BQ@mail.gmail.com> <51C06AD2.5030404@xs4all.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CA%2Bg814dFmC1j4Czitn-VN9z3S29qBaMW47dOBOvbsaAxPvnWpg>