From owner-freebsd-current@freebsd.org Thu Jul 30 20:13:54 2015 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A93689ACCF0 for ; Thu, 30 Jul 2015 20:13:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 96044AD7; Thu, 30 Jul 2015 20:13:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by freefall.freebsd.org (Postfix) with ESMTP id 0334E1A3D; Thu, 30 Jul 2015 20:13:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Thu, 30 Jul 2015 20:13:51 +0000 From: Glen Barber To: Larry Rosenman Cc: Benno Rice , freebsd-current@freebsd.org Subject: Re: pmspcv panic on boot on this box Message-ID: <20150730201351.GH90754@FreeBSD.org> References: <20150728210109.GA6424@oldtbh.lerctr.org> <04E640B9-423C-4C30-BF90-D3DD148C930D@FreeBSD.org> <765D2BB8-F101-4D8C-BF1D-BB896904FB29@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="/8E7gjuj425jZz9t" Content-Disposition: inline In-Reply-To: X-Operating-System: FreeBSD 11.0-CURRENT amd64 X-SCUD-Definition: Sudden Completely Unexpected Dataloss X-SULE-Definition: Sudden Unexpected Learning Event X-PEKBAC-Definition: Problem Exists, Keyboard Between Admin/Computer User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2015 20:13:54 -0000 --/8E7gjuj425jZz9t Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Jul 30, 2015 at 03:09:30PM -0500, Larry Rosenman wrote: > $ sudo -s > Password: > # cd /usr/src > # patch -p0 < ~ler/pmspcv.diff > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: sys/dev/pms/freebsd/driver/common/lxutil.c > |=================================================================== > |--- sys/dev/pms/freebsd/driver/common/lxutil.c (revision 286083) > |+++ sys/dev/pms/freebsd/driver/common/lxutil.c (working copy) > -------------------------- > Patching file sys/dev/pms/freebsd/driver/common/lxutil.c using Plan A... > Hunk #1 failed at 758. > Hunk #2 failed at 767. > 2 out of 2 hunks failed--saving rejects to > sys/dev/pms/freebsd/driver/common/lxutil.c.rej > done > # vi sys/dev/pms/freebsd/driver/common/lxutil.c.rej > @@ -758,6 +758,7 @@ > int idx;^M > static U32 cardMap[4] = { 0, 0, 0, 0 };^M Hmm. Somehow you ended up with MS DOS EOL... I'm able to apply the patch without issues. Try this: vi pmspcv.diff :%s:[ctrl-m]::g It should apply afterward. Glen --/8E7gjuj425jZz9t Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVuoV5AAoJEAMUWKVHj+KT588P/iRaW6VzmHYDrthvAMBUcWvS go1GwlkMZDNFT31WAFnRJJU20UAAfYrvJFXj8rEXFPF+ElRkVYH/VZMCId4+zVjL x4sEkb8diBCb7703ClluINxstF+Wh5reZdlkWaQdm2V5lBvU1kNeUEq6XrLJN1XJ FMn8L5bRbWvho5+/jgohBQ4kWAO1CSiaeKlSDrT9uu2GVzpLqIf4XuLjBViiCfCe zMFgpuyfX7cClhxcf1UBF1d9fNSYGVmby3V0XNqlFPCBjzo9Vg2WiQQQxpmtcJEW hicOUKOmSP1861J2Xav94bheTxplFIM017slX+nuNyXXawNriIGWkEnHarXQquZ2 btDNAqvdZMNrunCSf9DzVWqoqAhGT0s00fMVqNFreO4uXT0ojhYBI098qlWH0OpY kRq+lmtPDd1z+KG0ySbWGbuIfcqyx/NzqhK/U/YUNMuOvoxkSHD3I6kbkab4xDgR GdrxxpHkECK0svVY0o9ODSGYi0TwHwPzL+RhbSWUKeZtzBGj2QZQhRYN0VRSt7+v KJesaQDiMwG/2jj5KQc3WgskD7yZayaBsrKxAXPKFDmFoYwjwyuneMjfMN3flFfx LVLywjf66Ylv85b44CQ5E5xNTndZi5s8iikqNINLn7ieNH7ihY8n3i/Wcc4OH+7z 1haEMtzklSxHt5+gI810 =kPS9 -----END PGP SIGNATURE----- --/8E7gjuj425jZz9t--