system sporadically hangs on shutdown after switching to WITH_NEW_XORG

[Javad Kouhi]

Hi,

I have exactly the same problem. I've tried to apply the above patch
but it refused. I've checked out  the last revision (251934) of
-STABLE branch using Subversion.

% git apply --check 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

How can I apply this patch?